From 69ac4fd768efadc7fc5b998089e19b3bd3ccc472 Mon Sep 17 00:00:00 2001 From: Mike Pokraka Date: Mon, 19 Apr 2021 16:15:47 +0100 Subject: [PATCH] Change some masters to main %26 remove unused parameter (#4710) Co-authored-by: Lars Hvam --- src/git/zcl_abapgit_git_branch_list.clas.testclasses.abap | 8 ++++---- src/ui/zcl_abapgit_popups.clas.abap | 5 ++--- src/ui/zif_abapgit_popups.intf.abap | 1 - src/zif_abapgit_definitions.intf.abap | 2 +- 4 files changed, 7 insertions(+), 9 deletions(-) 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 71c58714f..a6d3cb0bd 100644 --- a/src/git/zcl_abapgit_git_branch_list.clas.testclasses.abap +++ b/src/git/zcl_abapgit_git_branch_list.clas.testclasses.abap @@ -45,7 +45,7 @@ CLASS ltcl_parse IMPLEMENTATION. act = lines( lt_list ) exp = iv_expected_lines ). - READ TABLE lt_list WITH KEY name = zif_abapgit_definitions=>c_git_branch-master TRANSPORTING NO FIELDS. + READ TABLE lt_list WITH KEY name = zif_abapgit_definitions=>c_git_branch-main TRANSPORTING NO FIELDS. cl_abap_unit_assert=>assert_subrc( ). ENDMETHOD. @@ -60,7 +60,7 @@ CLASS ltcl_parse IMPLEMENTATION. * LF, but the receiver MUST NOT complain if it is not present" APPEND '001d# service=git-upload-pack000000d2b5d5f1f84ebcaeb8a299edd14c959518e9d81bb5 HEAD#asdf' TO mt_data. - APPEND '003fb5d5f1f84ebcaeb8a299edd14c959518e9d81bb5 refs/heads/master' TO mt_data. + APPEND '003fb5d5f1f84ebcaeb8a299edd14c959518e9d81bb5 refs/heads/main' TO mt_data. APPEND '0000' TO mt_data. parse( ). @@ -71,7 +71,7 @@ CLASS ltcl_parse IMPLEMENTATION. APPEND '001e# service=git-upload-pack' TO mt_data. APPEND '000001080e6fe6b311f789ccbac6c5122702d4f48a4f6bda HEAD#asdf' TO mt_data. - APPEND '003f0e6fe6b311f789ccbac6c5122702d4f48a4f6bda refs/heads/master' TO mt_data. + APPEND '003f0e6fe6b311f789ccbac6c5122702d4f48a4f6bda refs/heads/main' TO mt_data. parse( ). @@ -104,7 +104,7 @@ CLASS ltcl_parse IMPLEMENTATION. " In case HEAD is missing, it should use refs/heads/xxxxx as the default branch APPEND '001e# service=git-upload-pack' TO mt_data. - APPEND '000000f7e6e5b066fb4177bf0780bf343ab2de06368dd973 refs/heads/master' TO mt_data. + APPEND '000000f7e6e5b066fb4177bf0780bf343ab2de06368dd973 refs/heads/main' TO mt_data. APPEND '0000' TO mt_data. parse( iv_expected_lines = 1 ). diff --git a/src/ui/zcl_abapgit_popups.clas.abap b/src/ui/zcl_abapgit_popups.clas.abap index 5ac44968e..a3132f2ad 100644 --- a/src/ui/zcl_abapgit_popups.clas.abap +++ b/src/ui/zcl_abapgit_popups.clas.abap @@ -429,9 +429,9 @@ CLASS ZCL_ABAPGIT_POPUPS IMPLEMENTATION. IF lt_branches IS INITIAL. IF iv_hide_head IS NOT INITIAL. - lv_text = 'master'. + lv_text = 'main'. ENDIF. - IF iv_hide_branch IS NOT INITIAL AND iv_hide_branch <> zif_abapgit_definitions=>c_git_branch-master. + IF iv_hide_branch IS NOT INITIAL AND iv_hide_branch <> zif_abapgit_definitions=>c_git_branch-main. IF lv_text IS INITIAL. lv_text = iv_hide_branch && ' is'. ELSE. @@ -1044,7 +1044,6 @@ CLASS ZCL_ABAPGIT_POPUPS IMPLEMENTATION. lv_display_name = iv_display_name. lv_package = iv_package. lv_url = iv_url. - lv_branch = iv_branch. WHILE lv_finished = abap_false. diff --git a/src/ui/zif_abapgit_popups.intf.abap b/src/ui/zif_abapgit_popups.intf.abap index fcee0a861..74c208ff4 100644 --- a/src/ui/zif_abapgit_popups.intf.abap +++ b/src/ui/zif_abapgit_popups.intf.abap @@ -53,7 +53,6 @@ INTERFACE zif_abapgit_popups IMPORTING !iv_url TYPE string !iv_package TYPE devclass OPTIONAL - !iv_branch TYPE string DEFAULT zif_abapgit_definitions=>c_git_branch-master !iv_freeze_package TYPE abap_bool OPTIONAL !iv_freeze_url TYPE abap_bool OPTIONAL !iv_title TYPE clike DEFAULT 'New Online Project' diff --git a/src/zif_abapgit_definitions.intf.abap b/src/zif_abapgit_definitions.intf.abap index 4fea91a9a..e8808593f 100644 --- a/src/zif_abapgit_definitions.intf.abap +++ b/src/zif_abapgit_definitions.intf.abap @@ -371,7 +371,7 @@ INTERFACE zif_abapgit_definitions CONSTANTS c_head_name TYPE string VALUE 'HEAD' ##NO_TEXT. CONSTANTS: BEGIN OF c_git_branch, - master TYPE string VALUE 'refs/heads/master', + main TYPE string VALUE 'refs/heads/main', prefix TYPE string VALUE 'refs/', heads_prefix TYPE string VALUE 'refs/heads/', heads TYPE string VALUE 'refs/heads/*',