From 773f2f774918ed5e8af39156607de87940c23268 Mon Sep 17 00:00:00 2001 From: Lars Hvam Date: Fri, 3 Feb 2023 11:46:00 +0100 Subject: [PATCH] refactor, extract git definitions to git (#6029) Co-authored-by: abaplint[bot] <24845621+abaplint[bot]@users.noreply.github.com> --- src/apack/zcl_abapgit_apack_helper.clas.abap | 2 +- .../zcl_abapgit_background_push_au.clas.abap | 6 +- .../zcl_abapgit_background_push_fi.clas.abap | 2 +- .../zcl_abapgit_transport_2_branch.clas.abap | 4 +- ..._abapgit_data_config.clas.testclasses.abap | 4 +- .../zcl_abapgit_data_deserializer.clas.abap | 2 +- ...it_data_deserializer.clas.testclasses.abap | 2 +- ...pgit_data_serializer.clas.testclasses.abap | 2 +- src/data/zif_abapgit_data_config.intf.abap | 4 +- .../zif_abapgit_data_deserializer.intf.abap | 2 +- .../zif_abapgit_data_serializer.intf.abap | 2 +- src/exits/zif_abapgit_exit.intf.abap | 6 +- src/git/zcl_abapgit_git_branch_list.clas.abap | 18 +-- ...pgit_git_branch_list.clas.testclasses.abap | 2 +- src/git/zcl_abapgit_git_commit.clas.abap | 11 +- ...l_abapgit_git_commit.clas.testclasses.abap | 12 +- src/git/zcl_abapgit_git_pack.clas.abap | 28 ++-- ...zcl_abapgit_git_pack.clas.testclasses.abap | 6 +- src/git/zcl_abapgit_git_porcelain.clas.abap | 71 +++++----- src/git/zcl_abapgit_git_transport.clas.abap | 20 +-- src/git/zif_abapgit_git_definitions.intf.abap | 76 ++++++++++ src/git/zif_abapgit_git_definitions.intf.xml | 15 ++ .../zcl_abapgit_git_url.clas.abap | 2 +- .../zcl_abapgit_git_url.clas.testclasses.abap | 2 +- .../core/zcl_abapgit_file_status.clas.abap | 28 ++-- ..._abapgit_file_status.clas.testclasses.abap | 10 +- .../core/zcl_abapgit_item_state.clas.abap | 16 +-- .../core/zcl_abapgit_objects_files.clas.abap | 20 +-- ...bapgit_objects_files.clas.testclasses.abap | 2 +- .../core/zcl_abapgit_serialize.clas.abap | 4 +- .../zcl_abapgit_object_enho_class.clas.abap | 4 +- src/objects/zcl_abapgit_object_smim.clas.abap | 4 +- src/objects/zcl_abapgit_objects.clas.abap | 16 +-- src/objects/zif_abapgit_objects.intf.abap | 2 +- .../zcl_abapgit_persistence_user.clas.abap | 78 ++++++----- .../zif_abapgit_persist_repo.intf.abap | 2 +- src/persist/zif_abapgit_persistence.intf.abap | 4 +- src/repo/zcl_abapgit_dot_abapgit.clas.abap | 5 +- src/repo/zcl_abapgit_repo.clas.abap | 8 +- .../zcl_abapgit_repo.clas.testclasses.abap | 4 +- src/repo/zcl_abapgit_repo_checksums.clas.abap | 5 +- ...bapgit_repo_checksums.clas.locals_imp.abap | 8 +- ...apgit_repo_checksums.clas.testclasses.abap | 6 +- .../zcl_abapgit_repo_content_list.clas.abap | 2 +- src/repo/zcl_abapgit_repo_filter.clas.abap | 99 ++++++------- src/repo/zcl_abapgit_repo_online.clas.abap | 8 +- src/repo/zif_abapgit_repo.intf.abap | 2 +- src/repo/zif_abapgit_repo_checksums.intf.abap | 4 +- src/repo/zif_abapgit_repo_online.intf.abap | 6 +- src/stage/zcl_abapgit_merge.clas.abap | 8 +- src/stage/zcl_abapgit_stage.clas.abap | 26 ++-- src/stage/zif_abapgit_merge.intf.abap | 10 +- .../lib/zcl_abapgit_gui_chunk_lib.clas.abap | 4 +- .../zcl_abapgit_gui_page_commit.clas.abap | 2 +- .../pages/zcl_abapgit_gui_page_diff.clas.abap | 9 +- .../zcl_abapgit_gui_page_merge_sel.clas.abap | 2 +- .../zcl_abapgit_gui_page_patch.clas.abap | 3 +- .../zcl_abapgit_gui_page_sett_info.clas.abap | 10 +- .../zcl_abapgit_gui_page_sett_remo.clas.abap | 8 +- .../zcl_abapgit_gui_page_stage.clas.abap | 6 +- .../pages/zcl_abapgit_gui_page_tags.clas.abap | 6 +- .../routing/zcl_abapgit_gui_router.clas.abap | 2 +- .../zcl_abapgit_services_git.clas.abap | 10 +- src/ui/zcl_abapgit_popups.clas.abap | 8 +- src/ui/zif_abapgit_popups.intf.abap | 4 +- src/utils/zcl_abapgit_convert.clas.abap | 2 +- .../zcl_abapgit_convert.clas.testclasses.abap | 2 +- src/utils/zcl_abapgit_hash.clas.abap | 18 +-- .../zcl_abapgit_hash.clas.testclasses.abap | 8 +- src/utils/zcl_abapgit_news.clas.abap | 2 +- src/utils/zcl_abapgit_user_record.clas.abap | 7 +- src/zcl_abapgit_zip.clas.abap | 6 +- src/zif_abapgit_definitions.intf.abap | 132 +++++------------- 73 files changed, 482 insertions(+), 461 deletions(-) create mode 100644 src/git/zif_abapgit_git_definitions.intf.abap create mode 100644 src/git/zif_abapgit_git_definitions.intf.xml diff --git a/src/apack/zcl_abapgit_apack_helper.clas.abap b/src/apack/zcl_abapgit_apack_helper.clas.abap index 172e6c30c..745814a59 100644 --- a/src/apack/zcl_abapgit_apack_helper.clas.abap +++ b/src/apack/zcl_abapgit_apack_helper.clas.abap @@ -21,7 +21,7 @@ CLASS zcl_abapgit_apack_helper DEFINITION IMPORTING !iv_package TYPE devclass RETURNING - VALUE(rs_file) TYPE zif_abapgit_definitions=>ty_file + VALUE(rs_file) TYPE zif_abapgit_git_definitions=>ty_file RAISING zcx_abapgit_exception . PROTECTED SECTION. diff --git a/src/background/zcl_abapgit_background_push_au.clas.abap b/src/background/zcl_abapgit_background_push_au.clas.abap index 8af072445..070f8ba2e 100644 --- a/src/background/zcl_abapgit_background_push_au.clas.abap +++ b/src/background/zcl_abapgit_background_push_au.clas.abap @@ -24,7 +24,7 @@ CLASS zcl_abapgit_background_push_au DEFINITION IMPORTING !iv_changed_by TYPE syuname RETURNING - VALUE(rs_user) TYPE zif_abapgit_definitions=>ty_git_user . + VALUE(rs_user) TYPE zif_abapgit_git_definitions=>ty_git_user . METHODS push_deletions IMPORTING !io_repo TYPE REF TO zcl_abapgit_repo_online @@ -97,7 +97,7 @@ CLASS zcl_abapgit_background_push_au IMPLEMENTATION. changed_by TYPE syuname, END OF ty_changed. - DATA: ls_comment TYPE zif_abapgit_definitions=>ty_comment, + DATA: ls_comment TYPE zif_abapgit_git_definitions=>ty_comment, ls_files TYPE zif_abapgit_definitions=>ty_stage_files, lt_changed TYPE STANDARD TABLE OF ty_changed WITH DEFAULT KEY, lt_users TYPE STANDARD TABLE OF syuname WITH DEFAULT KEY, @@ -185,7 +185,7 @@ CLASS zcl_abapgit_background_push_au IMPLEMENTATION. METHOD push_deletions. DATA: lo_stage TYPE REF TO zcl_abapgit_stage, - ls_comment TYPE zif_abapgit_definitions=>ty_comment. + ls_comment TYPE zif_abapgit_git_definitions=>ty_comment. FIELD-SYMBOLS: LIKE LINE OF is_files-remote. diff --git a/src/background/zcl_abapgit_background_push_fi.clas.abap b/src/background/zcl_abapgit_background_push_fi.clas.abap index 9504c582c..77821d987 100644 --- a/src/background/zcl_abapgit_background_push_fi.clas.abap +++ b/src/background/zcl_abapgit_background_push_fi.clas.abap @@ -65,7 +65,7 @@ CLASS ZCL_ABAPGIT_BACKGROUND_PUSH_FI IMPLEMENTATION. METHOD push_fixed. - DATA: ls_comment TYPE zif_abapgit_definitions=>ty_comment, + DATA: ls_comment TYPE zif_abapgit_git_definitions=>ty_comment, ls_files TYPE zif_abapgit_definitions=>ty_stage_files, lo_stage TYPE REF TO zcl_abapgit_stage. diff --git a/src/cts/zcl_abapgit_transport_2_branch.clas.abap b/src/cts/zcl_abapgit_transport_2_branch.clas.abap index a186d4530..26e619f2f 100644 --- a/src/cts/zcl_abapgit_transport_2_branch.clas.abap +++ b/src/cts/zcl_abapgit_transport_2_branch.clas.abap @@ -18,7 +18,7 @@ CLASS zcl_abapgit_transport_2_branch DEFINITION IMPORTING !is_transport_to_branch TYPE zif_abapgit_definitions=>ty_transport_to_branch RETURNING - VALUE(rs_comment) TYPE zif_abapgit_definitions=>ty_comment . + VALUE(rs_comment) TYPE zif_abapgit_git_definitions=>ty_comment . METHODS stage_transport_objects IMPORTING !it_transport_objects TYPE zif_abapgit_definitions=>ty_tadir_tt @@ -38,7 +38,7 @@ CLASS ZCL_ABAPGIT_TRANSPORT_2_BRANCH IMPLEMENTATION. METHOD create. DATA: lv_branch_name TYPE string, - ls_comment TYPE zif_abapgit_definitions=>ty_comment, + ls_comment TYPE zif_abapgit_git_definitions=>ty_comment, lo_stage TYPE REF TO zcl_abapgit_stage, ls_stage_objects TYPE zif_abapgit_definitions=>ty_stage_files, lt_object_statuses TYPE zif_abapgit_definitions=>ty_results_tt. diff --git a/src/data/zcl_abapgit_data_config.clas.testclasses.abap b/src/data/zcl_abapgit_data_config.clas.testclasses.abap index 8428343cd..291778a63 100644 --- a/src/data/zcl_abapgit_data_config.clas.testclasses.abap +++ b/src/data/zcl_abapgit_data_config.clas.testclasses.abap @@ -8,7 +8,7 @@ CLASS ltcl_test DEFINITION FOR TESTING DURATION SHORT RISK LEVEL HARMLESS FINAL. METHODS double_add_config FOR TESTING RAISING cx_static_check. METHODS to_json FOR TESTING RAISING cx_static_check. METHODS from_json - IMPORTING it_files TYPE zif_abapgit_definitions=>ty_files_tt + IMPORTING it_files TYPE zif_abapgit_git_definitions=>ty_files_tt RAISING cx_static_check. ENDCLASS. @@ -59,7 +59,7 @@ CLASS ltcl_test IMPLEMENTATION. METHOD to_json. DATA li_config TYPE REF TO zif_abapgit_data_config. - DATA lt_files TYPE zif_abapgit_definitions=>ty_files_tt. + DATA lt_files TYPE zif_abapgit_git_definitions=>ty_files_tt. DATA ls_file LIKE LINE OF lt_files. DATA lv_json TYPE string. diff --git a/src/data/zcl_abapgit_data_deserializer.clas.abap b/src/data/zcl_abapgit_data_deserializer.clas.abap index 1dc5a47cd..9db478968 100644 --- a/src/data/zcl_abapgit_data_deserializer.clas.abap +++ b/src/data/zcl_abapgit_data_deserializer.clas.abap @@ -13,7 +13,7 @@ CLASS zcl_abapgit_data_deserializer DEFINITION METHODS convert_json_to_itab IMPORTING - !is_file TYPE zif_abapgit_definitions=>ty_file + !is_file TYPE zif_abapgit_git_definitions=>ty_file !ir_data TYPE REF TO data RAISING zcx_abapgit_exception . diff --git a/src/data/zcl_abapgit_data_deserializer.clas.testclasses.abap b/src/data/zcl_abapgit_data_deserializer.clas.testclasses.abap index 802ff0b6c..b80b788d9 100644 --- a/src/data/zcl_abapgit_data_deserializer.clas.testclasses.abap +++ b/src/data/zcl_abapgit_data_deserializer.clas.testclasses.abap @@ -15,7 +15,7 @@ CLASS ltcl_test IMPLEMENTATION. DATA li_cut TYPE REF TO zif_abapgit_data_deserializer. DATA li_config TYPE REF TO zif_abapgit_data_config. - DATA lt_files TYPE zif_abapgit_definitions=>ty_files_tt. + DATA lt_files TYPE zif_abapgit_git_definitions=>ty_files_tt. DATA ls_config TYPE zif_abapgit_data_config=>ty_config. CREATE OBJECT li_cut TYPE zcl_abapgit_data_deserializer. diff --git a/src/data/zcl_abapgit_data_serializer.clas.testclasses.abap b/src/data/zcl_abapgit_data_serializer.clas.testclasses.abap index c9c072173..1e9c63600 100644 --- a/src/data/zcl_abapgit_data_serializer.clas.testclasses.abap +++ b/src/data/zcl_abapgit_data_serializer.clas.testclasses.abap @@ -25,7 +25,7 @@ CLASS ltcl_test IMPLEMENTATION. METHOD serialize. DATA ls_config TYPE zif_abapgit_data_config=>ty_config. - DATA lt_files TYPE zif_abapgit_definitions=>ty_files_tt. + DATA lt_files TYPE zif_abapgit_git_definitions=>ty_files_tt. DATA lv_where LIKE LINE OF ls_config-where. ls_config-type = 'TABU'. diff --git a/src/data/zif_abapgit_data_config.intf.abap b/src/data/zif_abapgit_data_config.intf.abap index b27bd70fd..815c42bd3 100644 --- a/src/data/zif_abapgit_data_config.intf.abap +++ b/src/data/zif_abapgit_data_config.intf.abap @@ -32,7 +32,7 @@ INTERFACE zif_abapgit_data_config zcx_abapgit_exception . METHODS from_json IMPORTING - !it_files TYPE zif_abapgit_definitions=>ty_files_tt + !it_files TYPE zif_abapgit_git_definitions=>ty_files_tt RAISING zcx_abapgit_exception . METHODS get_configs @@ -45,7 +45,7 @@ INTERFACE zif_abapgit_data_config zcx_abapgit_exception . METHODS to_json RETURNING - VALUE(rt_files) TYPE zif_abapgit_definitions=>ty_files_tt + VALUE(rt_files) TYPE zif_abapgit_git_definitions=>ty_files_tt RAISING zcx_abapgit_exception . METHODS update_config diff --git a/src/data/zif_abapgit_data_deserializer.intf.abap b/src/data/zif_abapgit_data_deserializer.intf.abap index a653489b7..c27fde0e0 100644 --- a/src/data/zif_abapgit_data_deserializer.intf.abap +++ b/src/data/zif_abapgit_data_deserializer.intf.abap @@ -13,7 +13,7 @@ INTERFACE zif_abapgit_data_deserializer METHODS deserialize IMPORTING !ii_config TYPE REF TO zif_abapgit_data_config - !it_files TYPE zif_abapgit_definitions=>ty_files_tt + !it_files TYPE zif_abapgit_git_definitions=>ty_files_tt RETURNING VALUE(rt_result) TYPE ty_results RAISING diff --git a/src/data/zif_abapgit_data_serializer.intf.abap b/src/data/zif_abapgit_data_serializer.intf.abap index 467da2bee..de17e5cbd 100644 --- a/src/data/zif_abapgit_data_serializer.intf.abap +++ b/src/data/zif_abapgit_data_serializer.intf.abap @@ -6,7 +6,7 @@ INTERFACE zif_abapgit_data_serializer IMPORTING !ii_config TYPE REF TO zif_abapgit_data_config RETURNING - VALUE(rt_files) TYPE zif_abapgit_definitions=>ty_files_tt + VALUE(rt_files) TYPE zif_abapgit_git_definitions=>ty_files_tt RAISING zcx_abapgit_exception . ENDINTERFACE. diff --git a/src/exits/zif_abapgit_exit.intf.abap b/src/exits/zif_abapgit_exit.intf.abap index eeaad0a7d..523dc3aa1 100644 --- a/src/exits/zif_abapgit_exit.intf.abap +++ b/src/exits/zif_abapgit_exit.intf.abap @@ -15,7 +15,7 @@ INTERFACE zif_abapgit_exit !iv_repo_url TYPE csequence !iv_repo_name TYPE csequence !iv_repo_key TYPE csequence - !iv_commit_hash TYPE zif_abapgit_definitions=>ty_sha1 + !iv_commit_hash TYPE zif_abapgit_git_definitions=>ty_sha1 CHANGING !cv_display_url TYPE csequence RAISING @@ -83,7 +83,7 @@ INTERFACE zif_abapgit_exit !is_repo_meta TYPE zif_abapgit_persistence=>ty_repo CHANGING !ct_local TYPE zif_abapgit_definitions=>ty_files_item_tt - !ct_remote TYPE zif_abapgit_definitions=>ty_files_tt + !ct_remote TYPE zif_abapgit_git_definitions=>ty_files_tt RAISING zcx_abapgit_exception . METHODS wall_message_list @@ -120,7 +120,7 @@ INTERFACE zif_abapgit_exit METHODS validate_before_push IMPORTING - !is_comment TYPE zif_abapgit_definitions=>ty_comment + !is_comment TYPE zif_abapgit_git_definitions=>ty_comment !io_stage TYPE REF TO zcl_abapgit_stage !io_repo TYPE REF TO zcl_abapgit_repo_online RAISING diff --git a/src/git/zcl_abapgit_git_branch_list.clas.abap b/src/git/zcl_abapgit_git_branch_list.clas.abap index b54a07ebf..af88b854f 100644 --- a/src/git/zcl_abapgit_git_branch_list.clas.abap +++ b/src/git/zcl_abapgit_git_branch_list.clas.abap @@ -12,7 +12,7 @@ CLASS zcl_abapgit_git_branch_list DEFINITION IMPORTING !iv_branch_name TYPE clike RETURNING - VALUE(rs_branch) TYPE zif_abapgit_definitions=>ty_git_branch + VALUE(rs_branch) TYPE zif_abapgit_git_definitions=>ty_git_branch RAISING zcx_abapgit_exception . METHODS get_head_symref @@ -20,17 +20,17 @@ CLASS zcl_abapgit_git_branch_list DEFINITION VALUE(rv_head_symref) TYPE string . METHODS get_all RETURNING - VALUE(rt_branches) TYPE zif_abapgit_definitions=>ty_git_branch_list_tt + VALUE(rt_branches) TYPE zif_abapgit_git_definitions=>ty_git_branch_list_tt RAISING zcx_abapgit_exception . METHODS get_branches_only RETURNING - VALUE(rt_branches) TYPE zif_abapgit_definitions=>ty_git_branch_list_tt + VALUE(rt_branches) TYPE zif_abapgit_git_definitions=>ty_git_branch_list_tt RAISING zcx_abapgit_exception . METHODS get_tags_only " For potential future use RETURNING - VALUE(rt_tags) TYPE zif_abapgit_definitions=>ty_git_branch_list_tt + VALUE(rt_tags) TYPE zif_abapgit_git_definitions=>ty_git_branch_list_tt RAISING zcx_abapgit_exception . CLASS-METHODS get_display_name @@ -44,7 +44,7 @@ CLASS zcl_abapgit_git_branch_list DEFINITION !it_result TYPE string_table OPTIONAL !iv_current_row_index TYPE sy-tabix OPTIONAL RETURNING - VALUE(rv_type) TYPE zif_abapgit_definitions=>ty_git_branch_type . + VALUE(rv_type) TYPE zif_abapgit_git_definitions=>ty_git_branch_type . CLASS-METHODS complete_heads_branch_name IMPORTING !iv_branch_name TYPE clike @@ -58,7 +58,7 @@ CLASS zcl_abapgit_git_branch_list DEFINITION PROTECTED SECTION. PRIVATE SECTION. - DATA mt_branches TYPE zif_abapgit_definitions=>ty_git_branch_list_tt . + DATA mt_branches TYPE zif_abapgit_git_definitions=>ty_git_branch_list_tt . DATA mv_head_symref TYPE string . CLASS-METHODS skip_first_pkt @@ -72,14 +72,14 @@ CLASS zcl_abapgit_git_branch_list DEFINITION IMPORTING !iv_branch_name TYPE string RETURNING - VALUE(rs_branch) TYPE zif_abapgit_definitions=>ty_git_branch + VALUE(rs_branch) TYPE zif_abapgit_git_definitions=>ty_git_branch RAISING zcx_abapgit_exception . CLASS-METHODS parse_branch_list IMPORTING !iv_data TYPE string EXPORTING - !et_list TYPE zif_abapgit_definitions=>ty_git_branch_list_tt + !et_list TYPE zif_abapgit_git_definitions=>ty_git_branch_list_tt !ev_head_symref TYPE string RAISING zcx_abapgit_exception . @@ -249,7 +249,7 @@ CLASS zcl_abapgit_git_branch_list IMPLEMENTATION. METHOD parse_branch_list. DATA: lt_result TYPE TABLE OF string, - lv_hash TYPE zif_abapgit_definitions=>ty_sha1, + lv_hash TYPE zif_abapgit_git_definitions=>ty_sha1, lv_name TYPE string, lv_head_params TYPE string, lv_char TYPE c, diff --git a/src/git/zcl_abapgit_git_branch_list.clas.testclasses.abap b/src/git/zcl_abapgit_git_branch_list.clas.testclasses.abap index e4c66274d..1aab9ee28 100644 --- a/src/git/zcl_abapgit_git_branch_list.clas.testclasses.abap +++ b/src/git/zcl_abapgit_git_branch_list.clas.testclasses.abap @@ -30,7 +30,7 @@ CLASS ltcl_parse IMPLEMENTATION. METHOD parse. DATA: lv_data TYPE string, - lt_list TYPE zif_abapgit_definitions=>ty_git_branch_list_tt. + lt_list TYPE zif_abapgit_git_definitions=>ty_git_branch_list_tt. CONCATENATE LINES OF mt_data INTO lv_data SEPARATED BY zif_abapgit_definitions=>c_newline. diff --git a/src/git/zcl_abapgit_git_commit.clas.abap b/src/git/zcl_abapgit_git_commit.clas.abap index fe70a8485..595c80e05 100644 --- a/src/git/zcl_abapgit_git_commit.clas.abap +++ b/src/git/zcl_abapgit_git_commit.clas.abap @@ -6,7 +6,7 @@ CLASS zcl_abapgit_git_commit DEFINITION TYPES: BEGIN OF ty_pull_result, commits TYPE zif_abapgit_definitions=>ty_commit_tt, - commit TYPE zif_abapgit_definitions=>ty_sha1, + commit TYPE zif_abapgit_git_definitions=>ty_sha1, END OF ty_pull_result . CLASS-METHODS get_by_branch @@ -21,7 +21,7 @@ CLASS zcl_abapgit_git_commit DEFINITION zcx_abapgit_exception . CLASS-METHODS get_by_commit IMPORTING - !iv_commit_hash TYPE zif_abapgit_definitions=>ty_sha1 + !iv_commit_hash TYPE zif_abapgit_git_definitions=>ty_sha1 !iv_repo_url TYPE string !iv_deepen_level TYPE i RETURNING @@ -44,10 +44,9 @@ CLASS zcl_abapgit_git_commit DEFINITION CHANGING !ct_commits TYPE zif_abapgit_definitions=>ty_commit_tt . CLASS-METHODS clear_missing_parents CHANGING ct_commits TYPE zif_abapgit_definitions=>ty_commit_tt . - PROTECTED SECTION. PRIVATE SECTION. - TYPES: ty_sha1_range TYPE RANGE OF zif_abapgit_definitions=>ty_sha1 . + TYPES: ty_sha1_range TYPE RANGE OF zif_abapgit_git_definitions=>ty_sha1 . CLASS-METHODS get_1st_child_commit IMPORTING @@ -61,11 +60,9 @@ CLASS zcl_abapgit_git_commit DEFINITION CLASS-METHODS is_missing IMPORTING it_commits TYPE zif_abapgit_definitions=>ty_commit_tt - iv_sha1 TYPE zif_abapgit_definitions=>ty_sha1 + iv_sha1 TYPE zif_abapgit_git_definitions=>ty_sha1 RETURNING VALUE(rv_result) TYPE abap_bool. - - ENDCLASS. diff --git a/src/git/zcl_abapgit_git_commit.clas.testclasses.abap b/src/git/zcl_abapgit_git_commit.clas.testclasses.abap index 9e28c1286..e1461b8b6 100644 --- a/src/git/zcl_abapgit_git_commit.clas.testclasses.abap +++ b/src/git/zcl_abapgit_git_commit.clas.testclasses.abap @@ -115,12 +115,12 @@ CLASS ltc_parent_handling DEFINITION FINAL FOR TESTING METHODS missing_parent1_cleared FOR TESTING RAISING cx_static_check. METHODS missing_parent2_cleared FOR TESTING RAISING cx_static_check. METHODS matched_parent1_remains FOR TESTING RAISING cx_static_check. - METHODS given_commit_sha1 IMPORTING iv_sha1 TYPE zif_abapgit_definitions=>ty_sha1. - METHODS parent_should_be_missing IMPORTING iv_sha1 TYPE zif_abapgit_definitions=>ty_sha1. - METHODS parent_should_not_be_missing IMPORTING iv_sha1 TYPE zif_abapgit_definitions=>ty_sha1. - METHODS given_commit IMPORTING iv_sha1 TYPE zif_abapgit_definitions=>ty_sha1 - iv_parent1 TYPE zif_abapgit_definitions=>ty_sha1 OPTIONAL - iv_parent2 TYPE zif_abapgit_definitions=>ty_sha1 OPTIONAL. + METHODS given_commit_sha1 IMPORTING iv_sha1 TYPE zif_abapgit_git_definitions=>ty_sha1. + METHODS parent_should_be_missing IMPORTING iv_sha1 TYPE zif_abapgit_git_definitions=>ty_sha1. + METHODS parent_should_not_be_missing IMPORTING iv_sha1 TYPE zif_abapgit_git_definitions=>ty_sha1. + METHODS given_commit IMPORTING iv_sha1 TYPE zif_abapgit_git_definitions=>ty_sha1 + iv_parent1 TYPE zif_abapgit_git_definitions=>ty_sha1 OPTIONAL + iv_parent2 TYPE zif_abapgit_git_definitions=>ty_sha1 OPTIONAL. ENDCLASS. diff --git a/src/git/zcl_abapgit_git_pack.clas.abap b/src/git/zcl_abapgit_git_pack.clas.abap index 867049bff..a25f0efa8 100644 --- a/src/git/zcl_abapgit_git_pack.clas.abap +++ b/src/git/zcl_abapgit_git_pack.clas.abap @@ -7,15 +7,15 @@ CLASS zcl_abapgit_git_pack DEFINITION BEGIN OF ty_node, chmod TYPE zif_abapgit_definitions=>ty_chmod, name TYPE string, - sha1 TYPE zif_abapgit_definitions=>ty_sha1, + sha1 TYPE zif_abapgit_git_definitions=>ty_sha1, END OF ty_node . TYPES: ty_nodes_tt TYPE STANDARD TABLE OF ty_node WITH DEFAULT KEY . TYPES: BEGIN OF ty_commit, - tree TYPE zif_abapgit_definitions=>ty_sha1, - parent TYPE zif_abapgit_definitions=>ty_sha1, - parent2 TYPE zif_abapgit_definitions=>ty_sha1, + tree TYPE zif_abapgit_git_definitions=>ty_sha1, + parent TYPE zif_abapgit_git_definitions=>ty_sha1, + parent2 TYPE zif_abapgit_git_definitions=>ty_sha1, author TYPE string, committer TYPE string, gpgsig TYPE string, @@ -126,7 +126,7 @@ CLASS zcl_abapgit_git_pack DEFINITION IMPORTING !iv_x TYPE x RETURNING - VALUE(rv_type) TYPE zif_abapgit_definitions=>ty_type + VALUE(rv_type) TYPE zif_abapgit_git_definitions=>ty_type RAISING zcx_abapgit_exception . CLASS-METHODS get_length @@ -136,7 +136,7 @@ CLASS zcl_abapgit_git_pack DEFINITION !cv_data TYPE xstring . CLASS-METHODS type_and_length IMPORTING - !iv_type TYPE zif_abapgit_definitions=>ty_type + !iv_type TYPE zif_abapgit_git_definitions=>ty_type !iv_length TYPE i RETURNING VALUE(rv_xstring) TYPE xstring @@ -152,7 +152,7 @@ ENDCLASS. -CLASS zcl_abapgit_git_pack IMPLEMENTATION. +CLASS ZCL_ABAPGIT_GIT_PACK IMPLEMENTATION. METHOD decode. @@ -163,8 +163,8 @@ CLASS zcl_abapgit_git_pack IMPLEMENTATION. lv_zlib TYPE x LENGTH 2, lv_objects TYPE i, lv_len TYPE i, - lv_sha1 TYPE zif_abapgit_definitions=>ty_sha1, - lv_ref_delta TYPE zif_abapgit_definitions=>ty_sha1, + lv_sha1 TYPE zif_abapgit_git_definitions=>ty_sha1, + lv_ref_delta TYPE zif_abapgit_git_definitions=>ty_sha1, lv_compressed_len TYPE i, lv_compressed TYPE xstring, lv_decompressed TYPE xstring, @@ -512,7 +512,7 @@ CLASS zcl_abapgit_git_pack IMPLEMENTATION. lv_result TYPE xstring, lv_offset TYPE i, lo_stream TYPE REF TO lcl_stream, - lv_sha1 TYPE zif_abapgit_definitions=>ty_sha1, + lv_sha1 TYPE zif_abapgit_git_definitions=>ty_sha1, ls_object LIKE LINE OF ct_objects, lv_len TYPE i, lv_tmp TYPE xstring, @@ -602,7 +602,7 @@ CLASS zcl_abapgit_git_pack IMPLEMENTATION. METHOD delta_header. - DATA: lv_bitbyte TYPE zif_abapgit_definitions=>ty_bitbyte, + DATA: lv_bitbyte TYPE zif_abapgit_git_definitions=>ty_bitbyte, lv_bits TYPE string, lv_x TYPE x. @@ -624,7 +624,7 @@ CLASS zcl_abapgit_git_pack IMPLEMENTATION. METHOD encode. DATA: lv_sha1 TYPE x LENGTH 20, - lv_adler32 TYPE zif_abapgit_definitions=>ty_adler32, + lv_adler32 TYPE zif_abapgit_git_definitions=>ty_adler32, lv_compressed TYPE xstring, lv_xstring TYPE xstring, li_progress TYPE REF TO zif_abapgit_progress, @@ -794,7 +794,7 @@ CLASS zcl_abapgit_git_pack IMPLEMENTATION. DATA: lv_x TYPE x, lv_length_bits TYPE string, - lv_bitbyte TYPE zif_abapgit_definitions=>ty_bitbyte. + lv_bitbyte TYPE zif_abapgit_git_definitions=>ty_bitbyte. lv_x = cv_data(1). @@ -927,7 +927,7 @@ CLASS zcl_abapgit_git_pack IMPLEMENTATION. DATA: ls_data TYPE zcl_abapgit_zlib=>ty_decompress, lv_compressed_len TYPE i, - lv_adler32 TYPE zif_abapgit_definitions=>ty_adler32. + lv_adler32 TYPE zif_abapgit_git_definitions=>ty_adler32. ls_data = zcl_abapgit_zlib=>decompress( cv_data ). diff --git a/src/git/zcl_abapgit_git_pack.clas.testclasses.abap b/src/git/zcl_abapgit_git_pack.clas.testclasses.abap index b8f3e3ba1..979557ef8 100644 --- a/src/git/zcl_abapgit_git_pack.clas.testclasses.abap +++ b/src/git/zcl_abapgit_git_pack.clas.testclasses.abap @@ -95,7 +95,7 @@ CLASS ltcl_type_and_length DEFINITION FOR TESTING DURATION SHORT RISK LEVEL HARM test IMPORTING iv_length TYPE i - iv_type TYPE zif_abapgit_definitions=>ty_type DEFAULT zif_abapgit_definitions=>c_type-commit + iv_type TYPE zif_abapgit_git_definitions=>ty_type DEFAULT zif_abapgit_definitions=>c_type-commit iv_expected TYPE xstring RAISING zcx_abapgit_exception, @@ -224,7 +224,7 @@ CLASS ltcl_pack DEFINITION FOR TESTING DURATION SHORT RISK LEVEL HARMLESS FINAL. PRIVATE SECTION. - CONSTANTS: c_sha TYPE zif_abapgit_definitions=>ty_sha1 VALUE '5f46cb3c4b7f0b3600b64f744cde614a283a88dc'. + CONSTANTS: c_sha TYPE zif_abapgit_git_definitions=>ty_sha1 VALUE '5f46cb3c4b7f0b3600b64f744cde614a283a88dc'. METHODS: commit FOR TESTING @@ -312,7 +312,7 @@ CLASS ltcl_pack IMPLEMENTATION. METHOD pack_multiple. CONSTANTS: lc_data TYPE x LENGTH 15 VALUE '123456789ABCDEF545794254754554', - lc_sha TYPE zif_abapgit_definitions=>ty_sha1 VALUE '5f46cb3c4b7f0b3600b64f744cde614a283a88dc'. + lc_sha TYPE zif_abapgit_git_definitions=>ty_sha1 VALUE '5f46cb3c4b7f0b3600b64f744cde614a283a88dc'. DATA: lt_objects TYPE zif_abapgit_definitions=>ty_objects_tt, ls_object LIKE LINE OF lt_objects, diff --git a/src/git/zcl_abapgit_git_porcelain.clas.abap b/src/git/zcl_abapgit_git_porcelain.clas.abap index 8a9cd70ec..0429f24e3 100644 --- a/src/git/zcl_abapgit_git_porcelain.clas.abap +++ b/src/git/zcl_abapgit_git_porcelain.clas.abap @@ -7,15 +7,15 @@ CLASS zcl_abapgit_git_porcelain DEFINITION TYPES: BEGIN OF ty_pull_result, - files TYPE zif_abapgit_definitions=>ty_files_tt, + files TYPE zif_abapgit_git_definitions=>ty_files_tt, objects TYPE zif_abapgit_definitions=>ty_objects_tt, - commit TYPE zif_abapgit_definitions=>ty_sha1, + commit TYPE zif_abapgit_git_definitions=>ty_sha1, END OF ty_pull_result . TYPES: BEGIN OF ty_push_result, - new_files TYPE zif_abapgit_definitions=>ty_files_tt, - branch TYPE zif_abapgit_definitions=>ty_sha1, - updated_files TYPE zif_abapgit_definitions=>ty_file_signatures_tt, + new_files TYPE zif_abapgit_git_definitions=>ty_files_tt, + branch TYPE zif_abapgit_git_definitions=>ty_sha1, + updated_files TYPE zif_abapgit_git_definitions=>ty_file_signatures_tt, new_objects TYPE zif_abapgit_definitions=>ty_objects_tt, END OF ty_push_result . @@ -31,7 +31,7 @@ CLASS zcl_abapgit_git_porcelain DEFINITION CLASS-METHODS pull_by_commit IMPORTING !iv_url TYPE string - !iv_commit_hash TYPE zif_abapgit_definitions=>ty_sha1 + !iv_commit_hash TYPE zif_abapgit_git_definitions=>ty_sha1 !iv_deepen_level TYPE i DEFAULT 1 RETURNING VALUE(rs_result) TYPE ty_pull_result @@ -39,10 +39,10 @@ CLASS zcl_abapgit_git_porcelain DEFINITION zcx_abapgit_exception . CLASS-METHODS push IMPORTING - !is_comment TYPE zif_abapgit_definitions=>ty_comment + !is_comment TYPE zif_abapgit_git_definitions=>ty_comment !io_stage TYPE REF TO zcl_abapgit_stage !it_old_objects TYPE zif_abapgit_definitions=>ty_objects_tt - !iv_parent TYPE zif_abapgit_definitions=>ty_sha1 + !iv_parent TYPE zif_abapgit_git_definitions=>ty_sha1 !iv_url TYPE string !iv_branch_name TYPE string RETURNING @@ -53,36 +53,35 @@ CLASS zcl_abapgit_git_porcelain DEFINITION IMPORTING !iv_url TYPE string !iv_name TYPE string - !iv_from TYPE zif_abapgit_definitions=>ty_sha1 + !iv_from TYPE zif_abapgit_git_definitions=>ty_sha1 RAISING zcx_abapgit_exception . CLASS-METHODS create_tag IMPORTING !iv_url TYPE string - !is_tag TYPE zif_abapgit_definitions=>ty_git_tag + !is_tag TYPE zif_abapgit_git_definitions=>ty_git_tag RAISING zcx_abapgit_exception . CLASS-METHODS delete_branch IMPORTING !iv_url TYPE string - !is_branch TYPE zif_abapgit_definitions=>ty_git_branch + !is_branch TYPE zif_abapgit_git_definitions=>ty_git_branch RAISING zcx_abapgit_exception . CLASS-METHODS delete_tag IMPORTING !iv_url TYPE string - !is_tag TYPE zif_abapgit_definitions=>ty_git_tag + !is_tag TYPE zif_abapgit_git_definitions=>ty_git_tag RAISING zcx_abapgit_exception . CLASS-METHODS full_tree IMPORTING !it_objects TYPE zif_abapgit_definitions=>ty_objects_tt - !iv_parent TYPE zif_abapgit_definitions=>ty_sha1 + !iv_parent TYPE zif_abapgit_git_definitions=>ty_sha1 RETURNING VALUE(rt_expanded) TYPE zif_abapgit_definitions=>ty_expanded_tt RAISING zcx_abapgit_exception . - PROTECTED SECTION. PRIVATE SECTION. @@ -90,7 +89,7 @@ CLASS zcl_abapgit_git_porcelain DEFINITION BEGIN OF ty_tree, path TYPE string, data TYPE xstring, - sha1 TYPE zif_abapgit_definitions=>ty_sha1, + sha1 TYPE zif_abapgit_git_definitions=>ty_sha1, END OF ty_tree . TYPES: ty_trees_tt TYPE STANDARD TABLE OF ty_tree WITH DEFAULT KEY . @@ -98,12 +97,13 @@ CLASS zcl_abapgit_git_porcelain DEFINITION BEGIN OF ty_folder, path TYPE string, count TYPE i, - sha1 TYPE zif_abapgit_definitions=>ty_sha1, + sha1 TYPE zif_abapgit_git_definitions=>ty_sha1, END OF ty_folder . TYPES: ty_folders_tt TYPE STANDARD TABLE OF ty_folder WITH DEFAULT KEY . - CONSTANTS c_zero TYPE zif_abapgit_definitions=>ty_sha1 VALUE '0000000000000000000000000000000000000000' ##NO_TEXT. + CONSTANTS c_zero TYPE zif_abapgit_git_definitions=>ty_sha1 + VALUE '0000000000000000000000000000000000000000' ##NO_TEXT. CLASS-METHODS build_trees IMPORTING @@ -119,25 +119,25 @@ CLASS zcl_abapgit_git_porcelain DEFINITION VALUE(rt_folders) TYPE ty_folders_tt . CLASS-METHODS pull IMPORTING - !iv_commit TYPE zif_abapgit_definitions=>ty_sha1 + !iv_commit TYPE zif_abapgit_git_definitions=>ty_sha1 !it_objects TYPE zif_abapgit_definitions=>ty_objects_tt RETURNING - VALUE(rt_files) TYPE zif_abapgit_definitions=>ty_files_tt + VALUE(rt_files) TYPE zif_abapgit_git_definitions=>ty_files_tt RAISING zcx_abapgit_exception. CLASS-METHODS walk IMPORTING !it_objects TYPE zif_abapgit_definitions=>ty_objects_tt - !iv_sha1 TYPE zif_abapgit_definitions=>ty_sha1 + !iv_sha1 TYPE zif_abapgit_git_definitions=>ty_sha1 !iv_path TYPE string CHANGING - !ct_files TYPE zif_abapgit_definitions=>ty_files_tt + !ct_files TYPE zif_abapgit_git_definitions=>ty_files_tt RAISING zcx_abapgit_exception . CLASS-METHODS walk_tree IMPORTING !it_objects TYPE zif_abapgit_definitions=>ty_objects_tt - !iv_tree TYPE zif_abapgit_definitions=>ty_sha1 + !iv_tree TYPE zif_abapgit_git_definitions=>ty_sha1 !iv_base TYPE string RETURNING VALUE(rt_expanded) TYPE zif_abapgit_definitions=>ty_expanded_tt @@ -145,38 +145,37 @@ CLASS zcl_abapgit_git_porcelain DEFINITION zcx_abapgit_exception . CLASS-METHODS receive_pack_push IMPORTING - !is_comment TYPE zif_abapgit_definitions=>ty_comment + !is_comment TYPE zif_abapgit_git_definitions=>ty_comment !it_trees TYPE ty_trees_tt - !it_blobs TYPE zif_abapgit_definitions=>ty_files_tt - !iv_parent TYPE zif_abapgit_definitions=>ty_sha1 - !iv_parent2 TYPE zif_abapgit_definitions=>ty_sha1 OPTIONAL + !it_blobs TYPE zif_abapgit_git_definitions=>ty_files_tt + !iv_parent TYPE zif_abapgit_git_definitions=>ty_sha1 + !iv_parent2 TYPE zif_abapgit_git_definitions=>ty_sha1 OPTIONAL !iv_url TYPE string !iv_branch_name TYPE string EXPORTING - !ev_new_commit TYPE zif_abapgit_definitions=>ty_sha1 + !ev_new_commit TYPE zif_abapgit_git_definitions=>ty_sha1 !et_new_objects TYPE zif_abapgit_definitions=>ty_objects_tt - !ev_new_tree TYPE zif_abapgit_definitions=>ty_sha1 + !ev_new_tree TYPE zif_abapgit_git_definitions=>ty_sha1 RAISING zcx_abapgit_exception . CLASS-METHODS receive_pack_create_tag IMPORTING - !is_tag TYPE zif_abapgit_definitions=>ty_git_tag + !is_tag TYPE zif_abapgit_git_definitions=>ty_git_tag !iv_url TYPE string RAISING zcx_abapgit_exception . CLASS-METHODS create_annotated_tag IMPORTING - !is_tag TYPE zif_abapgit_definitions=>ty_git_tag + !is_tag TYPE zif_abapgit_git_definitions=>ty_git_tag !iv_url TYPE string RAISING zcx_abapgit_exception . CLASS-METHODS create_lightweight_tag IMPORTING - is_tag TYPE zif_abapgit_definitions=>ty_git_tag + is_tag TYPE zif_abapgit_git_definitions=>ty_git_tag iv_url TYPE string RAISING zcx_abapgit_exception . - ENDCLASS. @@ -481,9 +480,9 @@ CLASS zcl_abapgit_git_porcelain IMPLEMENTATION. METHOD push. DATA: lt_expanded TYPE zif_abapgit_definitions=>ty_expanded_tt, - lt_blobs TYPE zif_abapgit_definitions=>ty_files_tt, - lv_sha1 TYPE zif_abapgit_definitions=>ty_sha1, - lv_new_tree TYPE zif_abapgit_definitions=>ty_sha1, + lt_blobs TYPE zif_abapgit_git_definitions=>ty_files_tt, + lv_sha1 TYPE zif_abapgit_git_definitions=>ty_sha1, + lv_new_tree TYPE zif_abapgit_git_definitions=>ty_sha1, lt_trees TYPE ty_trees_tt, lt_stage TYPE zif_abapgit_definitions=>ty_stage_tt. @@ -568,7 +567,7 @@ CLASS zcl_abapgit_git_porcelain IMPLEMENTATION. lv_pack TYPE xstring, ls_object LIKE LINE OF lt_objects, ls_tag TYPE zcl_abapgit_git_pack=>ty_tag, - lv_new_tag_sha1 TYPE zif_abapgit_definitions=>ty_sha1. + lv_new_tag_sha1 TYPE zif_abapgit_git_definitions=>ty_sha1. * new tag ls_tag-object = is_tag-sha1. diff --git a/src/git/zcl_abapgit_git_transport.clas.abap b/src/git/zcl_abapgit_git_transport.clas.abap index 71ba9abaa..badaa3837 100644 --- a/src/git/zcl_abapgit_git_transport.clas.abap +++ b/src/git/zcl_abapgit_git_transport.clas.abap @@ -11,28 +11,28 @@ CLASS zcl_abapgit_git_transport DEFINITION !iv_url TYPE string !iv_branch_name TYPE string !iv_deepen_level TYPE i DEFAULT 1 - !it_branches TYPE zif_abapgit_definitions=>ty_git_branch_list_tt OPTIONAL + !it_branches TYPE zif_abapgit_git_definitions=>ty_git_branch_list_tt OPTIONAL EXPORTING !et_objects TYPE zif_abapgit_definitions=>ty_objects_tt - !ev_branch TYPE zif_abapgit_definitions=>ty_sha1 + !ev_branch TYPE zif_abapgit_git_definitions=>ty_sha1 RAISING zcx_abapgit_exception . CLASS-METHODS upload_pack_by_commit IMPORTING !iv_url TYPE string - !iv_hash TYPE zif_abapgit_definitions=>ty_sha1 OPTIONAL + !iv_hash TYPE zif_abapgit_git_definitions=>ty_sha1 OPTIONAL !iv_deepen_level TYPE i DEFAULT 0 EXPORTING !et_objects TYPE zif_abapgit_definitions=>ty_objects_tt - !ev_commit TYPE zif_abapgit_definitions=>ty_sha1 + !ev_commit TYPE zif_abapgit_git_definitions=>ty_sha1 RAISING zcx_abapgit_exception . * local to remote CLASS-METHODS receive_pack IMPORTING !iv_url TYPE string - !iv_old TYPE zif_abapgit_definitions=>ty_sha1 - !iv_new TYPE zif_abapgit_definitions=>ty_sha1 + !iv_old TYPE zif_abapgit_git_definitions=>ty_sha1 + !iv_new TYPE zif_abapgit_git_definitions=>ty_sha1 !iv_branch_name TYPE string !iv_pack TYPE xstring RAISING @@ -74,7 +74,7 @@ CLASS zcl_abapgit_git_transport DEFINITION !iv_branch_name TYPE string EXPORTING !eo_client TYPE REF TO zcl_abapgit_http_client - !ev_branch TYPE zif_abapgit_definitions=>ty_sha1 + !ev_branch TYPE zif_abapgit_git_definitions=>ty_sha1 !eo_branch_list TYPE REF TO zcl_abapgit_git_branch_list RAISING zcx_abapgit_exception . @@ -90,7 +90,7 @@ CLASS zcl_abapgit_git_transport DEFINITION !io_client TYPE REF TO zcl_abapgit_http_client !iv_url TYPE string !iv_deepen_level TYPE i DEFAULT 0 - !it_hashes TYPE zif_abapgit_definitions=>ty_sha1_tt + !it_hashes TYPE zif_abapgit_git_definitions=>ty_sha1_tt RETURNING VALUE(rt_objects) TYPE zif_abapgit_definitions=>ty_objects_tt RAISING @@ -384,7 +384,7 @@ CLASS ZCL_ABAPGIT_GIT_TRANSPORT IMPLEMENTATION. METHOD upload_pack_by_branch. DATA: lo_client TYPE REF TO zcl_abapgit_http_client, - lt_hashes TYPE zif_abapgit_definitions=>ty_sha1_tt. + lt_hashes TYPE zif_abapgit_git_definitions=>ty_sha1_tt. FIELD-SYMBOLS: LIKE LINE OF it_branches. @@ -420,7 +420,7 @@ CLASS ZCL_ABAPGIT_GIT_TRANSPORT IMPLEMENTATION. METHOD upload_pack_by_commit. DATA: lo_client TYPE REF TO zcl_abapgit_http_client, - lt_hashes TYPE zif_abapgit_definitions=>ty_sha1_tt. + lt_hashes TYPE zif_abapgit_git_definitions=>ty_sha1_tt. CLEAR: et_objects, diff --git a/src/git/zif_abapgit_git_definitions.intf.abap b/src/git/zif_abapgit_git_definitions.intf.abap new file mode 100644 index 000000000..e1dacb059 --- /dev/null +++ b/src/git/zif_abapgit_git_definitions.intf.abap @@ -0,0 +1,76 @@ +INTERFACE zif_abapgit_git_definitions + PUBLIC . +* this interface is self contained +* only references to built in types +* git does not know the concept of TADIR objects, only knows files + TYPES: + ty_type TYPE c LENGTH 6 . + TYPES: + ty_bitbyte TYPE c LENGTH 8 . + TYPES: + ty_sha1 TYPE c LENGTH 40 . + TYPES: ty_sha1_tt TYPE STANDARD TABLE OF ty_sha1 WITH DEFAULT KEY . + TYPES: + ty_adler32 TYPE x LENGTH 4 . + + TYPES ty_item_state TYPE c LENGTH 1. + TYPES: + BEGIN OF ty_file_signature, + path TYPE string, + filename TYPE string, + sha1 TYPE ty_sha1, + END OF ty_file_signature . + TYPES: + ty_file_signatures_tt TYPE STANDARD TABLE OF + ty_file_signature WITH DEFAULT KEY . + TYPES: + ty_file_signatures_ts TYPE SORTED TABLE OF + ty_file_signature WITH UNIQUE KEY path filename . + TYPES: + BEGIN OF ty_file. + INCLUDE TYPE ty_file_signature. + TYPES: data TYPE xstring, + END OF ty_file . + TYPES: + ty_files_tt TYPE STANDARD TABLE OF ty_file WITH DEFAULT KEY + WITH UNIQUE SORTED KEY file_path COMPONENTS path filename + WITH NON-UNIQUE SORTED KEY file COMPONENTS filename. + + TYPES ty_git_branch_type TYPE c LENGTH 2 . + TYPES: + BEGIN OF ty_git_branch, + sha1 TYPE ty_sha1, + name TYPE string, + type TYPE ty_git_branch_type, + is_head TYPE abap_bool, + display_name TYPE string, + END OF ty_git_branch . + TYPES: + ty_git_branch_list_tt TYPE STANDARD TABLE OF ty_git_branch WITH DEFAULT KEY + WITH NON-UNIQUE SORTED KEY name_key + COMPONENTS name. + TYPES: + BEGIN OF ty_git_tag, + sha1 TYPE ty_sha1, + object TYPE ty_sha1, + name TYPE string, + type TYPE ty_git_branch_type, + display_name TYPE string, + tagger_name TYPE string, + tagger_email TYPE string, + message TYPE string, + body TYPE string, + END OF ty_git_tag . + TYPES: + BEGIN OF ty_git_user, + name TYPE string, + email TYPE string, + END OF ty_git_user . + TYPES: + BEGIN OF ty_comment, + committer TYPE ty_git_user, + author TYPE ty_git_user, + comment TYPE string, + END OF ty_comment . + +ENDINTERFACE. diff --git a/src/git/zif_abapgit_git_definitions.intf.xml b/src/git/zif_abapgit_git_definitions.intf.xml new file mode 100644 index 000000000..6f8b494b9 --- /dev/null +++ b/src/git/zif_abapgit_git_definitions.intf.xml @@ -0,0 +1,15 @@ + + + + + + ZIF_ABAPGIT_GIT_DEFINITIONS + E + abapGit - Git definitions + 2 + 1 + X + + + + diff --git a/src/git_platform/zcl_abapgit_git_url.clas.abap b/src/git_platform/zcl_abapgit_git_url.clas.abap index 8786ee4a7..19f2b9283 100644 --- a/src/git_platform/zcl_abapgit_git_url.clas.abap +++ b/src/git_platform/zcl_abapgit_git_url.clas.abap @@ -24,7 +24,7 @@ CLASS zcl_abapgit_git_url DEFINITION METHODS get_default_commit_display_url IMPORTING !iv_repo_url TYPE string - !iv_hash TYPE zif_abapgit_definitions=>ty_sha1 + !iv_hash TYPE zif_abapgit_git_definitions=>ty_sha1 RETURNING VALUE(rv_commit_url) TYPE string RAISING diff --git a/src/git_platform/zcl_abapgit_git_url.clas.testclasses.abap b/src/git_platform/zcl_abapgit_git_url.clas.testclasses.abap index 4338a55be..36b2112ea 100644 --- a/src/git_platform/zcl_abapgit_git_url.clas.testclasses.abap +++ b/src/git_platform/zcl_abapgit_git_url.clas.testclasses.abap @@ -21,7 +21,7 @@ CLASS ltcl_repo_online IMPLEMENTATION. DATA: ls_provider_urls TYPE ty_show_url_test, lt_test_urls TYPE ty_show_url_tests, - lv_testhash TYPE zif_abapgit_definitions=>ty_sha1 VALUE 'my-SHA1-hash', + lv_testhash TYPE zif_abapgit_git_definitions=>ty_sha1 VALUE 'my-SHA1-hash', lo_cut TYPE REF TO zcl_abapgit_git_url, lv_show_url TYPE zif_abapgit_persistence=>ty_repo-url. diff --git a/src/objects/core/zcl_abapgit_file_status.clas.abap b/src/objects/core/zcl_abapgit_file_status.clas.abap index 8f79f1f1e..24ffa37df 100644 --- a/src/objects/core/zcl_abapgit_file_status.clas.abap +++ b/src/objects/core/zcl_abapgit_file_status.clas.abap @@ -21,8 +21,8 @@ CLASS zcl_abapgit_file_status DEFINITION !iv_devclass TYPE devclass !io_dot TYPE REF TO zcl_abapgit_dot_abapgit !it_local TYPE zif_abapgit_definitions=>ty_files_item_tt - !it_remote TYPE zif_abapgit_definitions=>ty_files_tt - !it_cur_state TYPE zif_abapgit_definitions=>ty_file_signatures_tt + !it_remote TYPE zif_abapgit_git_definitions=>ty_files_tt + !it_cur_state TYPE zif_abapgit_git_definitions=>ty_file_signatures_tt RETURNING VALUE(rt_results) TYPE zif_abapgit_definitions=>ty_results_tt RAISING @@ -31,9 +31,9 @@ CLASS zcl_abapgit_file_status DEFINITION IMPORTING !io_dot TYPE REF TO zcl_abapgit_dot_abapgit !it_local TYPE zif_abapgit_definitions=>ty_files_item_tt - !it_state_idx TYPE zif_abapgit_definitions=>ty_file_signatures_ts + !it_state_idx TYPE zif_abapgit_git_definitions=>ty_file_signatures_ts CHANGING - !ct_remote TYPE zif_abapgit_definitions=>ty_files_tt + !ct_remote TYPE zif_abapgit_git_definitions=>ty_files_tt !ct_items TYPE zif_abapgit_definitions=>ty_items_tt !ct_results TYPE zif_abapgit_definitions=>ty_results_tt RAISING @@ -42,7 +42,7 @@ CLASS zcl_abapgit_file_status DEFINITION IMPORTING !iv_devclass TYPE devclass !io_dot TYPE REF TO zcl_abapgit_dot_abapgit - !it_remote TYPE zif_abapgit_definitions=>ty_files_tt + !it_remote TYPE zif_abapgit_git_definitions=>ty_files_tt CHANGING !ct_items TYPE zif_abapgit_definitions=>ty_items_tt RAISING @@ -52,8 +52,8 @@ CLASS zcl_abapgit_file_status DEFINITION !iv_devclass TYPE devclass !io_dot TYPE REF TO zcl_abapgit_dot_abapgit !it_local TYPE zif_abapgit_definitions=>ty_files_item_tt - !it_remote TYPE zif_abapgit_definitions=>ty_files_tt - !it_state_idx TYPE zif_abapgit_definitions=>ty_file_signatures_ts + !it_remote TYPE zif_abapgit_git_definitions=>ty_files_tt + !it_state_idx TYPE zif_abapgit_git_definitions=>ty_file_signatures_ts !it_items_idx TYPE zif_abapgit_definitions=>ty_items_ts CHANGING !ct_results TYPE zif_abapgit_definitions=>ty_results_tt @@ -70,8 +70,8 @@ CLASS zcl_abapgit_file_status DEFINITION CLASS-METHODS build_existing IMPORTING !is_local TYPE zif_abapgit_definitions=>ty_file_item - !is_remote TYPE zif_abapgit_definitions=>ty_file - !it_state TYPE zif_abapgit_definitions=>ty_file_signatures_ts + !is_remote TYPE zif_abapgit_git_definitions=>ty_file + !it_state TYPE zif_abapgit_git_definitions=>ty_file_signatures_ts RETURNING VALUE(rs_result) TYPE zif_abapgit_definitions=>ty_result . CLASS-METHODS build_new_local @@ -83,9 +83,9 @@ CLASS zcl_abapgit_file_status DEFINITION IMPORTING !iv_devclass TYPE devclass !io_dot TYPE REF TO zcl_abapgit_dot_abapgit - !is_remote TYPE zif_abapgit_definitions=>ty_file + !is_remote TYPE zif_abapgit_git_definitions=>ty_file !it_items TYPE zif_abapgit_definitions=>ty_items_ts - !it_state TYPE zif_abapgit_definitions=>ty_file_signatures_ts + !it_state TYPE zif_abapgit_git_definitions=>ty_file_signatures_ts RETURNING VALUE(rs_result) TYPE zif_abapgit_definitions=>ty_result RAISING @@ -280,7 +280,7 @@ CLASS zcl_abapgit_file_status IMPLEMENTATION. lt_remote LIKE it_remote, lt_items TYPE zif_abapgit_definitions=>ty_items_tt, lt_items_idx TYPE zif_abapgit_definitions=>ty_items_ts, " Sorted by obj_type+obj_name - lt_state_idx TYPE zif_abapgit_definitions=>ty_file_signatures_ts. " Sorted by path+filename + lt_state_idx TYPE zif_abapgit_git_definitions=>ty_file_signatures_ts. " Sorted by path+filename lt_state_idx = it_cur_state. " Force sort it @@ -380,7 +380,7 @@ CLASS zcl_abapgit_file_status IMPLEMENTATION. DATA: lt_res_sort LIKE it_results, - ls_file TYPE zif_abapgit_definitions=>ty_file_signature. + ls_file TYPE zif_abapgit_git_definitions=>ty_file_signature. FIELD-SYMBOLS LIKE LINE OF it_results. @@ -757,7 +757,7 @@ CLASS zcl_abapgit_file_status IMPLEMENTATION. METHOD status. DATA lt_local TYPE zif_abapgit_definitions=>ty_files_item_tt. - DATA lt_remote TYPE zif_abapgit_definitions=>ty_files_tt. + DATA lt_remote TYPE zif_abapgit_git_definitions=>ty_files_tt. DATA li_exit TYPE REF TO zif_abapgit_exit. lt_local = io_repo->get_files_local( ii_log = ii_log ). diff --git a/src/objects/core/zcl_abapgit_file_status.clas.testclasses.abap b/src/objects/core/zcl_abapgit_file_status.clas.testclasses.abap index 1644ea567..82a54a730 100644 --- a/src/objects/core/zcl_abapgit_file_status.clas.testclasses.abap +++ b/src/objects/core/zcl_abapgit_file_status.clas.testclasses.abap @@ -619,12 +619,12 @@ CLASS ltcl_status_helper DEFINITION FOR TESTING. IMPORTING iv_path TYPE string DEFAULT '/' iv_filename TYPE string - iv_sha1 TYPE zif_abapgit_definitions=>ty_sha1, + iv_sha1 TYPE zif_abapgit_git_definitions=>ty_sha1, add_local IMPORTING iv_path TYPE string DEFAULT '/' iv_filename TYPE string - iv_sha1 TYPE zif_abapgit_definitions=>ty_sha1 + iv_sha1 TYPE zif_abapgit_git_definitions=>ty_sha1 iv_obj_type TYPE tadir-object OPTIONAL iv_obj_name TYPE tadir-obj_name OPTIONAL iv_devclass TYPE devclass DEFAULT '$Z$', @@ -632,7 +632,7 @@ CLASS ltcl_status_helper DEFINITION FOR TESTING. IMPORTING iv_path TYPE string DEFAULT '/' iv_filename TYPE string - iv_sha1 TYPE zif_abapgit_definitions=>ty_sha1, + iv_sha1 TYPE zif_abapgit_git_definitions=>ty_sha1, run IMPORTING iv_devclass TYPE devclass DEFAULT '$Z$' @@ -652,8 +652,8 @@ CLASS ltcl_status_helper DEFINITION FOR TESTING. DATA: mt_tadir TYPE STANDARD TABLE OF ty_tadir WITH DEFAULT KEY, mt_local TYPE zif_abapgit_definitions=>ty_files_item_tt, - mt_remote TYPE zif_abapgit_definitions=>ty_files_tt, - mt_state TYPE zif_abapgit_definitions=>ty_file_signatures_tt. + mt_remote TYPE zif_abapgit_git_definitions=>ty_files_tt, + mt_state TYPE zif_abapgit_git_definitions=>ty_file_signatures_tt. ENDCLASS. diff --git a/src/objects/core/zcl_abapgit_item_state.clas.abap b/src/objects/core/zcl_abapgit_item_state.clas.abap index e52bc3714..dd0373592 100644 --- a/src/objects/core/zcl_abapgit_item_state.clas.abap +++ b/src/objects/core/zcl_abapgit_item_state.clas.abap @@ -7,10 +7,10 @@ CLASS zcl_abapgit_item_state DEFINITION METHODS local RETURNING - VALUE(rv_state) TYPE zif_abapgit_definitions=>ty_item_state. + VALUE(rv_state) TYPE zif_abapgit_git_definitions=>ty_item_state. METHODS remote RETURNING - VALUE(rv_state) TYPE zif_abapgit_definitions=>ty_item_state. + VALUE(rv_state) TYPE zif_abapgit_git_definitions=>ty_item_state. METHODS is_reassigned RETURNING VALUE(rv_is_reassigned) TYPE abap_bool. @@ -23,20 +23,18 @@ CLASS zcl_abapgit_item_state DEFINITION METHODS sum_with_status_item IMPORTING !is_status_item TYPE zif_abapgit_definitions=>ty_result. - PROTECTED SECTION. PRIVATE SECTION. - DATA mv_lstate TYPE zif_abapgit_definitions=>ty_item_state. - DATA mv_rstate TYPE zif_abapgit_definitions=>ty_item_state. + DATA mv_lstate TYPE zif_abapgit_git_definitions=>ty_item_state. + DATA mv_rstate TYPE zif_abapgit_git_definitions=>ty_item_state. DATA mv_is_reassigned TYPE abap_bool. CLASS-METHODS reduce IMPORTING - iv_prev TYPE zif_abapgit_definitions=>ty_item_state - iv_cur TYPE zif_abapgit_definitions=>ty_item_state + iv_prev TYPE zif_abapgit_git_definitions=>ty_item_state + iv_cur TYPE zif_abapgit_git_definitions=>ty_item_state RETURNING - VALUE(rv_new) TYPE zif_abapgit_definitions=>ty_item_state. - + VALUE(rv_new) TYPE zif_abapgit_git_definitions=>ty_item_state. ENDCLASS. diff --git a/src/objects/core/zcl_abapgit_objects_files.clas.abap b/src/objects/core/zcl_abapgit_objects_files.clas.abap index ee0c27a9c..ad7797869 100644 --- a/src/objects/core/zcl_abapgit_objects_files.clas.abap +++ b/src/objects/core/zcl_abapgit_objects_files.clas.abap @@ -54,7 +54,7 @@ CLASS zcl_abapgit_objects_files DEFINITION zcx_abapgit_exception . METHODS add IMPORTING - !is_file TYPE zif_abapgit_definitions=>ty_file . + !is_file TYPE zif_abapgit_git_definitions=>ty_file . METHODS add_raw IMPORTING !iv_extra TYPE clike OPTIONAL @@ -70,13 +70,13 @@ CLASS zcl_abapgit_objects_files DEFINITION zcx_abapgit_exception . METHODS get_files RETURNING - VALUE(rt_files) TYPE zif_abapgit_definitions=>ty_files_tt . + VALUE(rt_files) TYPE zif_abapgit_git_definitions=>ty_files_tt . METHODS set_files IMPORTING - !it_files TYPE zif_abapgit_definitions=>ty_files_tt . + !it_files TYPE zif_abapgit_git_definitions=>ty_files_tt . METHODS get_accessed_files RETURNING - VALUE(rt_files) TYPE zif_abapgit_definitions=>ty_file_signatures_tt . + VALUE(rt_files) TYPE zif_abapgit_git_definitions=>ty_file_signatures_tt . METHODS contains_file IMPORTING !iv_extra TYPE clike OPTIONAL @@ -102,8 +102,8 @@ CLASS zcl_abapgit_objects_files DEFINITION PRIVATE SECTION. DATA ms_item TYPE zif_abapgit_definitions=>ty_item . - DATA mt_accessed_files TYPE zif_abapgit_definitions=>ty_file_signatures_tt . - DATA mt_files TYPE zif_abapgit_definitions=>ty_files_tt . + DATA mt_accessed_files TYPE zif_abapgit_git_definitions=>ty_file_signatures_tt . + DATA mt_files TYPE zif_abapgit_git_definitions=>ty_files_tt . DATA mv_path TYPE string . ENDCLASS. @@ -120,7 +120,7 @@ CLASS zcl_abapgit_objects_files IMPLEMENTATION. METHOD add_abap. DATA: lv_source TYPE string, - ls_file TYPE zif_abapgit_definitions=>ty_file. + ls_file TYPE zif_abapgit_git_definitions=>ty_file. CONCATENATE LINES OF it_abap INTO lv_source SEPARATED BY zif_abapgit_definitions=>c_newline. @@ -141,7 +141,7 @@ CLASS zcl_abapgit_objects_files IMPLEMENTATION. METHOD add_raw. - DATA: ls_file TYPE zif_abapgit_definitions=>ty_file. + DATA: ls_file TYPE zif_abapgit_git_definitions=>ty_file. ls_file-path = '/'. ls_file-data = iv_data. @@ -157,7 +157,7 @@ CLASS zcl_abapgit_objects_files IMPLEMENTATION. METHOD add_string. - DATA: ls_file TYPE zif_abapgit_definitions=>ty_file. + DATA: ls_file TYPE zif_abapgit_git_definitions=>ty_file. ls_file-path = '/'. @@ -175,7 +175,7 @@ CLASS zcl_abapgit_objects_files IMPLEMENTATION. METHOD add_xml. DATA: lv_xml TYPE string, - ls_file TYPE zif_abapgit_definitions=>ty_file. + ls_file TYPE zif_abapgit_git_definitions=>ty_file. lv_xml = ii_xml->render( iv_normalize = iv_normalize is_metadata = is_metadata ). diff --git a/src/objects/core/zcl_abapgit_objects_files.clas.testclasses.abap b/src/objects/core/zcl_abapgit_objects_files.clas.testclasses.abap index d063d427b..6dd8eacfe 100644 --- a/src/objects/core/zcl_abapgit_objects_files.clas.testclasses.abap +++ b/src/objects/core/zcl_abapgit_objects_files.clas.testclasses.abap @@ -43,7 +43,7 @@ ENDCLASS. CLASS ltcl_objects_files IMPLEMENTATION. METHOD setup. - DATA: lt_files TYPE zif_abapgit_definitions=>ty_files_tt, + DATA: lt_files TYPE zif_abapgit_git_definitions=>ty_files_tt, ls_item TYPE zif_abapgit_definitions=>ty_item. FIELD-SYMBOLS: LIKE LINE OF lt_files. diff --git a/src/objects/core/zcl_abapgit_serialize.clas.abap b/src/objects/core/zcl_abapgit_serialize.clas.abap index 69c543d57..a35dbb14f 100644 --- a/src/objects/core/zcl_abapgit_serialize.clas.abap +++ b/src/objects/core/zcl_abapgit_serialize.clas.abap @@ -125,7 +125,7 @@ CLASS zcl_abapgit_serialize IMPLEMENTATION. METHOD add_apack. - DATA ls_apack_file TYPE zif_abapgit_definitions=>ty_file. + DATA ls_apack_file TYPE zif_abapgit_git_definitions=>ty_file. FIELD-SYMBOLS LIKE LINE OF ct_files. @@ -141,7 +141,7 @@ CLASS zcl_abapgit_serialize IMPLEMENTATION. METHOD add_data. - DATA lt_files TYPE zif_abapgit_definitions=>ty_files_tt. + DATA lt_files TYPE zif_abapgit_git_definitions=>ty_files_tt. DATA ls_file LIKE LINE OF lt_files. FIELD-SYMBOLS LIKE LINE OF ct_files. diff --git a/src/objects/enh/zcl_abapgit_object_enho_class.clas.abap b/src/objects/enh/zcl_abapgit_object_enho_class.clas.abap index 6e5532ee7..b4010778c 100644 --- a/src/objects/enh/zcl_abapgit_object_enho_class.clas.abap +++ b/src/objects/enh/zcl_abapgit_object_enho_class.clas.abap @@ -47,10 +47,10 @@ CLASS zcl_abapgit_object_enho_class IMPLEMENTATION. lt_abap TYPE rswsourcet, lx_enh_root TYPE REF TO cx_enh_root, lv_new_em TYPE abap_bool, - lt_files TYPE zif_abapgit_definitions=>ty_files_tt. + lt_files TYPE zif_abapgit_git_definitions=>ty_files_tt. FIELD-SYMBOLS: LIKE LINE OF lt_tab_methods, - TYPE zif_abapgit_definitions=>ty_file. + TYPE zif_abapgit_git_definitions=>ty_file. ii_xml->read( EXPORTING iv_name = 'TAB_METHODS' CHANGING cg_data = lt_tab_methods ). diff --git a/src/objects/zcl_abapgit_object_smim.clas.abap b/src/objects/zcl_abapgit_object_smim.clas.abap index 7c11a31e0..944b2e0ca 100644 --- a/src/objects/zcl_abapgit_object_smim.clas.abap +++ b/src/objects/zcl_abapgit_object_smim.clas.abap @@ -42,7 +42,7 @@ CLASS zcl_abapgit_object_smim IMPLEMENTATION. METHOD find_content. DATA: lv_filename TYPE string, - lt_files TYPE zif_abapgit_definitions=>ty_files_tt. + lt_files TYPE zif_abapgit_git_definitions=>ty_files_tt. FIELD-SYMBOLS: LIKE LINE OF lt_files. @@ -300,7 +300,7 @@ CLASS zcl_abapgit_object_smim IMPLEMENTATION. lv_folder TYPE abap_bool, lv_filename TYPE string, lv_class TYPE smimloio-lo_class, - ls_file TYPE zif_abapgit_definitions=>ty_file, + ls_file TYPE zif_abapgit_git_definitions=>ty_file, lv_content TYPE xstring, li_api TYPE REF TO if_mr_api, lv_loio TYPE sdok_docid. diff --git a/src/objects/zcl_abapgit_objects.clas.abap b/src/objects/zcl_abapgit_objects.clas.abap index 4de7746c9..6dd66f46b 100644 --- a/src/objects/zcl_abapgit_objects.clas.abap +++ b/src/objects/zcl_abapgit_objects.clas.abap @@ -8,7 +8,7 @@ CLASS zcl_abapgit_objects DEFINITION ty_types_tt TYPE SORTED TABLE OF tadir-object WITH UNIQUE KEY table_line . TYPES: BEGIN OF ty_serialization, - files TYPE zif_abapgit_definitions=>ty_files_tt, + files TYPE zif_abapgit_git_definitions=>ty_files_tt, item TYPE zif_abapgit_definitions=>ty_item, END OF ty_serialization . @@ -28,7 +28,7 @@ CLASS zcl_abapgit_objects DEFINITION !is_checks TYPE zif_abapgit_definitions=>ty_deserialize_checks !ii_log TYPE REF TO zif_abapgit_log RETURNING - VALUE(rt_accessed_files) TYPE zif_abapgit_definitions=>ty_file_signatures_tt + VALUE(rt_accessed_files) TYPE zif_abapgit_git_definitions=>ty_file_signatures_tt RAISING zcx_abapgit_exception . CLASS-METHODS deserialize_checks @@ -110,7 +110,7 @@ CLASS zcl_abapgit_objects DEFINITION CLASS-METHODS check_duplicates IMPORTING - !it_files TYPE zif_abapgit_definitions=>ty_files_tt + !it_files TYPE zif_abapgit_git_definitions=>ty_files_tt RAISING zcx_abapgit_exception . CLASS-METHODS class_name @@ -131,7 +131,7 @@ CLASS zcl_abapgit_objects DEFINITION CLASS-METHODS compare_remote_to_local IMPORTING !ii_object TYPE REF TO zif_abapgit_object - !it_remote TYPE zif_abapgit_definitions=>ty_files_tt + !it_remote TYPE zif_abapgit_git_definitions=>ty_files_tt !is_result TYPE zif_abapgit_definitions=>ty_result !ii_log TYPE REF TO zif_abapgit_log RAISING @@ -142,7 +142,7 @@ CLASS zcl_abapgit_objects DEFINITION !ii_log TYPE REF TO zif_abapgit_log !iv_transport TYPE trkorr CHANGING - !ct_files TYPE zif_abapgit_definitions=>ty_file_signatures_tt + !ct_files TYPE zif_abapgit_git_definitions=>ty_file_signatures_tt RAISING zcx_abapgit_exception . CLASS-METHODS check_objects_locked @@ -241,7 +241,7 @@ CLASS zcl_abapgit_objects IMPLEMENTATION. METHOD check_duplicates. - DATA: lt_files TYPE zif_abapgit_definitions=>ty_files_tt, + DATA: lt_files TYPE zif_abapgit_git_definitions=>ty_files_tt, lv_path TYPE string, lv_filename TYPE string, lt_duplicates TYPE STANDARD TABLE OF string WITH DEFAULT KEY, @@ -336,7 +336,7 @@ CLASS zcl_abapgit_objects IMPLEMENTATION. * before pull, this is useful eg. when overwriting a TABL object. * only the main XML file is used for comparison - DATA: ls_remote_file TYPE zif_abapgit_definitions=>ty_file, + DATA: ls_remote_file TYPE zif_abapgit_git_definitions=>ty_file, li_remote_version TYPE REF TO zif_abapgit_xml_input, lv_count TYPE i, ls_result TYPE zif_abapgit_comparator=>ty_result, @@ -583,7 +583,7 @@ CLASS zcl_abapgit_objects IMPLEMENTATION. DATA: ls_item TYPE zif_abapgit_definitions=>ty_item, li_obj TYPE REF TO zif_abapgit_object, - lt_remote TYPE zif_abapgit_definitions=>ty_files_tt, + lt_remote TYPE zif_abapgit_git_definitions=>ty_files_tt, lv_package TYPE devclass, lo_files TYPE REF TO zcl_abapgit_objects_files, ls_metadata TYPE zif_abapgit_definitions=>ty_metadata, diff --git a/src/objects/zif_abapgit_objects.intf.abap b/src/objects/zif_abapgit_objects.intf.abap index 27242cec8..79d6360a6 100644 --- a/src/objects/zif_abapgit_objects.intf.abap +++ b/src/objects/zif_abapgit_objects.intf.abap @@ -3,7 +3,7 @@ INTERFACE zif_abapgit_objects TYPES: BEGIN OF ty_serialization, - files TYPE zif_abapgit_definitions=>ty_files_tt, + files TYPE zif_abapgit_git_definitions=>ty_files_tt, item TYPE zif_abapgit_definitions=>ty_item, END OF ty_serialization . TYPES: diff --git a/src/persist/zcl_abapgit_persistence_user.clas.abap b/src/persist/zcl_abapgit_persistence_user.clas.abap index 52c9bca4e..e11071b83 100644 --- a/src/persist/zcl_abapgit_persistence_user.clas.abap +++ b/src/persist/zcl_abapgit_persistence_user.clas.abap @@ -27,14 +27,14 @@ CLASS zcl_abapgit_persistence_user DEFINITION BEGIN OF ty_repo_config, url TYPE zif_abapgit_persistence=>ty_repo-url, login TYPE string, - git_user TYPE zif_abapgit_definitions=>ty_git_user, + git_user TYPE zif_abapgit_git_definitions=>ty_git_user, last_change_seen TYPE string, END OF ty_repo_config . TYPES: ty_repo_configs TYPE STANDARD TABLE OF ty_repo_config WITH DEFAULT KEY . TYPES: BEGIN OF ty_user, - default_git_user TYPE zif_abapgit_definitions=>ty_git_user, + default_git_user TYPE zif_abapgit_git_definitions=>ty_git_user, repo_show TYPE zif_abapgit_persistence=>ty_repo-key, hide_files TYPE abap_bool, changes_only TYPE abap_bool, @@ -217,6 +217,11 @@ CLASS zcl_abapgit_persistence_user IMPLEMENTATION. ENDMETHOD. + METHOD zif_abapgit_persist_user~get_diff_first. + rv_diff_first = ms_user-diff_first. + ENDMETHOD. + + METHOD zif_abapgit_persist_user~get_diff_unified. rv_diff_unified = ms_user-diff_unified. @@ -237,10 +242,14 @@ CLASS zcl_abapgit_persistence_user IMPLEMENTATION. ENDMETHOD. - METHOD zif_abapgit_persist_user~get_show_folders. - rv_folders = ms_user-show_folders. + METHOD zif_abapgit_persist_user~get_order_by. + rv_order_by = ms_user-order_by. + ENDMETHOD. + + METHOD zif_abapgit_persist_user~get_order_descending. + rv_order_descending = ms_user-order_descending. ENDMETHOD. @@ -301,6 +310,13 @@ CLASS zcl_abapgit_persistence_user IMPLEMENTATION. ENDMETHOD. + METHOD zif_abapgit_persist_user~get_show_folders. + + rv_folders = ms_user-show_folders. + + ENDMETHOD. + + METHOD zif_abapgit_persist_user~is_favorite_repo. READ TABLE ms_user-favorites TRANSPORTING NO FIELDS @@ -327,6 +343,27 @@ CLASS zcl_abapgit_persistence_user IMPLEMENTATION. ENDMETHOD. + METHOD zif_abapgit_persist_user~set_diff_first. + ms_user-diff_first = iv_diff_first. + update( ). + rv_diff_first = ms_user-diff_first. + ENDMETHOD. + + + METHOD zif_abapgit_persist_user~set_order_by. + ms_user-order_by = iv_order_by. + update( ). + rv_order_by = ms_user-order_by. + ENDMETHOD. + + + METHOD zif_abapgit_persist_user~set_order_descending. + ms_user-order_descending = iv_order_descending. + update( ). + rv_order_descending = ms_user-order_descending. + ENDMETHOD. + + METHOD zif_abapgit_persist_user~set_repo_git_user_email. DATA: ls_repo_config TYPE ty_repo_config. @@ -426,6 +463,7 @@ CLASS zcl_abapgit_persistence_user IMPLEMENTATION. ENDMETHOD. + METHOD zif_abapgit_persist_user~toggle_hide_files. ms_user-hide_files = boolc( ms_user-hide_files = abap_false ). @@ -435,41 +473,11 @@ CLASS zcl_abapgit_persistence_user IMPLEMENTATION. ENDMETHOD. + METHOD zif_abapgit_persist_user~toggle_show_folders. ms_user-show_folders = boolc( ms_user-show_folders = abap_false ). update( ). rv_folders = ms_user-show_folders. ENDMETHOD. - - METHOD zif_abapgit_persist_user~get_diff_first. - rv_diff_first = ms_user-diff_first. - ENDMETHOD. - - METHOD zif_abapgit_persist_user~get_order_by. - rv_order_by = ms_user-order_by. - ENDMETHOD. - - METHOD zif_abapgit_persist_user~get_order_descending. - rv_order_descending = ms_user-order_descending. - ENDMETHOD. - - METHOD zif_abapgit_persist_user~set_diff_first. - ms_user-diff_first = iv_diff_first. - update( ). - rv_diff_first = ms_user-diff_first. - ENDMETHOD. - - METHOD zif_abapgit_persist_user~set_order_by. - ms_user-order_by = iv_order_by. - update( ). - rv_order_by = ms_user-order_by. - ENDMETHOD. - - METHOD zif_abapgit_persist_user~set_order_descending. - ms_user-order_descending = iv_order_descending. - update( ). - rv_order_descending = ms_user-order_descending. - ENDMETHOD. - ENDCLASS. diff --git a/src/persist/zif_abapgit_persist_repo.intf.abap b/src/persist/zif_abapgit_persist_repo.intf.abap index 00b06466c..484a2dad5 100644 --- a/src/persist/zif_abapgit_persist_repo.intf.abap +++ b/src/persist/zif_abapgit_persist_repo.intf.abap @@ -6,7 +6,7 @@ INTERFACE zif_abapgit_persist_repo IMPORTING !iv_url TYPE string !iv_branch_name TYPE string - !iv_branch TYPE zif_abapgit_definitions=>ty_sha1 OPTIONAL + !iv_branch TYPE zif_abapgit_git_definitions=>ty_sha1 OPTIONAL iv_display_name TYPE string OPTIONAL !iv_package TYPE devclass !iv_offline TYPE abap_bool DEFAULT abap_false diff --git a/src/persist/zif_abapgit_persistence.intf.abap b/src/persist/zif_abapgit_persistence.intf.abap index 69ed30c00..80353a6c3 100644 --- a/src/persist/zif_abapgit_persistence.intf.abap +++ b/src/persist/zif_abapgit_persistence.intf.abap @@ -15,7 +15,7 @@ INTERFACE zif_abapgit_persistence PUBLIC. TYPES: BEGIN OF ty_local_checksum, item TYPE zif_abapgit_definitions=>ty_item_signature, - files TYPE zif_abapgit_definitions=>ty_file_signatures_tt, + files TYPE zif_abapgit_git_definitions=>ty_file_signatures_tt, END OF ty_local_checksum. TYPES: @@ -38,7 +38,7 @@ INTERFACE zif_abapgit_persistence PUBLIC. TYPES: BEGIN OF ty_repo_xml, url TYPE string, branch_name TYPE string, - selected_commit TYPE zif_abapgit_definitions=>ty_sha1, + selected_commit TYPE zif_abapgit_git_definitions=>ty_sha1, package TYPE devclass, created_by TYPE syuname, created_at TYPE timestampl, diff --git a/src/repo/zcl_abapgit_dot_abapgit.clas.abap b/src/repo/zcl_abapgit_dot_abapgit.clas.abap index 490a495eb..845163d15 100644 --- a/src/repo/zcl_abapgit_dot_abapgit.clas.abap +++ b/src/repo/zcl_abapgit_dot_abapgit.clas.abap @@ -24,7 +24,7 @@ CLASS zcl_abapgit_dot_abapgit DEFINITION zcx_abapgit_exception . METHODS to_file RETURNING - VALUE(rs_file) TYPE zif_abapgit_definitions=>ty_file + VALUE(rs_file) TYPE zif_abapgit_git_definitions=>ty_file RAISING zcx_abapgit_exception. METHODS get_data @@ -71,7 +71,7 @@ CLASS zcl_abapgit_dot_abapgit DEFINITION zcx_abapgit_exception . METHODS get_signature RETURNING - VALUE(rs_signature) TYPE zif_abapgit_definitions=>ty_file_signature + VALUE(rs_signature) TYPE zif_abapgit_git_definitions=>ty_file_signature RAISING zcx_abapgit_exception . METHODS get_requirements @@ -84,7 +84,6 @@ CLASS zcl_abapgit_dot_abapgit DEFINITION RETURNING VALUE(rv_version_constant) TYPE string. METHODS set_version_constant IMPORTING iv_version_constant TYPE csequence. - PROTECTED SECTION. PRIVATE SECTION. DATA: ms_data TYPE zif_abapgit_dot_abapgit=>ty_dot_abapgit. diff --git a/src/repo/zcl_abapgit_repo.clas.abap b/src/repo/zcl_abapgit_repo.clas.abap index c38b53fee..6ee70c6f5 100644 --- a/src/repo/zcl_abapgit_repo.clas.abap +++ b/src/repo/zcl_abapgit_repo.clas.abap @@ -49,7 +49,7 @@ CLASS zcl_abapgit_repo DEFINITION zcx_abapgit_exception . METHODS set_files_remote IMPORTING - !it_files TYPE zif_abapgit_definitions=>ty_files_tt . + !it_files TYPE zif_abapgit_git_definitions=>ty_files_tt . METHODS set_local_settings IMPORTING !is_settings TYPE zif_abapgit_persistence=>ty_repo-local_settings @@ -96,7 +96,7 @@ CLASS zcl_abapgit_repo DEFINITION zcx_abapgit_exception . METHODS remove_ignored_files CHANGING - ct_files TYPE zif_abapgit_definitions=>ty_files_tt + ct_files TYPE zif_abapgit_git_definitions=>ty_files_tt RAISING zcx_abapgit_exception . METHODS check_and_create_package @@ -107,7 +107,7 @@ CLASS zcl_abapgit_repo DEFINITION PROTECTED SECTION. DATA mt_local TYPE zif_abapgit_definitions=>ty_files_item_tt . - DATA mt_remote TYPE zif_abapgit_definitions=>ty_files_tt . + DATA mt_remote TYPE zif_abapgit_git_definitions=>ty_files_tt . DATA mv_request_local_refresh TYPE abap_bool . DATA mv_request_remote_refresh TYPE abap_bool . DATA mt_status TYPE zif_abapgit_definitions=>ty_results_tt . @@ -654,7 +654,7 @@ CLASS ZCL_ABAPGIT_REPO IMPLEMENTATION. METHOD zif_abapgit_repo~deserialize. - DATA: lt_updated_files TYPE zif_abapgit_definitions=>ty_file_signatures_tt, + DATA: lt_updated_files TYPE zif_abapgit_git_definitions=>ty_file_signatures_tt, lt_result TYPE zif_abapgit_data_deserializer=>ty_results, lx_error TYPE REF TO zcx_abapgit_exception. diff --git a/src/repo/zcl_abapgit_repo.clas.testclasses.abap b/src/repo/zcl_abapgit_repo.clas.testclasses.abap index 04e1d9e85..fb92cc1af 100644 --- a/src/repo/zcl_abapgit_repo.clas.testclasses.abap +++ b/src/repo/zcl_abapgit_repo.clas.testclasses.abap @@ -74,7 +74,7 @@ CLASS ltcl_find_remote_dot_abapgit IMPLEMENTATION. METHOD given_dot_abapgit_file. DATA: - lt_files TYPE zif_abapgit_definitions=>ty_files_tt, + lt_files TYPE zif_abapgit_git_definitions=>ty_files_tt, ls_file LIKE LINE OF lt_files. ls_file-path = zif_abapgit_definitions=>c_root_dir. @@ -136,7 +136,7 @@ CLASS ltcl_find_remote_dot_abapgit IMPLEMENTATION. METHOD given_repo_has_files. - DATA: lt_files TYPE zif_abapgit_definitions=>ty_files_tt, + DATA: lt_files TYPE zif_abapgit_git_definitions=>ty_files_tt, ls_file LIKE LINE OF lt_files. ls_file-path = zif_abapgit_definitions=>c_root_dir. diff --git a/src/repo/zcl_abapgit_repo_checksums.clas.abap b/src/repo/zcl_abapgit_repo_checksums.clas.abap index 46e1deb15..1848b4c48 100644 --- a/src/repo/zcl_abapgit_repo_checksums.clas.abap +++ b/src/repo/zcl_abapgit_repo_checksums.clas.abap @@ -34,7 +34,7 @@ CLASS zcl_abapgit_repo_checksums DEFINITION METHODS build_checksums_from_files IMPORTING - it_remote TYPE zif_abapgit_definitions=>ty_files_tt + it_remote TYPE zif_abapgit_git_definitions=>ty_files_tt it_local TYPE ty_local_files_by_item_tt iv_branches_equal TYPE abap_bool DEFAULT abap_false RETURNING @@ -56,7 +56,6 @@ CLASS zcl_abapgit_repo_checksums DEFINITION CHANGING * co_string_map - return string map with meta when it is needed cv_cs_blob TYPE string. - ENDCLASS. @@ -209,7 +208,7 @@ CLASS ZCL_ABAPGIT_REPO_CHECKSUMS IMPLEMENTATION. METHOD zif_abapgit_repo_checksums~rebuild. - DATA lt_remote TYPE zif_abapgit_definitions=>ty_files_tt. + DATA lt_remote TYPE zif_abapgit_git_definitions=>ty_files_tt. DATA lt_local TYPE ty_local_files_by_item_tt. DATA lt_checksums TYPE zif_abapgit_persistence=>ty_local_checksum_tt. diff --git a/src/repo/zcl_abapgit_repo_checksums.clas.locals_imp.abap b/src/repo/zcl_abapgit_repo_checksums.clas.locals_imp.abap index be1137b1e..47a091d28 100644 --- a/src/repo/zcl_abapgit_repo_checksums.clas.locals_imp.abap +++ b/src/repo/zcl_abapgit_repo_checksums.clas.locals_imp.abap @@ -129,7 +129,7 @@ CLASS lcl_update_calculator DEFINITION CLASS-METHODS calculate_updated IMPORTING - it_updated_files TYPE zif_abapgit_definitions=>ty_file_signatures_tt + it_updated_files TYPE zif_abapgit_git_definitions=>ty_file_signatures_tt it_current_checksums TYPE zif_abapgit_persistence=>ty_local_checksum_tt it_local_files TYPE zif_abapgit_definitions=>ty_files_item_tt RETURNING @@ -139,13 +139,13 @@ CLASS lcl_update_calculator DEFINITION CLASS-METHODS process_updated_files CHANGING - ct_update_index TYPE zif_abapgit_definitions=>ty_file_signatures_ts + ct_update_index TYPE zif_abapgit_git_definitions=>ty_file_signatures_ts ct_checksums TYPE zif_abapgit_persistence=>ty_local_checksum_by_item_tt. CLASS-METHODS add_new_files IMPORTING it_local TYPE zif_abapgit_definitions=>ty_files_item_tt - it_update_index TYPE zif_abapgit_definitions=>ty_file_signatures_ts + it_update_index TYPE zif_abapgit_git_definitions=>ty_file_signatures_ts CHANGING ct_checksums TYPE zif_abapgit_persistence=>ty_local_checksum_by_item_tt. @@ -155,7 +155,7 @@ CLASS lcl_update_calculator IMPLEMENTATION. METHOD calculate_updated. - DATA lt_update_index TYPE zif_abapgit_definitions=>ty_file_signatures_ts. + DATA lt_update_index TYPE zif_abapgit_git_definitions=>ty_file_signatures_ts. DATA lt_checksums_sorted TYPE zif_abapgit_persistence=>ty_local_checksum_by_item_tt. lt_checksums_sorted = it_current_checksums. diff --git a/src/repo/zcl_abapgit_repo_checksums.clas.testclasses.abap b/src/repo/zcl_abapgit_repo_checksums.clas.testclasses.abap index 128495b89..66b41e45f 100644 --- a/src/repo/zcl_abapgit_repo_checksums.clas.testclasses.abap +++ b/src/repo/zcl_abapgit_repo_checksums.clas.testclasses.abap @@ -203,7 +203,7 @@ CLASS lcl_repo_mock DEFINITION FINAL. INTERFACES zif_abapgit_repo. INTERFACES zif_abapgit_repo_srv. DATA mt_local_files TYPE zif_abapgit_definitions=>ty_files_item_tt. - DATA mt_remote_files TYPE zif_abapgit_definitions=>ty_files_tt. + DATA mt_remote_files TYPE zif_abapgit_git_definitions=>ty_files_tt. ENDCLASS. CLASS lcl_repo_mock IMPLEMENTATION. @@ -305,7 +305,7 @@ ENDCLASS. CLASS lcl_remote_file_builder DEFINITION FINAL. PUBLIC SECTION. - DATA mt_tab TYPE zif_abapgit_definitions=>ty_files_tt. + DATA mt_tab TYPE zif_abapgit_git_definitions=>ty_files_tt. METHODS add IMPORTING iv_str TYPE string. ENDCLASS. @@ -325,7 +325,7 @@ ENDCLASS. CLASS lcl_file_sig_builder DEFINITION FINAL. PUBLIC SECTION. - DATA mt_tab TYPE zif_abapgit_definitions=>ty_file_signatures_tt. + DATA mt_tab TYPE zif_abapgit_git_definitions=>ty_file_signatures_tt. METHODS add IMPORTING iv_str TYPE string. ENDCLASS. diff --git a/src/repo/zcl_abapgit_repo_content_list.clas.abap b/src/repo/zcl_abapgit_repo_content_list.clas.abap index 471c7d894..1510913f5 100644 --- a/src/repo/zcl_abapgit_repo_content_list.clas.abap +++ b/src/repo/zcl_abapgit_repo_content_list.clas.abap @@ -227,7 +227,7 @@ CLASS zcl_abapgit_repo_content_list IMPLEMENTATION. CONSTANTS lc_new_repo_size TYPE i VALUE 10. - DATA lt_remote TYPE zif_abapgit_definitions=>ty_files_tt. + DATA lt_remote TYPE zif_abapgit_git_definitions=>ty_files_tt. lt_remote = mo_repo->get_files_remote( ). diff --git a/src/repo/zcl_abapgit_repo_filter.clas.abap b/src/repo/zcl_abapgit_repo_filter.clas.abap index fc3a64cdf..5dc36a3a1 100644 --- a/src/repo/zcl_abapgit_repo_filter.clas.abap +++ b/src/repo/zcl_abapgit_repo_filter.clas.abap @@ -16,16 +16,16 @@ CLASS zcl_abapgit_repo_filter DEFINITION io_dot TYPE REF TO zcl_abapgit_dot_abapgit OPTIONAL iv_devclass TYPE devclass OPTIONAL CHANGING - ct_files TYPE zif_abapgit_definitions=>ty_files_tt + ct_files TYPE zif_abapgit_git_definitions=>ty_files_tt RAISING zcx_abapgit_exception. - PROTECTED SECTION. METHODS filter_generated_tadir CHANGING !ct_tadir TYPE zif_abapgit_definitions=>ty_tadir_tt . + PRIVATE SECTION. ENDCLASS. @@ -63,54 +63,8 @@ CLASS zcl_abapgit_repo_filter IMPLEMENTATION. ENDMETHOD. - METHOD filter_generated_tadir. - - DATA: ls_tadir TYPE zif_abapgit_definitions=>ty_tadir, - ls_tadir_gen TYPE zif_abapgit_definitions=>ty_tadir, - lv_cd_object TYPE cdobjectcl, - lt_cd_names TYPE STANDARD TABLE OF cdnames, - ls_cd_names TYPE cdnames, - lt_tcdrs TYPE STANDARD TABLE OF tcdrs, - ls_tcdrs TYPE tcdrs. - - LOOP AT ct_tadir INTO ls_tadir WHERE pgmid = 'R3TR' AND object = 'CHDO'. - CLEAR: lv_cd_object, lt_cd_names, ls_tadir_gen, lt_tcdrs, ls_tcdrs. - - lv_cd_object = ls_tadir-obj_name. - - CALL FUNCTION 'CDNAMES_GET' - EXPORTING - iv_object = lv_cd_object - TABLES - it_names = lt_cd_names - it_tcdrs = lt_tcdrs - EXCEPTIONS - object_space = 1 - object_not_found = 2 - OTHERS = 3. - IF sy-subrc <> 0. - CONTINUE. - ENDIF. - - LOOP AT lt_cd_names INTO ls_cd_names. - DELETE ct_tadir WHERE pgmid = 'R3TR' - AND ( ( object = 'PROG' - AND ( obj_name = ls_cd_names-repnamec - OR obj_name = ls_cd_names-repnamet - OR obj_name = ls_cd_names-repnamefix - OR obj_name = ls_cd_names-repnamevar ) ) - OR object = 'FUGR' AND obj_name = ls_cd_names-fgrp ). - ENDLOOP. - - LOOP AT lt_tcdrs INTO ls_tcdrs. - DELETE ct_tadir WHERE pgmid = 'R3TR' AND object = 'TABL' AND obj_name = ls_tcdrs-tabname. - ENDLOOP. - - ENDLOOP. - - ENDMETHOD. METHOD apply_object_filter. - DATA lr_file TYPE REF TO zif_abapgit_definitions=>ty_file. + DATA lr_file TYPE REF TO zif_abapgit_git_definitions=>ty_file. DATA ls_item TYPE zif_abapgit_definitions=>ty_item. DATA ls_tadir TYPE zif_abapgit_definitions=>ty_tadir. DATA lt_tadir TYPE zif_abapgit_definitions=>ty_tadir_tt. @@ -162,4 +116,51 @@ CLASS zcl_abapgit_repo_filter IMPLEMENTATION. ENDMETHOD. + + METHOD filter_generated_tadir. + + DATA: ls_tadir TYPE zif_abapgit_definitions=>ty_tadir, + ls_tadir_gen TYPE zif_abapgit_definitions=>ty_tadir, + lv_cd_object TYPE cdobjectcl, + lt_cd_names TYPE STANDARD TABLE OF cdnames, + ls_cd_names TYPE cdnames, + lt_tcdrs TYPE STANDARD TABLE OF tcdrs, + ls_tcdrs TYPE tcdrs. + + LOOP AT ct_tadir INTO ls_tadir WHERE pgmid = 'R3TR' AND object = 'CHDO'. + CLEAR: lv_cd_object, lt_cd_names, ls_tadir_gen, lt_tcdrs, ls_tcdrs. + + lv_cd_object = ls_tadir-obj_name. + + CALL FUNCTION 'CDNAMES_GET' + EXPORTING + iv_object = lv_cd_object + TABLES + it_names = lt_cd_names + it_tcdrs = lt_tcdrs + EXCEPTIONS + object_space = 1 + object_not_found = 2 + OTHERS = 3. + IF sy-subrc <> 0. + CONTINUE. + ENDIF. + + LOOP AT lt_cd_names INTO ls_cd_names. + DELETE ct_tadir WHERE pgmid = 'R3TR' + AND ( ( object = 'PROG' + AND ( obj_name = ls_cd_names-repnamec + OR obj_name = ls_cd_names-repnamet + OR obj_name = ls_cd_names-repnamefix + OR obj_name = ls_cd_names-repnamevar ) ) + OR object = 'FUGR' AND obj_name = ls_cd_names-fgrp ). + ENDLOOP. + + LOOP AT lt_tcdrs INTO ls_tcdrs. + DELETE ct_tadir WHERE pgmid = 'R3TR' AND object = 'TABL' AND obj_name = ls_tcdrs-tabname. + ENDLOOP. + + ENDLOOP. + + ENDMETHOD. ENDCLASS. diff --git a/src/repo/zcl_abapgit_repo_online.clas.abap b/src/repo/zcl_abapgit_repo_online.clas.abap index ff2a66a88..241487938 100644 --- a/src/repo/zcl_abapgit_repo_online.clas.abap +++ b/src/repo/zcl_abapgit_repo_online.clas.abap @@ -44,7 +44,7 @@ CLASS zcl_abapgit_repo_online DEFINITION PRIVATE SECTION. DATA mt_objects TYPE zif_abapgit_definitions=>ty_objects_tt . - DATA mv_current_commit TYPE zif_abapgit_definitions=>ty_sha1 . + DATA mv_current_commit TYPE zif_abapgit_git_definitions=>ty_sha1 . METHODS handle_stage_ignore IMPORTING @@ -156,7 +156,7 @@ CLASS zcl_abapgit_repo_online IMPLEMENTATION. METHOD raise_error_if_branch_exists. DATA: - lt_branches TYPE zif_abapgit_definitions=>ty_git_branch_list_tt, + lt_branches TYPE zif_abapgit_git_definitions=>ty_git_branch_list_tt, lv_display_name TYPE string. lt_branches = zcl_abapgit_git_transport=>branches( get_url( ) )->get_branches_only( ). @@ -212,7 +212,7 @@ CLASS zcl_abapgit_repo_online IMPLEMENTATION. METHOD zif_abapgit_repo_online~create_branch. - DATA: lv_sha1 TYPE zif_abapgit_definitions=>ty_sha1. + DATA: lv_sha1 TYPE zif_abapgit_git_definitions=>ty_sha1. ASSERT iv_name CP zif_abapgit_definitions=>c_git_branch-heads. @@ -267,7 +267,7 @@ CLASS zcl_abapgit_repo_online IMPLEMENTATION. DATA: ls_push TYPE zcl_abapgit_git_porcelain=>ty_push_result, lv_text TYPE string, - lv_parent TYPE zif_abapgit_definitions=>ty_sha1. + lv_parent TYPE zif_abapgit_git_definitions=>ty_sha1. IF ms_data-branch_name CP zif_abapgit_definitions=>c_git_branch-tags. diff --git a/src/repo/zif_abapgit_repo.intf.abap b/src/repo/zif_abapgit_repo.intf.abap index 201d1aefd..22e9afda9 100644 --- a/src/repo/zif_abapgit_repo.intf.abap +++ b/src/repo/zif_abapgit_repo.intf.abap @@ -33,7 +33,7 @@ INTERFACE zif_abapgit_repo !iv_ignore_files TYPE abap_bool DEFAULT abap_false PREFERRED PARAMETER ii_obj_filter RETURNING - VALUE(rt_files) TYPE zif_abapgit_definitions=>ty_files_tt + VALUE(rt_files) TYPE zif_abapgit_git_definitions=>ty_files_tt RAISING zcx_abapgit_exception . METHODS refresh diff --git a/src/repo/zif_abapgit_repo_checksums.intf.abap b/src/repo/zif_abapgit_repo_checksums.intf.abap index 9138c0342..6f29ecfaa 100644 --- a/src/repo/zif_abapgit_repo_checksums.intf.abap +++ b/src/repo/zif_abapgit_repo_checksums.intf.abap @@ -7,7 +7,7 @@ INTERFACE zif_abapgit_repo_checksums METHODS get_checksums_per_file RETURNING - VALUE(rt_checksums) TYPE zif_abapgit_definitions=>ty_file_signatures_tt . + VALUE(rt_checksums) TYPE zif_abapgit_git_definitions=>ty_file_signatures_tt . METHODS rebuild IMPORTING @@ -17,7 +17,7 @@ INTERFACE zif_abapgit_repo_checksums METHODS update IMPORTING - !it_updated_files TYPE zif_abapgit_definitions=>ty_file_signatures_tt + !it_updated_files TYPE zif_abapgit_git_definitions=>ty_file_signatures_tt RAISING zcx_abapgit_exception. diff --git a/src/repo/zif_abapgit_repo_online.intf.abap b/src/repo/zif_abapgit_repo_online.intf.abap index 1b1ff78b1..0689ad963 100644 --- a/src/repo/zif_abapgit_repo_online.intf.abap +++ b/src/repo/zif_abapgit_repo_online.intf.abap @@ -25,7 +25,7 @@ INTERFACE zif_abapgit_repo_online zcx_abapgit_exception . METHODS get_current_remote RETURNING - VALUE(rv_sha1) TYPE zif_abapgit_definitions=>ty_sha1 + VALUE(rv_sha1) TYPE zif_abapgit_git_definitions=>ty_sha1 RAISING zcx_abapgit_exception . METHODS select_commit @@ -45,14 +45,14 @@ INTERFACE zif_abapgit_repo_online VALUE(rv_switched_origin) TYPE zif_abapgit_persistence=>ty_repo-switched_origin. METHODS push IMPORTING - !is_comment TYPE zif_abapgit_definitions=>ty_comment + !is_comment TYPE zif_abapgit_git_definitions=>ty_comment !io_stage TYPE REF TO zcl_abapgit_stage RAISING zcx_abapgit_exception . METHODS create_branch IMPORTING !iv_name TYPE string - !iv_from TYPE zif_abapgit_definitions=>ty_sha1 OPTIONAL + !iv_from TYPE zif_abapgit_git_definitions=>ty_sha1 OPTIONAL RAISING zcx_abapgit_exception . METHODS check_for_valid_branch diff --git a/src/stage/zcl_abapgit_merge.clas.abap b/src/stage/zcl_abapgit_merge.clas.abap index 41f0349a1..3c5612352 100644 --- a/src/stage/zcl_abapgit_merge.clas.abap +++ b/src/stage/zcl_abapgit_merge.clas.abap @@ -18,7 +18,7 @@ CLASS zcl_abapgit_merge DEFINITION TYPES: ty_ancestor_tt TYPE STANDARD TABLE OF zif_abapgit_definitions=>ty_ancestor WITH DEFAULT KEY . TYPES: - ty_visit_tt TYPE STANDARD TABLE OF zif_abapgit_definitions=>ty_sha1 WITH DEFAULT KEY . + ty_visit_tt TYPE STANDARD TABLE OF zif_abapgit_git_definitions=>ty_sha1 WITH DEFAULT KEY . DATA mo_repo TYPE REF TO zcl_abapgit_repo_online . DATA ms_merge TYPE zif_abapgit_merge=>ty_merge . @@ -28,7 +28,7 @@ CLASS zcl_abapgit_merge DEFINITION METHODS visit IMPORTING - !iv_parent TYPE zif_abapgit_definitions=>ty_sha1 + !iv_parent TYPE zif_abapgit_git_definitions=>ty_sha1 CHANGING !ct_visit TYPE ty_visit_tt . METHODS all_files @@ -44,7 +44,7 @@ CLASS zcl_abapgit_merge DEFINITION zcx_abapgit_exception . METHODS find_ancestors IMPORTING - !iv_commit TYPE zif_abapgit_definitions=>ty_sha1 + !iv_commit TYPE zif_abapgit_git_definitions=>ty_sha1 RETURNING VALUE(rt_ancestors) TYPE ty_ancestor_tt RAISING @@ -247,7 +247,7 @@ CLASS ZCL_ABAPGIT_MERGE IMPLEMENTATION. METHOD fetch_git. DATA: lo_branch_list TYPE REF TO zcl_abapgit_git_branch_list, - lt_upload TYPE zif_abapgit_definitions=>ty_git_branch_list_tt. + lt_upload TYPE zif_abapgit_git_definitions=>ty_git_branch_list_tt. lo_branch_list = zcl_abapgit_git_transport=>branches( ms_merge-repo->get_url( ) ). diff --git a/src/stage/zcl_abapgit_stage.clas.abap b/src/stage/zcl_abapgit_stage.clas.abap index 9545fb31a..dc01229d7 100644 --- a/src/stage/zcl_abapgit_stage.clas.abap +++ b/src/stage/zcl_abapgit_stage.clas.abap @@ -13,37 +13,37 @@ CLASS zcl_abapgit_stage DEFINITION zcx_abapgit_exception . METHODS constructor IMPORTING - !iv_merge_source TYPE zif_abapgit_definitions=>ty_sha1 OPTIONAL . + !iv_merge_source TYPE zif_abapgit_git_definitions=>ty_sha1 OPTIONAL . METHODS add IMPORTING - !iv_path TYPE zif_abapgit_definitions=>ty_file-path - !iv_filename TYPE zif_abapgit_definitions=>ty_file-filename + !iv_path TYPE zif_abapgit_git_definitions=>ty_file-path + !iv_filename TYPE zif_abapgit_git_definitions=>ty_file-filename !iv_data TYPE xstring !is_status TYPE zif_abapgit_definitions=>ty_result OPTIONAL RAISING zcx_abapgit_exception . METHODS reset IMPORTING - !iv_path TYPE zif_abapgit_definitions=>ty_file-path - !iv_filename TYPE zif_abapgit_definitions=>ty_file-filename + !iv_path TYPE zif_abapgit_git_definitions=>ty_file-path + !iv_filename TYPE zif_abapgit_git_definitions=>ty_file-filename RAISING zcx_abapgit_exception . METHODS rm IMPORTING - !iv_path TYPE zif_abapgit_definitions=>ty_file-path - !iv_filename TYPE zif_abapgit_definitions=>ty_file-filename + !iv_path TYPE zif_abapgit_git_definitions=>ty_file-path + !iv_filename TYPE zif_abapgit_git_definitions=>ty_file-filename !is_status TYPE zif_abapgit_definitions=>ty_result OPTIONAL RAISING zcx_abapgit_exception . METHODS ignore IMPORTING - !iv_path TYPE zif_abapgit_definitions=>ty_file-path - !iv_filename TYPE zif_abapgit_definitions=>ty_file-filename + !iv_path TYPE zif_abapgit_git_definitions=>ty_file-path + !iv_filename TYPE zif_abapgit_git_definitions=>ty_file-filename RAISING zcx_abapgit_exception . METHODS get_merge_source RETURNING - VALUE(rv_source) TYPE zif_abapgit_definitions=>ty_sha1 . + VALUE(rv_source) TYPE zif_abapgit_git_definitions=>ty_sha1 . METHODS count RETURNING VALUE(rv_count) TYPE i . @@ -54,12 +54,12 @@ CLASS zcl_abapgit_stage DEFINITION PRIVATE SECTION. DATA mt_stage TYPE zif_abapgit_definitions=>ty_stage_tt . - DATA mv_merge_source TYPE zif_abapgit_definitions=>ty_sha1 . + DATA mv_merge_source TYPE zif_abapgit_git_definitions=>ty_sha1 . METHODS append IMPORTING - !iv_path TYPE zif_abapgit_definitions=>ty_file-path - !iv_filename TYPE zif_abapgit_definitions=>ty_file-filename + !iv_path TYPE zif_abapgit_git_definitions=>ty_file-path + !iv_filename TYPE zif_abapgit_git_definitions=>ty_file-filename !iv_method TYPE zif_abapgit_definitions=>ty_method !is_status TYPE zif_abapgit_definitions=>ty_result OPTIONAL !iv_data TYPE xstring OPTIONAL diff --git a/src/stage/zif_abapgit_merge.intf.abap b/src/stage/zif_abapgit_merge.intf.abap index 49f91fbab..340833939 100644 --- a/src/stage/zif_abapgit_merge.intf.abap +++ b/src/stage/zif_abapgit_merge.intf.abap @@ -3,8 +3,8 @@ INTERFACE zif_abapgit_merge PUBLIC . TYPES: BEGIN OF ty_merge, repo TYPE REF TO zcl_abapgit_repo_online, - source TYPE zif_abapgit_definitions=>ty_git_branch, - target TYPE zif_abapgit_definitions=>ty_git_branch, + source TYPE zif_abapgit_git_definitions=>ty_git_branch, + target TYPE zif_abapgit_git_definitions=>ty_git_branch, common TYPE zif_abapgit_definitions=>ty_ancestor, stree TYPE zif_abapgit_definitions=>ty_expanded_tt, ttree TYPE zif_abapgit_definitions=>ty_expanded_tt, @@ -17,11 +17,11 @@ INTERFACE zif_abapgit_merge PUBLIC . BEGIN OF ty_merge_conflict, path TYPE string, filename TYPE string, - source_sha1 TYPE zif_abapgit_definitions=>ty_sha1, + source_sha1 TYPE zif_abapgit_git_definitions=>ty_sha1, source_data TYPE xstring, - target_sha1 TYPE zif_abapgit_definitions=>ty_sha1, + target_sha1 TYPE zif_abapgit_git_definitions=>ty_sha1, target_data TYPE xstring, - result_sha1 TYPE zif_abapgit_definitions=>ty_sha1, + result_sha1 TYPE zif_abapgit_git_definitions=>ty_sha1, result_data TYPE xstring, END OF ty_merge_conflict . TYPES: diff --git a/src/ui/lib/zcl_abapgit_gui_chunk_lib.clas.abap b/src/ui/lib/zcl_abapgit_gui_chunk_lib.clas.abap index a98b1621c..737b0714c 100644 --- a/src/ui/lib/zcl_abapgit_gui_chunk_lib.clas.abap +++ b/src/ui/lib/zcl_abapgit_gui_chunk_lib.clas.abap @@ -1121,8 +1121,8 @@ CLASS zcl_abapgit_gui_chunk_lib IMPLEMENTATION. METHOD render_repo_top_commit_hash. - DATA: lv_commit_hash TYPE zif_abapgit_definitions=>ty_sha1, - lv_commit_short_hash TYPE zif_abapgit_definitions=>ty_sha1, + DATA: lv_commit_hash TYPE zif_abapgit_git_definitions=>ty_sha1, + lv_commit_short_hash TYPE zif_abapgit_git_definitions=>ty_sha1, lv_display_url TYPE zif_abapgit_persistence=>ty_repo-url, lo_url TYPE REF TO zcl_abapgit_git_url, lv_icon_commit TYPE string. diff --git a/src/ui/pages/zcl_abapgit_gui_page_commit.clas.abap b/src/ui/pages/zcl_abapgit_gui_page_commit.clas.abap index 99556499a..0e41c9f5b 100644 --- a/src/ui/pages/zcl_abapgit_gui_page_commit.clas.abap +++ b/src/ui/pages/zcl_abapgit_gui_page_commit.clas.abap @@ -434,7 +434,7 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_COMMIT IMPLEMENTATION. METHOD validate_form. - DATA: lt_branches TYPE zif_abapgit_definitions=>ty_git_branch_list_tt, + DATA: lt_branches TYPE zif_abapgit_git_definitions=>ty_git_branch_list_tt, lv_new_branch_name TYPE string. ro_validation_log = mo_form_util->validate( io_form_data ). diff --git a/src/ui/pages/zcl_abapgit_gui_page_diff.clas.abap b/src/ui/pages/zcl_abapgit_gui_page_diff.clas.abap index 88dc59cd0..9041c0b90 100644 --- a/src/ui/pages/zcl_abapgit_gui_page_diff.clas.abap +++ b/src/ui/pages/zcl_abapgit_gui_page_diff.clas.abap @@ -36,7 +36,7 @@ CLASS zcl_abapgit_gui_page_diff DEFINITION METHODS constructor IMPORTING !iv_key TYPE zif_abapgit_persistence=>ty_repo-key - !is_file TYPE zif_abapgit_definitions=>ty_file OPTIONAL + !is_file TYPE zif_abapgit_git_definitions=>ty_file OPTIONAL !is_object TYPE zif_abapgit_definitions=>ty_item OPTIONAL !it_files TYPE zif_abapgit_definitions=>ty_stage_tt OPTIONAL RAISING @@ -91,7 +91,7 @@ CLASS zcl_abapgit_gui_page_diff DEFINITION !io_menu TYPE REF TO zcl_abapgit_html_toolbar . METHODS calculate_diff IMPORTING - !is_file TYPE zif_abapgit_definitions=>ty_file OPTIONAL + !is_file TYPE zif_abapgit_git_definitions=>ty_file OPTIONAL !is_object TYPE zif_abapgit_definitions=>ty_item OPTIONAL !it_files TYPE zif_abapgit_definitions=>ty_stage_tt OPTIONAL RAISING @@ -223,7 +223,7 @@ CLASS zcl_abapgit_gui_page_diff DEFINITION VALUE(ri_html) TYPE REF TO zif_abapgit_html . METHODS append_diff IMPORTING - !it_remote TYPE zif_abapgit_definitions=>ty_files_tt + !it_remote TYPE zif_abapgit_git_definitions=>ty_files_tt !it_local TYPE zif_abapgit_definitions=>ty_files_item_tt !is_status TYPE zif_abapgit_definitions=>ty_result RAISING @@ -266,7 +266,6 @@ CLASS zcl_abapgit_gui_page_diff DEFINITION !it_diffs TYPE zif_abapgit_definitions=>ty_diffs_tt RETURNING VALUE(rv_has_diffs) TYPE abap_bool. - ENDCLASS. @@ -542,7 +541,7 @@ CLASS zcl_abapgit_gui_page_diff IMPLEMENTATION. METHOD calculate_diff. - DATA: lt_remote TYPE zif_abapgit_definitions=>ty_files_tt, + DATA: lt_remote TYPE zif_abapgit_git_definitions=>ty_files_tt, lt_local TYPE zif_abapgit_definitions=>ty_files_item_tt, lt_status TYPE zif_abapgit_definitions=>ty_results_tt. diff --git a/src/ui/pages/zcl_abapgit_gui_page_merge_sel.clas.abap b/src/ui/pages/zcl_abapgit_gui_page_merge_sel.clas.abap index c118ce0d1..ce8f0e5b5 100644 --- a/src/ui/pages/zcl_abapgit_gui_page_merge_sel.clas.abap +++ b/src/ui/pages/zcl_abapgit_gui_page_merge_sel.clas.abap @@ -42,7 +42,7 @@ CLASS zcl_abapgit_gui_page_merge_sel DEFINITION DATA mo_form_data TYPE REF TO zcl_abapgit_string_map. DATA mo_form_util TYPE REF TO zcl_abapgit_html_form_utils. DATA mo_repo TYPE REF TO zcl_abapgit_repo_online. - DATA mt_branches TYPE zif_abapgit_definitions=>ty_git_branch_list_tt. + DATA mt_branches TYPE zif_abapgit_git_definitions=>ty_git_branch_list_tt. METHODS read_branches RAISING diff --git a/src/ui/pages/zcl_abapgit_gui_page_patch.clas.abap b/src/ui/pages/zcl_abapgit_gui_page_patch.clas.abap index 54f95af39..dfb2f49b7 100644 --- a/src/ui/pages/zcl_abapgit_gui_page_patch.clas.abap +++ b/src/ui/pages/zcl_abapgit_gui_page_patch.clas.abap @@ -9,7 +9,7 @@ CLASS zcl_abapgit_gui_page_patch DEFINITION constructor IMPORTING iv_key TYPE zif_abapgit_persistence=>ty_repo-key - is_file TYPE zif_abapgit_definitions=>ty_file OPTIONAL + is_file TYPE zif_abapgit_git_definitions=>ty_file OPTIONAL is_object TYPE zif_abapgit_definitions=>ty_item OPTIONAL it_files TYPE zif_abapgit_definitions=>ty_stage_tt OPTIONAL RAISING @@ -27,7 +27,6 @@ CLASS zcl_abapgit_gui_page_patch DEFINITION ev_line_index TYPE string RAISING zcx_abapgit_exception. - PROTECTED SECTION. METHODS: render_content REDEFINITION, diff --git a/src/ui/pages/zcl_abapgit_gui_page_sett_info.clas.abap b/src/ui/pages/zcl_abapgit_gui_page_sett_info.clas.abap index 21f69cc56..573ff0ca8 100644 --- a/src/ui/pages/zcl_abapgit_gui_page_sett_info.clas.abap +++ b/src/ui/pages/zcl_abapgit_gui_page_sett_info.clas.abap @@ -72,7 +72,7 @@ CLASS zcl_abapgit_gui_page_sett_info DEFINITION METHODS read_stats_files EXPORTING !et_local TYPE zif_abapgit_definitions=>ty_files_item_tt - !et_remote TYPE zif_abapgit_definitions=>ty_files_tt + !et_remote TYPE zif_abapgit_git_definitions=>ty_files_tt RAISING zcx_abapgit_exception . METHODS read_stats_state @@ -81,7 +81,7 @@ CLASS zcl_abapgit_gui_page_sett_info DEFINITION METHODS read_stats_size_lines_sloc IMPORTING !it_local TYPE zif_abapgit_definitions=>ty_files_item_tt - !it_remote TYPE zif_abapgit_definitions=>ty_files_tt + !it_remote TYPE zif_abapgit_git_definitions=>ty_files_tt EXPORTING !et_local_items TYPE zif_abapgit_definitions=>ty_items_tt !et_remote_items TYPE zif_abapgit_definitions=>ty_items_tt @@ -89,7 +89,7 @@ CLASS zcl_abapgit_gui_page_sett_info DEFINITION zcx_abapgit_exception . METHODS read_stats_file IMPORTING - !is_file TYPE zif_abapgit_definitions=>ty_file + !is_file TYPE zif_abapgit_git_definitions=>ty_file RETURNING VALUE(rs_info) TYPE ty_infos . METHODS read_stats_objects @@ -343,7 +343,7 @@ CLASS zcl_abapgit_gui_page_sett_info IMPLEMENTATION. DATA: lt_local TYPE zif_abapgit_definitions=>ty_files_item_tt, - lt_remote TYPE zif_abapgit_definitions=>ty_files_tt, + lt_remote TYPE zif_abapgit_git_definitions=>ty_files_tt, lt_local_items TYPE zif_abapgit_definitions=>ty_items_tt, lt_remote_items TYPE zif_abapgit_definitions=>ty_items_tt. @@ -407,7 +407,7 @@ CLASS zcl_abapgit_gui_page_sett_info IMPLEMENTATION. METHOD read_stats_files. DATA ls_stats TYPE ty_stats. - DATA lt_remote_wo_ignored TYPE zif_abapgit_definitions=>ty_files_tt. + DATA lt_remote_wo_ignored TYPE zif_abapgit_git_definitions=>ty_files_tt. et_local = mo_repo->get_files_local( ). diff --git a/src/ui/pages/zcl_abapgit_gui_page_sett_remo.clas.abap b/src/ui/pages/zcl_abapgit_gui_page_sett_remo.clas.abap index 9c30896f3..5a55bbe21 100644 --- a/src/ui/pages/zcl_abapgit_gui_page_sett_remo.clas.abap +++ b/src/ui/pages/zcl_abapgit_gui_page_sett_remo.clas.abap @@ -30,8 +30,8 @@ CLASS zcl_abapgit_gui_page_sett_remo DEFINITION BEGIN OF ty_remote_settings, offline TYPE zif_abapgit_persistence=>ty_repo-offline, url TYPE zif_abapgit_persistence=>ty_repo-url, - branch TYPE zif_abapgit_definitions=>ty_git_branch-name, - tag TYPE zif_abapgit_definitions=>ty_git_tag-name, + branch TYPE zif_abapgit_git_definitions=>ty_git_branch-name, + tag TYPE zif_abapgit_git_definitions=>ty_git_tag-name, commit TYPE zif_abapgit_definitions=>ty_commit-sha1, pull_request TYPE string, head_type TYPE ty_head_type, @@ -203,7 +203,7 @@ CLASS zcl_abapgit_gui_page_sett_remo IMPLEMENTATION. DATA: lv_url TYPE zif_abapgit_persistence=>ty_repo-url, lv_branch_name TYPE zif_abapgit_persistence=>ty_repo-branch_name, - ls_branch TYPE zif_abapgit_definitions=>ty_git_branch. + ls_branch TYPE zif_abapgit_git_definitions=>ty_git_branch. IF mo_form_data->get( c_id-offline ) = abap_true. RETURN. @@ -282,7 +282,7 @@ CLASS zcl_abapgit_gui_page_sett_remo IMPLEMENTATION. DATA: lo_repo TYPE REF TO zcl_abapgit_repo_online, - ls_tag TYPE zif_abapgit_definitions=>ty_git_tag, + ls_tag TYPE zif_abapgit_git_definitions=>ty_git_tag, lv_url TYPE ty_remote_settings-url. IF mo_form_data->get( c_id-offline ) = abap_true. diff --git a/src/ui/pages/zcl_abapgit_gui_page_stage.clas.abap b/src/ui/pages/zcl_abapgit_gui_page_stage.clas.abap index 511f6208f..a9d9fdaf6 100644 --- a/src/ui/pages/zcl_abapgit_gui_page_stage.clas.abap +++ b/src/ui/pages/zcl_abapgit_gui_page_stage.clas.abap @@ -69,7 +69,7 @@ CLASS zcl_abapgit_gui_page_stage DEFINITION METHODS render_file IMPORTING !iv_context TYPE string - !is_file TYPE zif_abapgit_definitions=>ty_file + !is_file TYPE zif_abapgit_git_definitions=>ty_file !is_item TYPE zif_abapgit_definitions=>ty_item OPTIONAL !is_status TYPE zif_abapgit_definitions=>ty_result !iv_changed_by TYPE syuname OPTIONAL @@ -152,7 +152,7 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_STAGE IMPLEMENTATION. METHOD check_selected. DATA: - ls_file TYPE zif_abapgit_definitions=>ty_file, + ls_file TYPE zif_abapgit_git_definitions=>ty_file, lv_pattern TYPE string, lv_msg TYPE string. @@ -721,7 +721,7 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_STAGE IMPLEMENTATION. METHOD stage_selected. - DATA ls_file TYPE zif_abapgit_definitions=>ty_file. + DATA ls_file TYPE zif_abapgit_git_definitions=>ty_file. DATA lo_files TYPE REF TO zcl_abapgit_string_map. FIELD-SYMBOLS: diff --git a/src/ui/pages/zcl_abapgit_gui_page_tags.clas.abap b/src/ui/pages/zcl_abapgit_gui_page_tags.clas.abap index c958eb051..ebe75118b 100644 --- a/src/ui/pages/zcl_abapgit_gui_page_tags.clas.abap +++ b/src/ui/pages/zcl_abapgit_gui_page_tags.clas.abap @@ -55,7 +55,7 @@ CLASS zcl_abapgit_gui_page_tags DEFINITION DATA mo_validation_log TYPE REF TO zcl_abapgit_string_map. DATA mo_repo TYPE REF TO zcl_abapgit_repo_online. DATA mo_settings TYPE REF TO zcl_abapgit_settings. - DATA ms_tag TYPE zif_abapgit_definitions=>ty_git_tag. + DATA ms_tag TYPE zif_abapgit_git_definitions=>ty_git_tag. METHODS get_form_schema IMPORTING @@ -290,7 +290,7 @@ CLASS zcl_abapgit_gui_page_tags IMPLEMENTATION. METHOD validate_form. DATA: - lt_tags TYPE zif_abapgit_definitions=>ty_git_branch_list_tt, + lt_tags TYPE zif_abapgit_git_definitions=>ty_git_branch_list_tt, lv_new_tag_name TYPE string. ro_validation_log = mo_form_util->validate( io_form_data ). @@ -323,7 +323,7 @@ CLASS zcl_abapgit_gui_page_tags IMPLEMENTATION. DATA: lx_error TYPE REF TO zcx_abapgit_exception, - lv_commit TYPE zif_abapgit_definitions=>ty_sha1, + lv_commit TYPE zif_abapgit_git_definitions=>ty_sha1, lv_text TYPE string. mo_form_data = mo_form_util->normalize( ii_event->form_data( ) ). diff --git a/src/ui/routing/zcl_abapgit_gui_router.clas.abap b/src/ui/routing/zcl_abapgit_gui_router.clas.abap index a191afeb7..14cf84791 100644 --- a/src/ui/routing/zcl_abapgit_gui_router.clas.abap +++ b/src/ui/routing/zcl_abapgit_gui_router.clas.abap @@ -284,7 +284,7 @@ CLASS zcl_abapgit_gui_router IMPLEMENTATION. METHOD get_page_diff. - DATA: ls_file TYPE zif_abapgit_definitions=>ty_file, + DATA: ls_file TYPE zif_abapgit_git_definitions=>ty_file, ls_object TYPE zif_abapgit_definitions=>ty_item, lo_page TYPE REF TO zcl_abapgit_gui_page_diff, lv_key TYPE zif_abapgit_persistence=>ty_repo-key. diff --git a/src/ui/routing/zcl_abapgit_services_git.clas.abap b/src/ui/routing/zcl_abapgit_services_git.clas.abap index d75242582..080384a5d 100644 --- a/src/ui/routing/zcl_abapgit_services_git.clas.abap +++ b/src/ui/routing/zcl_abapgit_services_git.clas.abap @@ -54,7 +54,7 @@ CLASS zcl_abapgit_services_git IMPLEMENTATION. METHOD commit. - DATA: ls_comment TYPE zif_abapgit_definitions=>ty_comment, + DATA: ls_comment TYPE zif_abapgit_git_definitions=>ty_comment, li_user TYPE REF TO zif_abapgit_persist_user. li_user = zcl_abapgit_persistence_user=>get_instance( ). @@ -134,7 +134,7 @@ CLASS zcl_abapgit_services_git IMPLEMENTATION. METHOD delete_branch. DATA: lo_repo TYPE REF TO zcl_abapgit_repo_online, - ls_branch TYPE zif_abapgit_definitions=>ty_git_branch, + ls_branch TYPE zif_abapgit_git_definitions=>ty_git_branch, lv_msg TYPE string, li_popups TYPE REF TO zif_abapgit_popups. @@ -162,7 +162,7 @@ CLASS zcl_abapgit_services_git IMPLEMENTATION. METHOD delete_tag. DATA: lo_repo TYPE REF TO zcl_abapgit_repo_online, - ls_tag TYPE zif_abapgit_definitions=>ty_git_tag, + ls_tag TYPE zif_abapgit_git_definitions=>ty_git_tag, lv_text TYPE string. lo_repo ?= zcl_abapgit_repo_srv=>get_instance( )->get( iv_key ). @@ -199,7 +199,7 @@ CLASS zcl_abapgit_services_git IMPLEMENTATION. METHOD switch_branch. DATA: lo_repo TYPE REF TO zcl_abapgit_repo_online, - ls_branch TYPE zif_abapgit_definitions=>ty_git_branch. + ls_branch TYPE zif_abapgit_git_definitions=>ty_git_branch. lo_repo ?= zcl_abapgit_repo_srv=>get_instance( )->get( iv_key ). @@ -230,7 +230,7 @@ CLASS zcl_abapgit_services_git IMPLEMENTATION. METHOD switch_tag. DATA: lo_repo TYPE REF TO zcl_abapgit_repo_online, - ls_tag TYPE zif_abapgit_definitions=>ty_git_tag, + ls_tag TYPE zif_abapgit_git_definitions=>ty_git_tag, lv_text TYPE string. lo_repo ?= zcl_abapgit_repo_srv=>get_instance( )->get( iv_key ). diff --git a/src/ui/zcl_abapgit_popups.clas.abap b/src/ui/zcl_abapgit_popups.clas.abap index 727613c3f..51037c072 100644 --- a/src/ui/zcl_abapgit_popups.clas.abap +++ b/src/ui/zcl_abapgit_popups.clas.abap @@ -32,7 +32,7 @@ CLASS zcl_abapgit_popups DEFINITION TYPES: BEGIN OF ty_commit_value_tab, - commit TYPE zif_abapgit_definitions=>ty_sha1, + commit TYPE zif_abapgit_git_definitions=>ty_sha1, message TYPE c LENGTH 100, datetime TYPE c LENGTH 20, END OF ty_commit_value_tab. @@ -552,7 +552,7 @@ CLASS zcl_abapgit_popups IMPLEMENTATION. METHOD zif_abapgit_popups~branch_list_popup. DATA: lo_branches TYPE REF TO zcl_abapgit_git_branch_list, - lt_branches TYPE zif_abapgit_definitions=>ty_git_branch_list_tt, + lt_branches TYPE zif_abapgit_git_definitions=>ty_git_branch_list_tt, lv_answer TYPE c LENGTH 1, lv_default TYPE i, lv_head_suffix TYPE string, @@ -1409,8 +1409,8 @@ CLASS zcl_abapgit_popups IMPLEMENTATION. METHOD zif_abapgit_popups~tag_list_popup. DATA: lo_branches TYPE REF TO zcl_abapgit_git_branch_list, - lt_tags TYPE zif_abapgit_definitions=>ty_git_branch_list_tt, - ls_branch TYPE zif_abapgit_definitions=>ty_git_branch, + lt_tags TYPE zif_abapgit_git_definitions=>ty_git_branch_list_tt, + ls_branch TYPE zif_abapgit_git_definitions=>ty_git_branch, lv_answer TYPE c LENGTH 1, lv_default TYPE i, lv_tag TYPE string, diff --git a/src/ui/zif_abapgit_popups.intf.abap b/src/ui/zif_abapgit_popups.intf.abap index 06c2d6ff7..7f8424d65 100644 --- a/src/ui/zif_abapgit_popups.intf.abap +++ b/src/ui/zif_abapgit_popups.intf.abap @@ -36,14 +36,14 @@ INTERFACE zif_abapgit_popups !iv_hide_branch TYPE zif_abapgit_persistence=>ty_repo-branch_name OPTIONAL !iv_hide_head TYPE abap_bool OPTIONAL RETURNING - VALUE(rs_branch) TYPE zif_abapgit_definitions=>ty_git_branch + VALUE(rs_branch) TYPE zif_abapgit_git_definitions=>ty_git_branch RAISING zcx_abapgit_exception . METHODS tag_list_popup IMPORTING !iv_url TYPE string RETURNING - VALUE(rs_tag) TYPE zif_abapgit_definitions=>ty_git_tag + VALUE(rs_tag) TYPE zif_abapgit_git_definitions=>ty_git_tag RAISING zcx_abapgit_exception . METHODS commit_list_popup diff --git a/src/utils/zcl_abapgit_convert.clas.abap b/src/utils/zcl_abapgit_convert.clas.abap index 1acdee17d..fd067134e 100644 --- a/src/utils/zcl_abapgit_convert.clas.abap +++ b/src/utils/zcl_abapgit_convert.clas.abap @@ -13,7 +13,7 @@ CLASS zcl_abapgit_convert DEFINITION IMPORTING !iv_x TYPE x RETURNING - VALUE(rv_bitbyte) TYPE zif_abapgit_definitions=>ty_bitbyte . + VALUE(rv_bitbyte) TYPE zif_abapgit_git_definitions=>ty_bitbyte . CLASS-METHODS string_to_xstring_utf8 IMPORTING !iv_string TYPE string diff --git a/src/utils/zcl_abapgit_convert.clas.testclasses.abap b/src/utils/zcl_abapgit_convert.clas.testclasses.abap index 4d90af4b6..6146344f5 100644 --- a/src/utils/zcl_abapgit_convert.clas.testclasses.abap +++ b/src/utils/zcl_abapgit_convert.clas.testclasses.abap @@ -188,7 +188,7 @@ CLASS ltcl_convert IMPLEMENTATION. DATA: lv_xstring TYPE xstring, lv_byte TYPE x, lv_input TYPE i, - lv_bitbyte TYPE zif_abapgit_definitions=>ty_bitbyte, + lv_bitbyte TYPE zif_abapgit_git_definitions=>ty_bitbyte, lv_byteint TYPE i, lv_xbyteint TYPE xstring, lv_xresult TYPE xstring, diff --git a/src/utils/zcl_abapgit_hash.clas.abap b/src/utils/zcl_abapgit_hash.clas.abap index 805fdff96..7eaea0097 100644 --- a/src/utils/zcl_abapgit_hash.clas.abap +++ b/src/utils/zcl_abapgit_hash.clas.abap @@ -8,55 +8,55 @@ CLASS zcl_abapgit_hash DEFINITION IMPORTING !iv_xstring TYPE xstring RETURNING - VALUE(rv_checksum) TYPE zif_abapgit_definitions=>ty_adler32 . + VALUE(rv_checksum) TYPE zif_abapgit_git_definitions=>ty_adler32 . CLASS-METHODS sha1 IMPORTING - !iv_type TYPE zif_abapgit_definitions=>ty_type + !iv_type TYPE zif_abapgit_git_definitions=>ty_type !iv_data TYPE xstring RETURNING - VALUE(rv_sha1) TYPE zif_abapgit_definitions=>ty_sha1 + VALUE(rv_sha1) TYPE zif_abapgit_git_definitions=>ty_sha1 RAISING zcx_abapgit_exception . CLASS-METHODS sha1_commit IMPORTING !iv_data TYPE xstring RETURNING - VALUE(rv_sha1) TYPE zif_abapgit_definitions=>ty_sha1 + VALUE(rv_sha1) TYPE zif_abapgit_git_definitions=>ty_sha1 RAISING zcx_abapgit_exception . CLASS-METHODS sha1_tree IMPORTING !iv_data TYPE xstring RETURNING - VALUE(rv_sha1) TYPE zif_abapgit_definitions=>ty_sha1 + VALUE(rv_sha1) TYPE zif_abapgit_git_definitions=>ty_sha1 RAISING zcx_abapgit_exception . CLASS-METHODS sha1_tag IMPORTING !iv_data TYPE xstring RETURNING - VALUE(rv_sha1) TYPE zif_abapgit_definitions=>ty_sha1 + VALUE(rv_sha1) TYPE zif_abapgit_git_definitions=>ty_sha1 RAISING zcx_abapgit_exception . CLASS-METHODS sha1_blob IMPORTING !iv_data TYPE xstring RETURNING - VALUE(rv_sha1) TYPE zif_abapgit_definitions=>ty_sha1 + VALUE(rv_sha1) TYPE zif_abapgit_git_definitions=>ty_sha1 RAISING zcx_abapgit_exception . CLASS-METHODS sha1_raw IMPORTING !iv_data TYPE xstring RETURNING - VALUE(rv_sha1) TYPE zif_abapgit_definitions=>ty_sha1 + VALUE(rv_sha1) TYPE zif_abapgit_git_definitions=>ty_sha1 RAISING zcx_abapgit_exception . CLASS-METHODS sha1_string IMPORTING !iv_data TYPE string RETURNING - VALUE(rv_sha1) TYPE zif_abapgit_definitions=>ty_sha1 + VALUE(rv_sha1) TYPE zif_abapgit_git_definitions=>ty_sha1 RAISING zcx_abapgit_exception . PROTECTED SECTION. diff --git a/src/utils/zcl_abapgit_hash.clas.testclasses.abap b/src/utils/zcl_abapgit_hash.clas.testclasses.abap index 79e9c2691..0c6dc007e 100644 --- a/src/utils/zcl_abapgit_hash.clas.testclasses.abap +++ b/src/utils/zcl_abapgit_hash.clas.testclasses.abap @@ -17,7 +17,7 @@ CLASS ltcl_test IMPLEMENTATION. METHOD adler32. - DATA: lv_adler TYPE zif_abapgit_definitions=>ty_adler32. + DATA: lv_adler TYPE zif_abapgit_git_definitions=>ty_adler32. lv_adler = zcl_abapgit_hash=>adler32( '1122334455667788' ). @@ -29,7 +29,7 @@ CLASS ltcl_test IMPLEMENTATION. METHOD sha1. - DATA: lv_sha1 TYPE zif_abapgit_definitions=>ty_sha1. + DATA: lv_sha1 TYPE zif_abapgit_git_definitions=>ty_sha1. lv_sha1 = zcl_abapgit_hash=>sha1( iv_type = zif_abapgit_definitions=>c_type-commit @@ -44,7 +44,7 @@ CLASS ltcl_test IMPLEMENTATION. METHOD sha1_raw_valid. - DATA: lv_sha1 TYPE zif_abapgit_definitions=>ty_sha1, + DATA: lv_sha1 TYPE zif_abapgit_git_definitions=>ty_sha1, lv_input TYPE xstring. lv_input = 'C5188BAF86A64A581D2201'. @@ -58,7 +58,7 @@ CLASS ltcl_test IMPLEMENTATION. METHOD sha1_raw_invalid. - DATA: lv_sha1 TYPE zif_abapgit_definitions=>ty_sha1, + DATA: lv_sha1 TYPE zif_abapgit_git_definitions=>ty_sha1, lv_input TYPE xstring. lv_input = 'LOREM_IPSUM'. diff --git a/src/utils/zcl_abapgit_news.clas.abap b/src/utils/zcl_abapgit_news.clas.abap index 4bf8164b6..f128903fd 100644 --- a/src/utils/zcl_abapgit_news.clas.abap +++ b/src/utils/zcl_abapgit_news.clas.abap @@ -109,7 +109,7 @@ CLASS zcl_abapgit_news IMPLEMENTATION. lc_log_filename_up TYPE string VALUE 'CHANGELOG*'. DATA: lo_apack TYPE REF TO zcl_abapgit_apack_reader, - lt_remote TYPE zif_abapgit_definitions=>ty_files_tt, + lt_remote TYPE zif_abapgit_git_definitions=>ty_files_tt, lv_version TYPE string, lv_last_seen TYPE string, lv_url TYPE string, diff --git a/src/utils/zcl_abapgit_user_record.clas.abap b/src/utils/zcl_abapgit_user_record.clas.abap index 2c7d8657c..665c74aea 100644 --- a/src/utils/zcl_abapgit_user_record.clas.abap +++ b/src/utils/zcl_abapgit_user_record.clas.abap @@ -18,10 +18,10 @@ CLASS zcl_abapgit_user_record DEFINITION !iv_user TYPE sy-uname. METHODS get_name RETURNING - VALUE(rv_name) TYPE zif_abapgit_definitions=>ty_git_user-name. + VALUE(rv_name) TYPE zif_abapgit_git_definitions=>ty_git_user-name. METHODS get_email RETURNING - VALUE(rv_email) TYPE zif_abapgit_definitions=>ty_git_user-email. + VALUE(rv_email) TYPE zif_abapgit_git_definitions=>ty_git_user-email. PROTECTED SECTION. PRIVATE SECTION. TYPES: @@ -41,7 +41,7 @@ CLASS zcl_abapgit_user_record DEFINITION WITH UNIQUE KEY user. DATA: - ms_user TYPE zif_abapgit_definitions=>ty_git_user. + ms_user TYPE zif_abapgit_git_definitions=>ty_git_user. METHODS check_user_exists IMPORTING @@ -55,7 +55,6 @@ CLASS zcl_abapgit_user_record DEFINITION METHODS get_user_dtls_from_other_clnt IMPORTING iv_user TYPE sy-uname. - ENDCLASS. diff --git a/src/zcl_abapgit_zip.clas.abap b/src/zcl_abapgit_zip.clas.abap index f24a3609d..6d3d1c77c 100644 --- a/src/zcl_abapgit_zip.clas.abap +++ b/src/zcl_abapgit_zip.clas.abap @@ -40,7 +40,7 @@ CLASS zcl_abapgit_zip DEFINITION IMPORTING !iv_xstr TYPE xstring RETURNING - VALUE(rt_files) TYPE zif_abapgit_definitions=>ty_files_tt + VALUE(rt_files) TYPE zif_abapgit_git_definitions=>ty_files_tt RAISING zcx_abapgit_exception . CLASS-METHODS save_binstring_to_localfile @@ -64,14 +64,14 @@ CLASS zcl_abapgit_zip DEFINITION zcx_abapgit_exception . CLASS-METHODS normalize_path CHANGING - !ct_files TYPE zif_abapgit_definitions=>ty_files_tt + !ct_files TYPE zif_abapgit_git_definitions=>ty_files_tt RAISING zcx_abapgit_exception . CLASS-METHODS unzip_file IMPORTING !iv_xstr TYPE xstring RETURNING - VALUE(rt_files) TYPE zif_abapgit_definitions=>ty_files_tt + VALUE(rt_files) TYPE zif_abapgit_git_definitions=>ty_files_tt RAISING zcx_abapgit_exception . ENDCLASS. diff --git a/src/zif_abapgit_definitions.intf.abap b/src/zif_abapgit_definitions.intf.abap index ad63c8939..1701ad2f9 100644 --- a/src/zif_abapgit_definitions.intf.abap +++ b/src/zif_abapgit_definitions.intf.abap @@ -1,76 +1,8 @@ INTERFACE zif_abapgit_definitions PUBLIC . - - TYPES: - ty_type TYPE c LENGTH 6 . - TYPES: - ty_bitbyte TYPE c LENGTH 8 . - TYPES: - ty_sha1 TYPE c LENGTH 40 . - TYPES: ty_sha1_tt TYPE STANDARD TABLE OF ty_sha1 WITH DEFAULT KEY . - TYPES: - ty_adler32 TYPE x LENGTH 4 . - TYPES ty_item_state TYPE c LENGTH 1. - TYPES: - BEGIN OF ty_file_signature, - path TYPE string, - filename TYPE string, - sha1 TYPE ty_sha1, - END OF ty_file_signature . - TYPES: - ty_file_signatures_tt TYPE STANDARD TABLE OF - ty_file_signature WITH DEFAULT KEY . - TYPES: - ty_file_signatures_ts TYPE SORTED TABLE OF - ty_file_signature WITH UNIQUE KEY path filename . - TYPES: - BEGIN OF ty_file. - INCLUDE TYPE ty_file_signature. - TYPES: data TYPE xstring, - END OF ty_file . - TYPES: - ty_files_tt TYPE STANDARD TABLE OF ty_file WITH DEFAULT KEY - WITH UNIQUE SORTED KEY file_path COMPONENTS path filename - WITH NON-UNIQUE SORTED KEY file COMPONENTS filename. TYPES: ty_string_tt TYPE STANDARD TABLE OF string WITH DEFAULT KEY . - TYPES ty_git_branch_type TYPE c LENGTH 2 . - TYPES: - BEGIN OF ty_git_branch, - sha1 TYPE ty_sha1, - name TYPE string, - type TYPE ty_git_branch_type, - is_head TYPE abap_bool, - display_name TYPE string, - END OF ty_git_branch . - TYPES: - ty_git_branch_list_tt TYPE STANDARD TABLE OF ty_git_branch WITH DEFAULT KEY - WITH NON-UNIQUE SORTED KEY name_key - COMPONENTS name. - TYPES: - BEGIN OF ty_git_tag, - sha1 TYPE ty_sha1, - object TYPE ty_sha1, - name TYPE string, - type TYPE ty_git_branch_type, - display_name TYPE string, - tagger_name TYPE string, - tagger_email TYPE string, - message TYPE string, - body TYPE string, - END OF ty_git_tag . - TYPES: - BEGIN OF ty_git_user, - name TYPE string, - email TYPE string, - END OF ty_git_user . - TYPES: - BEGIN OF ty_comment, - committer TYPE ty_git_user, - author TYPE ty_git_user, - comment TYPE string, - END OF ty_comment . TYPES: BEGIN OF ty_item_signature, obj_type TYPE tadir-object, @@ -90,7 +22,7 @@ INTERFACE zif_abapgit_definitions ty_items_ts TYPE SORTED TABLE OF ty_item WITH UNIQUE KEY obj_type obj_name . TYPES: BEGIN OF ty_file_item, - file TYPE ty_file, + file TYPE zif_abapgit_git_definitions=>ty_file, item TYPE ty_item, END OF ty_file_item . TYPES: @@ -155,8 +87,8 @@ INTERFACE zif_abapgit_definitions path TYPE string, filename TYPE string, is_changed TYPE abap_bool, - rstate TYPE ty_item_state, - lstate TYPE ty_item_state, + rstate TYPE zif_abapgit_git_definitions=>ty_item_state, + lstate TYPE zif_abapgit_git_definitions=>ty_item_state, END OF ty_repo_file . TYPES: ty_repo_file_tt TYPE STANDARD TABLE OF ty_repo_file WITH DEFAULT KEY . @@ -164,10 +96,10 @@ INTERFACE zif_abapgit_definitions ty_chmod TYPE c LENGTH 6 . TYPES: BEGIN OF ty_object, - sha1 TYPE ty_sha1, - type TYPE ty_type, + sha1 TYPE zif_abapgit_git_definitions=>ty_sha1, + type TYPE zif_abapgit_git_definitions=>ty_type, data TYPE xstring, - adler32 TYPE ty_adler32, + adler32 TYPE zif_abapgit_git_definitions=>ty_adler32, index TYPE i, END OF ty_object . TYPES: @@ -197,8 +129,8 @@ INTERFACE zif_abapgit_definitions filename TYPE string, package TYPE devclass, match TYPE abap_bool, - lstate TYPE ty_item_state, - rstate TYPE ty_item_state, + lstate TYPE zif_abapgit_git_definitions=>ty_item_state, + rstate TYPE zif_abapgit_git_definitions=>ty_item_state, packmove TYPE abap_bool, srcsystem TYPE tadir-srcsystem, END OF ty_result . @@ -209,7 +141,7 @@ INTERFACE zif_abapgit_definitions TYPES: BEGIN OF ty_stage_files, local TYPE ty_files_item_tt, - remote TYPE ty_files_tt, + remote TYPE zif_abapgit_git_definitions=>ty_files_tt, status TYPE ty_results_ts_path, END OF ty_stage_files . TYPES: @@ -250,9 +182,9 @@ INTERFACE zif_abapgit_definitions END OF ty_create . TYPES: BEGIN OF ty_commit, - sha1 TYPE ty_sha1, - parent1 TYPE ty_sha1, - parent2 TYPE ty_sha1, + sha1 TYPE zif_abapgit_git_definitions=>ty_sha1, + parent1 TYPE zif_abapgit_git_definitions=>ty_sha1, + parent2 TYPE zif_abapgit_git_definitions=>ty_sha1, author TYPE string, email TYPE string, time TYPE string, @@ -292,15 +224,15 @@ INTERFACE zif_abapgit_definitions BEGIN OF ty_expanded, path TYPE string, name TYPE string, - sha1 TYPE ty_sha1, + sha1 TYPE zif_abapgit_git_definitions=>ty_sha1, chmod TYPE ty_chmod, END OF ty_expanded . TYPES: ty_expanded_tt TYPE STANDARD TABLE OF ty_expanded WITH DEFAULT KEY . TYPES: BEGIN OF ty_ancestor, - commit TYPE ty_sha1, - tree TYPE ty_sha1, + commit TYPE zif_abapgit_git_definitions=>ty_sha1, + tree TYPE zif_abapgit_git_definitions=>ty_sha1, time TYPE string, body TYPE string, END OF ty_ancestor . @@ -313,8 +245,8 @@ INTERFACE zif_abapgit_definitions path TYPE string, is_dir TYPE abap_bool, changes TYPE i, - lstate TYPE ty_item_state, - rstate TYPE ty_item_state, + lstate TYPE zif_abapgit_git_definitions=>ty_item_state, + rstate TYPE zif_abapgit_git_definitions=>ty_item_state, files TYPE ty_repo_file_tt, changed_by TYPE syuname, transport TYPE trkorr, @@ -385,10 +317,10 @@ INTERFACE zif_abapgit_definitions END OF c_sci_result. CONSTANTS: BEGIN OF c_git_branch_type, - branch TYPE ty_git_branch_type VALUE 'HD', - lightweight_tag TYPE ty_git_branch_type VALUE 'TG', - annotated_tag TYPE ty_git_branch_type VALUE 'AT', - other TYPE ty_git_branch_type VALUE 'ZZ', + branch TYPE zif_abapgit_git_definitions=>ty_git_branch_type VALUE 'HD', + lightweight_tag TYPE zif_abapgit_git_definitions=>ty_git_branch_type VALUE 'TG', + annotated_tag TYPE zif_abapgit_git_definitions=>ty_git_branch_type VALUE 'AT', + other TYPE zif_abapgit_git_definitions=>ty_git_branch_type VALUE 'ZZ', END OF c_git_branch_type . CONSTANTS c_head_name TYPE string VALUE 'HEAD' ##NO_TEXT. CONSTANTS: @@ -409,19 +341,19 @@ INTERFACE zif_abapgit_definitions END OF c_diff . CONSTANTS: BEGIN OF c_type, - commit TYPE ty_type VALUE 'commit', "#EC NOTEXT - tree TYPE ty_type VALUE 'tree', "#EC NOTEXT - ref_d TYPE ty_type VALUE 'ref_d', "#EC NOTEXT - tag TYPE ty_type VALUE 'tag', "#EC NOTEXT - blob TYPE ty_type VALUE 'blob', "#EC NOTEXT + commit TYPE zif_abapgit_git_definitions=>ty_type VALUE 'commit', "#EC NOTEXT + tree TYPE zif_abapgit_git_definitions=>ty_type VALUE 'tree', "#EC NOTEXT + ref_d TYPE zif_abapgit_git_definitions=>ty_type VALUE 'ref_d', "#EC NOTEXT + tag TYPE zif_abapgit_git_definitions=>ty_type VALUE 'tag', "#EC NOTEXT + blob TYPE zif_abapgit_git_definitions=>ty_type VALUE 'blob', "#EC NOTEXT END OF c_type . CONSTANTS: BEGIN OF c_state, " https://git-scm.com/docs/git-status - unchanged TYPE ty_item_state VALUE '', - added TYPE ty_item_state VALUE 'A', - modified TYPE ty_item_state VALUE 'M', - deleted TYPE ty_item_state VALUE 'D', - mixed TYPE ty_item_state VALUE '*', + unchanged TYPE zif_abapgit_git_definitions=>ty_item_state VALUE '', + added TYPE zif_abapgit_git_definitions=>ty_item_state VALUE 'A', + modified TYPE zif_abapgit_git_definitions=>ty_item_state VALUE 'M', + deleted TYPE zif_abapgit_git_definitions=>ty_item_state VALUE 'D', + mixed TYPE zif_abapgit_git_definitions=>ty_item_state VALUE '*', END OF c_state . CONSTANTS: BEGIN OF c_chmod, @@ -523,7 +455,7 @@ INTERFACE zif_abapgit_definitions ty_method TYPE c LENGTH 1 . TYPES: BEGIN OF ty_stage, - file TYPE ty_file, + file TYPE zif_abapgit_git_definitions=>ty_file, method TYPE ty_method, status TYPE ty_result, END OF ty_stage .