From 3f41328ab6277febaeee787b55d46d9a8a741005 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frank=20M=C3=BCller?= <101019006+fmabap@users.noreply.github.com> Date: Sat, 9 Sep 2023 17:34:32 +0200 Subject: [PATCH] Consider filter at `zcl_abapgit_repo_status=>calculate` (#6480) Co-authored-by: Lars Hvam --- src/repo/zcl_abapgit_repo_status.clas.abap | 7 +++++-- src/stage/zcl_abapgit_stage_logic.clas.abap | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/repo/zcl_abapgit_repo_status.clas.abap b/src/repo/zcl_abapgit_repo_status.clas.abap index 692b40983..1c86ea584 100644 --- a/src/repo/zcl_abapgit_repo_status.clas.abap +++ b/src/repo/zcl_abapgit_repo_status.clas.abap @@ -9,6 +9,7 @@ CLASS zcl_abapgit_repo_status DEFINITION IMPORTING !io_repo TYPE REF TO zcl_abapgit_repo !ii_log TYPE REF TO zif_abapgit_log OPTIONAL + !ii_obj_filter TYPE REF TO zif_abapgit_object_filter OPTIONAL RETURNING VALUE(rt_results) TYPE zif_abapgit_definitions=>ty_results_tt RAISING @@ -260,7 +261,8 @@ CLASS zcl_abapgit_repo_status IMPLEMENTATION. DATA lo_instance TYPE REF TO zcl_abapgit_repo_status. DATA lo_consistency_checks TYPE REF TO lcl_status_consistency_checks. - lt_local = io_repo->get_files_local( ii_log = ii_log ). + lt_local = io_repo->get_files_local( ii_log = ii_log + ii_obj_filter = ii_obj_filter ). IF lines( lt_local ) <= 2. " Less equal two means that we have only the .abapgit.xml and the package in @@ -270,7 +272,8 @@ CLASS zcl_abapgit_repo_status IMPLEMENTATION. io_repo->find_remote_dot_abapgit( ). ENDIF. - lt_remote = io_repo->get_files_remote( iv_ignore_files = abap_true ). + lt_remote = io_repo->get_files_remote( ii_obj_filter = ii_obj_filter + iv_ignore_files = abap_true ). li_exit = zcl_abapgit_exit=>get_instance( ). li_exit->pre_calculate_repo_status( diff --git a/src/stage/zcl_abapgit_stage_logic.clas.abap b/src/stage/zcl_abapgit_stage_logic.clas.abap index 5e7632139..5b60f4544 100644 --- a/src/stage/zcl_abapgit_stage_logic.clas.abap +++ b/src/stage/zcl_abapgit_stage_logic.clas.abap @@ -89,7 +89,8 @@ CLASS zcl_abapgit_stage_logic IMPLEMENTATION. rs_files-local = io_repo->get_files_local( ii_obj_filter = ii_obj_filter ). rs_files-remote = io_repo->get_files_remote( ii_obj_filter ). - rs_files-status = zcl_abapgit_repo_status=>calculate( io_repo ). + rs_files-status = zcl_abapgit_repo_status=>calculate( io_repo = io_repo + ii_obj_filter = ii_obj_filter ). remove_identical( CHANGING cs_files = rs_files ). remove_ignored( EXPORTING io_repo = io_repo