From 65f8fa87ac3369b187a740dc71b1f93179800764 Mon Sep 17 00:00:00 2001 From: Marc Bernard <59966492+mbtools@users.noreply.github.com> Date: Thu, 5 Sep 2024 08:46:28 -0400 Subject: [PATCH 1/3] SFPF: Fix check if object exists (#7041) Co-authored-by: Lars Hvam --- src/objects/zcl_abapgit_object_sfpf.clas.abap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/objects/zcl_abapgit_object_sfpf.clas.abap b/src/objects/zcl_abapgit_object_sfpf.clas.abap index b6775aa08..29564ada8 100644 --- a/src/objects/zcl_abapgit_object_sfpf.clas.abap +++ b/src/objects/zcl_abapgit_object_sfpf.clas.abap @@ -282,10 +282,10 @@ CLASS zcl_abapgit_object_sfpf IMPLEMENTATION. DATA: lv_name TYPE fpname. + " Check for any state SELECT SINGLE name FROM fplayout INTO lv_name - WHERE name = ms_item-obj_name - AND state = 'A'. + WHERE name = ms_item-obj_name. rv_bool = boolc( sy-subrc = 0 ). ENDMETHOD. From a02632edcb7eed5ff1fff27271ebe7a61a04e5a8 Mon Sep 17 00:00:00 2001 From: Marc Bernard <59966492+mbtools@users.noreply.github.com> Date: Thu, 5 Sep 2024 09:03:11 -0400 Subject: [PATCH 2/3] Add package check when creating repository (#7037) Co-authored-by: Lars Hvam --- src/repo/zcl_abapgit_repo_srv.clas.abap | 42 +++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/src/repo/zcl_abapgit_repo_srv.clas.abap b/src/repo/zcl_abapgit_repo_srv.clas.abap index 7d8e3191f..d58536cdd 100644 --- a/src/repo/zcl_abapgit_repo_srv.clas.abap +++ b/src/repo/zcl_abapgit_repo_srv.clas.abap @@ -55,6 +55,7 @@ CLASS zcl_abapgit_repo_srv DEFINITION !is_meta TYPE zif_abapgit_persistence=>ty_repo_xml RAISING zcx_abapgit_exception . + METHODS validate_sub_super_packages IMPORTING !iv_package TYPE devclass @@ -65,6 +66,13 @@ CLASS zcl_abapgit_repo_srv DEFINITION !ev_reason TYPE string RAISING zcx_abapgit_exception . + + METHODS validate_package_korrflag + IMPORTING + !iv_package TYPE devclass + !iv_ign_subpkg TYPE abap_bool DEFAULT abap_false + RAISING + zcx_abapgit_exception. ENDCLASS. @@ -219,6 +227,35 @@ CLASS zcl_abapgit_repo_srv IMPLEMENTATION. ENDMETHOD. + METHOD validate_package_korrflag. + + DATA: + li_package TYPE REF TO zif_abapgit_sap_package, + lv_korrflag TYPE abap_bool, + lv_package TYPE devclass, + lt_packages TYPE zif_abapgit_sap_package=>ty_devclass_tt. + + li_package = zcl_abapgit_factory=>get_sap_package( iv_package ). + IF li_package->exists( ) = abap_false. + " Skip dangling repository + RETURN. + ENDIF. + + lv_korrflag = li_package->are_changes_recorded_in_tr_req( ). + + IF iv_ign_subpkg = abap_false. + lt_packages = li_package->list_subpackages( ). + LOOP AT lt_packages INTO lv_package. + li_package = zcl_abapgit_factory=>get_sap_package( lv_package ). + IF li_package->exists( ) = abap_true AND li_package->are_changes_recorded_in_tr_req( ) <> lv_korrflag. + zcx_abapgit_exception=>raise( 'Mix of transportable and non-transportable packages is not supported' ). + ENDIF. + ENDLOOP. + ENDIF. + + ENDMETHOD. + + METHOD validate_sub_super_packages. DATA: @@ -709,6 +746,11 @@ CLASS zcl_abapgit_repo_srv IMPLEMENTATION. ENDIF. ENDIF. + " Check if package hierarchy is a mix of transportable and local packages + validate_package_korrflag( + iv_package = iv_package + iv_ign_subpkg = iv_ign_subpkg ). + ENDMETHOD. From 41619e6e4df241e074f7684cb9ec0c8b70fa43d5 Mon Sep 17 00:00:00 2001 From: Lars Hvam Date: Thu, 5 Sep 2024 16:04:13 +0200 Subject: [PATCH 3/3] update npm dependencies (#7032) --- abaplint.json | 3 +++ package.json | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/abaplint.json b/abaplint.json index 6c2a1bdc9..bf8190854 100644 --- a/abaplint.json +++ b/abaplint.json @@ -125,6 +125,9 @@ }, "double_space": true, "downport": false, + "add_test_attributes": true, + "implicit_start_of_selection": true, + "empty_event": true, "dynpro_checks": false, "easy_to_find_messages": false, "empty_line_in_statement": { diff --git a/package.json b/package.json index 2ccf41c18..56b4a13a1 100644 --- a/package.json +++ b/package.json @@ -23,14 +23,14 @@ ] }, "devDependencies": { - "@abaplint/cli": "^2.112.14", + "@abaplint/cli": "^2.113.6", "@abaplint/database-sqlite": "^2.8.25", - "@abaplint/runtime": "^2.10.9", + "@abaplint/runtime": "^2.10.11", "express": "^4.19.2", - "@abaplint/transpiler-cli": "^2.10.9", + "@abaplint/transpiler-cli": "^2.10.11", "globals": "^15.9.0", "abapmerge": "^0.16.0", "c8": "^10.1.2", - "eslint": "^9.9.0" + "eslint": "^9.9.1" } }