From 5c99c0e443b2c2c30f82d0a214021fe8069f6148 Mon Sep 17 00:00:00 2001 From: larshp Date: Thu, 30 Mar 2017 06:33:40 +0000 Subject: [PATCH 1/2] ignore files outside of starting folder #696 --- src/zabapgit_dot_abapgit.prog.abap | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/zabapgit_dot_abapgit.prog.abap b/src/zabapgit_dot_abapgit.prog.abap index 5588dfbfb..7e21db9c2 100644 --- a/src/zabapgit_dot_abapgit.prog.abap +++ b/src/zabapgit_dot_abapgit.prog.abap @@ -15,7 +15,7 @@ CLASS lcl_dot_abapgit DEFINITION FINAL FRIENDS ltcl_dot_abapgit. TYPES: BEGIN OF ty_requirement, component TYPE dlvunit, min_release TYPE saprelease, - min_patch TYPE sappatchlv, + min_patch TYPE sappatchlv, END OF ty_requirement, ty_requirement_tt TYPE STANDARD TABLE OF ty_requirement WITH DEFAULT KEY, BEGIN OF ty_dot_abapgit, @@ -199,14 +199,22 @@ CLASS lcl_dot_abapgit IMPLEMENTATION. METHOD is_ignored. - DATA: lv_name TYPE string, - lv_ignore TYPE string. + DATA: lv_name TYPE string, + lv_starting TYPE string, + lv_dot TYPE string, + lv_ignore TYPE string. lv_name = iv_path && iv_filename. + CONCATENATE ms_data-starting_folder '*' INTO lv_starting. + CONCATENATE '/' gc_dot_abapgit INTO lv_dot. + LOOP AT ms_data-ignore INTO lv_ignore. - IF lv_name CP lv_ignore. + IF lv_name CP lv_ignore + OR ( ms_data-starting_folder <> '/' + AND NOT lv_name CP lv_starting + AND NOT lv_name = lv_dot ). rv_ignored = abap_true. RETURN. ENDIF. From 09b7fe0601d213c370bc65d10bbf975663bb1ded Mon Sep 17 00:00:00 2001 From: larshp Date: Thu, 13 Apr 2017 08:52:11 +0200 Subject: [PATCH 2/2] issue #696 dont ignore files in root folder, only subfolders --- src/zabapgit_dot_abapgit.prog.abap | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/zabapgit_dot_abapgit.prog.abap b/src/zabapgit_dot_abapgit.prog.abap index 7e21db9c2..c2d6e19c1 100644 --- a/src/zabapgit_dot_abapgit.prog.abap +++ b/src/zabapgit_dot_abapgit.prog.abap @@ -202,6 +202,7 @@ CLASS lcl_dot_abapgit IMPLEMENTATION. DATA: lv_name TYPE string, lv_starting TYPE string, lv_dot TYPE string, + lv_count TYPE i, lv_ignore TYPE string. @@ -211,8 +212,11 @@ CLASS lcl_dot_abapgit IMPLEMENTATION. CONCATENATE '/' gc_dot_abapgit INTO lv_dot. LOOP AT ms_data-ignore INTO lv_ignore. + FIND ALL OCCURRENCES OF '/' IN lv_name MATCH COUNT lv_count. + IF lv_name CP lv_ignore OR ( ms_data-starting_folder <> '/' + AND lv_count > 1 AND NOT lv_name CP lv_starting AND NOT lv_name = lv_dot ). rv_ignored = abap_true.