SAP/abapGit
1
0
Fork 0
mirror of https://github.com/abapGit/abapGit.git synced 2025-04-30 20:03:20 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

move more git definitions (#6369)

Browse Source
This commit is contained in:
Lars Hvam 2023-07-27 06:09:37 +02:00 committed by GitHub
parent ba76a8eaa8
commit 7011e87d8c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 85 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/git/zcl_abapgit_git_branch_list.clas.abap
View File

@ -96,10 +96,10 @@ CLASS zcl_abapgit_git_branch_list IMPLEMENTATION.
METHOD complete_heads_branch_name. METHOD complete_heads_branch_name.
IF iv_branch_name CP zif_abapgit_definitions=>c_git_branch-heads. IF iv_branch_name CP zif_abapgit_git_definitions=>c_git_branch-heads.
rv_name = iv_branch_name. rv_name = iv_branch_name.
ELSE. ELSE.
rv_name = zif_abapgit_definitions=>c_git_branch-heads_prefix && iv_branch_name. rv_name = zif_abapgit_git_definitions=>c_git_branch-heads_prefix && iv_branch_name.
ENDIF. ENDIF.
ENDMETHOD. ENDMETHOD.
@ -122,7 +122,7 @@ CLASS zcl_abapgit_git_branch_list IMPLEMENTATION.
zcx_abapgit_exception=>raise( 'Branch name empty' ). zcx_abapgit_exception=>raise( 'Branch name empty' ).
ENDIF. ENDIF.
IF iv_branch_name CP zif_abapgit_definitions=>c_git_branch-tags. IF iv_branch_name CP zif_abapgit_git_definitions=>c_git_branch-tags.
rs_branch = find_tag_by_name( iv_branch_name ). rs_branch = find_tag_by_name( iv_branch_name ).
ELSE. ELSE.
@ -169,7 +169,7 @@ CLASS zcl_abapgit_git_branch_list IMPLEMENTATION.
FIELD-SYMBOLS <ls_branch> LIKE LINE OF mt_branches. FIELD-SYMBOLS <ls_branch> LIKE LINE OF mt_branches.
LOOP AT mt_branches ASSIGNING <ls_branch>. LOOP AT mt_branches ASSIGNING <ls_branch>.
IF <ls_branch>-type = zif_abapgit_definitions=>c_git_branch_type-branch. IF <ls_branch>-type = zif_abapgit_git_definitions=>c_git_branch_type-branch.
APPEND <ls_branch> TO rt_branches. APPEND <ls_branch> TO rt_branches.
ENDIF. ENDIF.
ENDLOOP. ENDLOOP.
@ -179,9 +179,9 @@ CLASS zcl_abapgit_git_branch_list IMPLEMENTATION.
METHOD get_display_name. METHOD get_display_name.
rv_display_name = iv_branch_name. rv_display_name = iv_branch_name.
IF rv_display_name CP zif_abapgit_definitions=>c_git_branch-heads. IF rv_display_name CP zif_abapgit_git_definitions=>c_git_branch-heads.
REPLACE FIRST OCCURRENCE OF zif_abapgit_definitions=>c_git_branch-heads_prefix IN rv_display_name WITH ''. REPLACE FIRST OCCURRENCE OF zif_abapgit_git_definitions=>c_git_branch-heads_prefix IN rv_display_name WITH ''.
ELSEIF rv_display_name CP zif_abapgit_definitions=>c_git_branch-tags. ELSEIF rv_display_name CP zif_abapgit_git_definitions=>c_git_branch-tags.
rv_display_name = zcl_abapgit_git_tag=>remove_tag_prefix( zcl_abapgit_git_tag=>remove_peel( rv_display_name ) ). rv_display_name = zcl_abapgit_git_tag=>remove_tag_prefix( zcl_abapgit_git_tag=>remove_peel( rv_display_name ) ).
ENDIF. ENDIF.
@ -197,8 +197,8 @@ CLASS zcl_abapgit_git_branch_list IMPLEMENTATION.
FIELD-SYMBOLS <ls_branch> LIKE LINE OF mt_branches. FIELD-SYMBOLS <ls_branch> LIKE LINE OF mt_branches.
LOOP AT mt_branches ASSIGNING <ls_branch> LOOP AT mt_branches ASSIGNING <ls_branch>
WHERE type = zif_abapgit_definitions=>c_git_branch_type-lightweight_tag WHERE type = zif_abapgit_git_definitions=>c_git_branch_type-lightweight_tag
OR type = zif_abapgit_definitions=>c_git_branch_type-annotated_tag. OR type = zif_abapgit_git_definitions=>c_git_branch_type-annotated_tag.
APPEND <ls_branch> TO rt_tags. APPEND <ls_branch> TO rt_tags.
ENDLOOP. ENDLOOP.
@ -209,20 +209,20 @@ CLASS zcl_abapgit_git_branch_list IMPLEMENTATION.
FIELD-SYMBOLS: <lv_result> TYPE LINE OF string_table. FIELD-SYMBOLS: <lv_result> TYPE LINE OF string_table.
rv_type = zif_abapgit_definitions=>c_git_branch_type-other. rv_type = zif_abapgit_git_definitions=>c_git_branch_type-other.
IF iv_branch_name CP zif_abapgit_definitions=>c_git_branch-heads OR IF iv_branch_name CP zif_abapgit_git_definitions=>c_git_branch-heads OR
iv_branch_name = zif_abapgit_definitions=>c_head_name. iv_branch_name = zif_abapgit_git_definitions=>c_head_name.
rv_type = zif_abapgit_definitions=>c_git_branch_type-branch. rv_type = zif_abapgit_git_definitions=>c_git_branch_type-branch.
ELSEIF iv_branch_name CP zif_abapgit_definitions=>c_git_branch-tags. ELSEIF iv_branch_name CP zif_abapgit_git_definitions=>c_git_branch-tags.
READ TABLE it_result ASSIGNING <lv_result> READ TABLE it_result ASSIGNING <lv_result>
INDEX iv_current_row_index + 1. INDEX iv_current_row_index + 1.
IF sy-subrc = 0 AND <lv_result> CP '*' && zcl_abapgit_git_tag=>add_peel( iv_branch_name ). IF sy-subrc = 0 AND <lv_result> CP '*' && zcl_abapgit_git_tag=>add_peel( iv_branch_name ).
rv_type = zif_abapgit_definitions=>c_git_branch_type-annotated_tag. rv_type = zif_abapgit_git_definitions=>c_git_branch_type-annotated_tag.
ELSE. ELSE.
rv_type = zif_abapgit_definitions=>c_git_branch_type-lightweight_tag. rv_type = zif_abapgit_git_definitions=>c_git_branch_type-lightweight_tag.
ENDIF. ENDIF.
ENDIF. ENDIF.
@ -289,7 +289,7 @@ CLASS zcl_abapgit_git_branch_list IMPLEMENTATION.
<ls_branch>-type = get_type( iv_branch_name = lv_name <ls_branch>-type = get_type( iv_branch_name = lv_name
it_result = lt_result it_result = lt_result
iv_current_row_index = lv_current_row_index ). iv_current_row_index = lv_current_row_index ).
IF <ls_branch>-name = zif_abapgit_definitions=>c_head_name OR <ls_branch>-name = ev_head_symref. IF <ls_branch>-name = zif_abapgit_git_definitions=>c_head_name OR <ls_branch>-name = ev_head_symref.
<ls_branch>-is_head = abap_true. <ls_branch>-is_head = abap_true.
ENDIF. ENDIF.
ENDLOOP. ENDLOOP.

2
src/git/zcl_abapgit_git_branch_list.clas.testclasses.abap
View File

@ -47,7 +47,7 @@ CLASS ltcl_parse IMPLEMENTATION.
exp = iv_expected_lines ). exp = iv_expected_lines ).
READ TABLE lt_list WITH TABLE KEY name_key READ TABLE lt_list WITH TABLE KEY name_key
COMPONENTS name = zif_abapgit_definitions=>c_git_branch-main COMPONENTS name = zif_abapgit_git_definitions=>c_git_branch-main
TRANSPORTING NO FIELDS. TRANSPORTING NO FIELDS.
cl_abap_unit_assert=>assert_subrc( ). cl_abap_unit_assert=>assert_subrc( ).

6
src/git/zcl_abapgit_git_porcelain.clas.abap
View File

@ -328,13 +328,13 @@ CLASS zcl_abapgit_git_porcelain IMPLEMENTATION.
ENDIF. ENDIF.
CASE is_tag-type. CASE is_tag-type.
WHEN zif_abapgit_definitions=>c_git_branch_type-annotated_tag. WHEN zif_abapgit_git_definitions=>c_git_branch_type-annotated_tag.
create_annotated_tag( create_annotated_tag(
is_tag = is_tag is_tag = is_tag
iv_url = iv_url ). iv_url = iv_url ).
WHEN zif_abapgit_definitions=>c_git_branch_type-lightweight_tag. WHEN zif_abapgit_git_definitions=>c_git_branch_type-lightweight_tag.
create_lightweight_tag( create_lightweight_tag(
is_tag = is_tag is_tag = is_tag
@ -400,7 +400,7 @@ CLASS zcl_abapgit_git_porcelain IMPLEMENTATION.
METHOD delete_tag. METHOD delete_tag.
IF is_tag-name CS zif_abapgit_definitions=>c_git_branch-peel. IF is_tag-name CS zif_abapgit_git_definitions=>c_git_branch-peel.
delete_annotated_tag( delete_annotated_tag(
is_tag = is_tag is_tag = is_tag

8
src/git/zcl_abapgit_git_tag.clas.abap
View File

@ -39,14 +39,14 @@ CLASS zcl_abapgit_git_tag IMPLEMENTATION.
METHOD add_peel. METHOD add_peel.
rv_text = iv_text && zif_abapgit_definitions=>c_git_branch-peel. rv_text = iv_text && zif_abapgit_git_definitions=>c_git_branch-peel.
ENDMETHOD. ENDMETHOD.
METHOD add_tag_prefix. METHOD add_tag_prefix.
rv_text = zif_abapgit_definitions=>c_git_branch-tags_prefix && iv_text. rv_text = zif_abapgit_git_definitions=>c_git_branch-tags_prefix && iv_text.
ENDMETHOD. ENDMETHOD.
@ -55,7 +55,7 @@ CLASS zcl_abapgit_git_tag IMPLEMENTATION.
rv_text = iv_text. rv_text = iv_text.
REPLACE zif_abapgit_definitions=>c_git_branch-peel IN rv_text WITH ''. REPLACE zif_abapgit_git_definitions=>c_git_branch-peel IN rv_text WITH ''.
ENDMETHOD. ENDMETHOD.
@ -64,7 +64,7 @@ CLASS zcl_abapgit_git_tag IMPLEMENTATION.
rv_text = iv_text. rv_text = iv_text.
REPLACE FIRST OCCURRENCE OF zif_abapgit_definitions=>c_git_branch-tags_prefix REPLACE FIRST OCCURRENCE OF zif_abapgit_git_definitions=>c_git_branch-tags_prefix
IN rv_text IN rv_text
WITH ''. WITH ''.

19
src/git/zif_abapgit_git_definitions.intf.abap
View File

@ -127,4 +127,23 @@ INTERFACE zif_abapgit_git_definitions
blob TYPE ty_type VALUE 'blob', "#EC NOTEXT blob TYPE ty_type VALUE 'blob', "#EC NOTEXT
END OF c_type . END OF c_type .
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',
END OF c_git_branch_type .
CONSTANTS c_head_name TYPE string VALUE 'HEAD' ##NO_TEXT.
CONSTANTS:
BEGIN OF c_git_branch,
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/*',
tags_prefix TYPE string VALUE 'refs/tags/',
tags TYPE string VALUE 'refs/tags/*',
peel TYPE string VALUE '^{}',
END OF c_git_branch.
ENDINTERFACE. ENDINTERFACE.

6
src/repo/zcl_abapgit_repo_online.clas.abap
View File

@ -195,7 +195,7 @@ CLASS zcl_abapgit_repo_online IMPLEMENTATION.
CATCH zcx_abapgit_exception. CATCH zcx_abapgit_exception.
" branch does not exist, fallback to head " branch does not exist, fallback to head
lv_head = lo_branch_list->get_head_symref( ). lv_head = lo_branch_list->get_head_symref( ).
IF lo_branch_list->get_type( lv_branch ) = zif_abapgit_definitions=>c_git_branch_type-branch. IF lo_branch_list->get_type( lv_branch ) = zif_abapgit_git_definitions=>c_git_branch_type-branch.
lv_msg = 'Branch'. lv_msg = 'Branch'.
ELSE. ELSE.
lv_msg = 'Tag'. lv_msg = 'Tag'.
@ -214,7 +214,7 @@ CLASS zcl_abapgit_repo_online IMPLEMENTATION.
DATA: lv_sha1 TYPE zif_abapgit_git_definitions=>ty_sha1. DATA: lv_sha1 TYPE zif_abapgit_git_definitions=>ty_sha1.
ASSERT iv_name CP zif_abapgit_definitions=>c_git_branch-heads. ASSERT iv_name CP zif_abapgit_git_definitions=>c_git_branch-heads.
IF iv_from IS INITIAL. IF iv_from IS INITIAL.
lv_sha1 = get_current_remote( ). lv_sha1 = get_current_remote( ).
@ -270,7 +270,7 @@ CLASS zcl_abapgit_repo_online IMPLEMENTATION.
lv_parent TYPE zif_abapgit_git_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. IF ms_data-branch_name CP zif_abapgit_git_definitions=>c_git_branch-tags.
lv_text = |You're working on a tag. Currently it's not | lv_text = |You're working on a tag. Currently it's not |
&& |possible to push on tags. Consider creating a branch instead|. && |possible to push on tags. Consider creating a branch instead|.
zcx_abapgit_exception=>raise( lv_text ). zcx_abapgit_exception=>raise( lv_text ).

4
src/repo/zcl_abapgit_repo_srv.clas.abap
View File

@ -104,9 +104,9 @@ CLASS zcl_abapgit_repo_srv IMPLEMENTATION.
rv_name = lo_branch_list->get_head_symref( ). rv_name = lo_branch_list->get_head_symref( ).
ELSEIF -1 = find( ELSEIF -1 = find(
val = rv_name val = rv_name
sub = zif_abapgit_definitions=>c_git_branch-heads_prefix ). sub = zif_abapgit_git_definitions=>c_git_branch-heads_prefix ).
" Assume short branch name was received " Assume short branch name was received
rv_name = zif_abapgit_definitions=>c_git_branch-heads_prefix && rv_name. rv_name = zif_abapgit_git_definitions=>c_git_branch-heads_prefix && rv_name.
ENDIF. ENDIF.
ENDMETHOD. ENDMETHOD.

6
src/ui/lib/zcl_abapgit_gui_chunk_lib.clas.abap
View File

@ -450,12 +450,12 @@ CLASS zcl_abapgit_gui_chunk_lib IMPLEMENTATION.
ENDIF. ENDIF.
CASE zcl_abapgit_git_branch_list=>get_type( lv_branch ). CASE zcl_abapgit_git_branch_list=>get_type( lv_branch ).
WHEN zif_abapgit_definitions=>c_git_branch_type-branch. WHEN zif_abapgit_git_definitions=>c_git_branch_type-branch.
lv_class = 'branch branch_branch'. lv_class = 'branch branch_branch'.
lv_icon = 'code-branch/grey70'. lv_icon = 'code-branch/grey70'.
lv_hint = 'Current branch'. lv_hint = 'Current branch'.
WHEN zif_abapgit_definitions=>c_git_branch_type-annotated_tag WHEN zif_abapgit_git_definitions=>c_git_branch_type-annotated_tag
OR zif_abapgit_definitions=>c_git_branch_type-lightweight_tag. OR zif_abapgit_git_definitions=>c_git_branch_type-lightweight_tag.
lv_class = 'branch'. lv_class = 'branch'.
lv_icon = 'tag-solid/grey70'. lv_icon = 'tag-solid/grey70'.
lv_hint = 'Current tag'. lv_hint = 'Current tag'.

6
src/ui/lib/zcl_abapgit_html_popups.clas.locals_imp.abap
View File

@ -95,7 +95,7 @@ CLASS lcl_branch_popup IMPLEMENTATION.
METHOD constructor. METHOD constructor.
mv_repo_url = iv_url. mv_repo_url = iv_url.
mv_default_branch = zif_abapgit_definitions=>c_git_branch-heads_prefix && iv_default_branch. mv_default_branch = zif_abapgit_git_definitions=>c_git_branch-heads_prefix && iv_default_branch.
mv_show_new_option = iv_show_new_option. mv_show_new_option = iv_show_new_option.
ENDMETHOD. ENDMETHOD.
@ -154,7 +154,7 @@ CLASS lcl_branch_popup IMPLEMENTATION.
" TODO render mv_default_branch properly, needs respecting support from the picklist components " TODO render mv_default_branch properly, needs respecting support from the picklist components
IF <ls_b>-is_head = abap_true. IF <ls_b>-is_head = abap_true.
lv_head_marker = | (<b>{ zif_abapgit_definitions=>c_head_name }</b>)|. lv_head_marker = | (<b>{ zif_abapgit_git_definitions=>c_head_name }</b>)|.
ENDIF. ENDIF.
ri_html = zcl_abapgit_html=>create( |{ <ls_b>-display_name }{ lv_head_marker }| ). ri_html = zcl_abapgit_html=>create( |{ <ls_b>-display_name }{ lv_head_marker }| ).
@ -213,7 +213,7 @@ CLASS lcl_tag_popup IMPLEMENTATION.
lo_branches = zcl_abapgit_git_transport=>branches( mv_repo_url ). lo_branches = zcl_abapgit_git_transport=>branches( mv_repo_url ).
rt_tags = lo_branches->get_tags_only( ). rt_tags = lo_branches->get_tags_only( ).
DELETE rt_tags WHERE name CP '*' && zif_abapgit_definitions=>c_git_branch-peel. DELETE rt_tags WHERE name CP '*' && zif_abapgit_git_definitions=>c_git_branch-peel.
IF lines( rt_tags ) = 0. IF lines( rt_tags ) = 0.
zcx_abapgit_exception=>raise( 'No tags are available to select' ). zcx_abapgit_exception=>raise( 'No tags are available to select' ).

4
src/ui/pages/zcl_abapgit_gui_page_addonline.clas.abap
View File

@ -69,7 +69,7 @@ ENDCLASS.
CLASS ZCL_ABAPGIT_GUI_PAGE_ADDONLINE IMPLEMENTATION. CLASS zcl_abapgit_gui_page_addonline IMPLEMENTATION.
METHOD choose_labels. METHOD choose_labels.
@ -295,7 +295,7 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_ADDONLINE IMPLEMENTATION.
iv_key = c_id-branch_name iv_key = c_id-branch_name
iv_val = replace( " strip technical iv_val = replace( " strip technical
val = mo_form_data->get( c_id-branch_name ) val = mo_form_data->get( c_id-branch_name )
sub = zif_abapgit_definitions=>c_git_branch-heads_prefix sub = zif_abapgit_git_definitions=>c_git_branch-heads_prefix
with = '' ) ). with = '' ) ).
rs_handled-state = zcl_abapgit_gui=>c_event_state-re_render. rs_handled-state = zcl_abapgit_gui=>c_event_state-re_render.
ENDIF. ENDIF.

2
src/ui/pages/zcl_abapgit_gui_page_merge.clas.abap
View File

@ -69,7 +69,7 @@ CLASS zcl_abapgit_gui_page_merge IMPLEMENTATION.
mo_repo = io_repo. mo_repo = io_repo.
io_repo->select_branch( |{ zif_abapgit_definitions=>c_git_branch-heads_prefix }{ iv_target }| ). io_repo->select_branch( |{ zif_abapgit_git_definitions=>c_git_branch-heads_prefix }{ iv_target }| ).
CREATE OBJECT mi_merge TYPE zcl_abapgit_merge CREATE OBJECT mi_merge TYPE zcl_abapgit_merge
EXPORTING EXPORTING

4
src/ui/pages/zcl_abapgit_gui_page_merge_sel.clas.abap
View File

@ -57,7 +57,7 @@ ENDCLASS.
CLASS ZCL_ABAPGIT_GUI_PAGE_MERGE_SEL IMPLEMENTATION. CLASS zcl_abapgit_gui_page_merge_sel IMPLEMENTATION.
METHOD constructor. METHOD constructor.
@ -144,7 +144,7 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_MERGE_SEL IMPLEMENTATION.
lo_branches = zcl_abapgit_git_transport=>branches( mo_repo->get_url( ) ). lo_branches = zcl_abapgit_git_transport=>branches( mo_repo->get_url( ) ).
mt_branches = lo_branches->get_branches_only( ). mt_branches = lo_branches->get_branches_only( ).
DELETE mt_branches WHERE name = zif_abapgit_definitions=>c_head_name. DELETE mt_branches WHERE name = zif_abapgit_git_definitions=>c_head_name.
ENDMETHOD. ENDMETHOD.

25
src/ui/pages/zcl_abapgit_gui_page_sett_remo.clas.abap
View File

@ -258,7 +258,7 @@ CLASS zcl_abapgit_gui_page_sett_remo IMPLEMENTATION.
ENDIF. ENDIF.
lv_url = mo_form_data->get( c_id-url ). lv_url = mo_form_data->get( c_id-url ).
lv_branch_name = zif_abapgit_definitions=>c_git_branch-heads_prefix && mo_form_data->get( c_id-branch ). lv_branch_name = zif_abapgit_git_definitions=>c_git_branch-heads_prefix && mo_form_data->get( c_id-branch ).
li_popups = zcl_abapgit_ui_factory=>get_popups( ). li_popups = zcl_abapgit_ui_factory=>get_popups( ).
@ -517,11 +517,14 @@ CLASS zcl_abapgit_gui_page_sett_remo IMPLEMENTATION.
CASE rs_settings-head_type. CASE rs_settings-head_type.
WHEN c_head_types-branch. WHEN c_head_types-branch.
rs_settings-branch = zif_abapgit_definitions=>c_git_branch-heads_prefix && io_form_data->get( c_id-branch ). rs_settings-branch = zif_abapgit_git_definitions=>c_git_branch-heads_prefix &&
io_form_data->get( c_id-branch ).
WHEN c_head_types-tag. WHEN c_head_types-tag.
rs_settings-tag = zif_abapgit_definitions=>c_git_branch-tags_prefix && io_form_data->get( c_id-tag ). rs_settings-tag = zif_abapgit_git_definitions=>c_git_branch-tags_prefix &&
io_form_data->get( c_id-tag ).
WHEN c_head_types-commit. WHEN c_head_types-commit.
rs_settings-branch = zif_abapgit_definitions=>c_git_branch-heads_prefix && io_form_data->get( c_id-branch ). rs_settings-branch = zif_abapgit_git_definitions=>c_git_branch-heads_prefix &&
io_form_data->get( c_id-branch ).
rs_settings-commit = io_form_data->get( c_id-commit ). rs_settings-commit = io_form_data->get( c_id-commit ).
WHEN c_head_types-pull_request. WHEN c_head_types-pull_request.
rs_settings-pull_request = io_form_data->get( c_id-pull_request ). rs_settings-pull_request = io_form_data->get( c_id-pull_request ).
@ -555,13 +558,13 @@ CLASS zcl_abapgit_gui_page_sett_remo IMPLEMENTATION.
rs_settings-switched_origin = lo_repo_online->get_switched_origin( ). rs_settings-switched_origin = lo_repo_online->get_switched_origin( ).
SPLIT rs_settings-switched_origin AT '@' INTO rs_settings-url rs_settings-branch. SPLIT rs_settings-switched_origin AT '@' INTO rs_settings-url rs_settings-branch.
IF rs_settings-branch CP zif_abapgit_definitions=>c_git_branch-tags. IF rs_settings-branch CP zif_abapgit_git_definitions=>c_git_branch-tags.
rs_settings-tag = rs_settings-branch. rs_settings-tag = rs_settings-branch.
CLEAR rs_settings-branch. CLEAR rs_settings-branch.
ENDIF. ENDIF.
lv_branch = lo_repo_online->get_selected_branch( ). lv_branch = lo_repo_online->get_selected_branch( ).
REPLACE FIRST OCCURRENCE OF zif_abapgit_definitions=>c_git_branch-heads_prefix IN lv_branch WITH space. REPLACE FIRST OCCURRENCE OF zif_abapgit_git_definitions=>c_git_branch-heads_prefix IN lv_branch WITH space.
CONDENSE lv_branch. CONDENSE lv_branch.
rs_settings-pull_request = |{ lo_repo_online->get_url( ) }@{ lv_branch }|. rs_settings-pull_request = |{ lo_repo_online->get_url( ) }@{ lv_branch }|.
rs_settings-head_type = c_head_types-pull_request. rs_settings-head_type = c_head_types-pull_request.
@ -569,7 +572,7 @@ CLASS zcl_abapgit_gui_page_sett_remo IMPLEMENTATION.
rs_settings-branch = lo_repo_online->get_selected_branch( ). rs_settings-branch = lo_repo_online->get_selected_branch( ).
rs_settings-head_type = c_head_types-branch. rs_settings-head_type = c_head_types-branch.
IF rs_settings-branch CP zif_abapgit_definitions=>c_git_branch-tags. IF rs_settings-branch CP zif_abapgit_git_definitions=>c_git_branch-tags.
rs_settings-head_type = c_head_types-tag. rs_settings-head_type = c_head_types-tag.
rs_settings-tag = rs_settings-branch. rs_settings-tag = rs_settings-branch.
CLEAR rs_settings-branch. CLEAR rs_settings-branch.
@ -831,7 +834,7 @@ CLASS zcl_abapgit_gui_page_sett_remo IMPLEMENTATION.
SPLIT iv_pull AT '@' INTO lv_url lv_branch. SPLIT iv_pull AT '@' INTO lv_url lv_branch.
lo_repo->switch_origin( lo_repo->switch_origin(
iv_url = lv_url iv_url = lv_url
iv_branch = zif_abapgit_definitions=>c_git_branch-heads_prefix && lv_branch ). iv_branch = zif_abapgit_git_definitions=>c_git_branch-heads_prefix && lv_branch ).
ENDIF. ENDIF.
ENDMETHOD. ENDMETHOD.
@ -886,18 +889,18 @@ CLASS zcl_abapgit_gui_page_sett_remo IMPLEMENTATION.
CASE lv_head_type. CASE lv_head_type.
WHEN c_head_types-branch. WHEN c_head_types-branch.
lv_branch = zif_abapgit_definitions=>c_git_branch-heads_prefix && io_form_data->get( c_id-branch ). lv_branch = zif_abapgit_git_definitions=>c_git_branch-heads_prefix && io_form_data->get( c_id-branch ).
CONDENSE lv_branch. CONDENSE lv_branch.
lv_branch_check_error_id = c_id-branch. lv_branch_check_error_id = c_id-branch.
WHEN c_head_types-tag. WHEN c_head_types-tag.
lv_branch = zif_abapgit_definitions=>c_git_branch-tags_prefix && io_form_data->get( c_id-tag ). lv_branch = zif_abapgit_git_definitions=>c_git_branch-tags_prefix && io_form_data->get( c_id-tag ).
CONDENSE lv_branch. CONDENSE lv_branch.
lv_branch_check_error_id = c_id-tag. lv_branch_check_error_id = c_id-tag.
WHEN c_head_types-pull_request. WHEN c_head_types-pull_request.
lv_pull_request = io_form_data->get( c_id-pull_request ). lv_pull_request = io_form_data->get( c_id-pull_request ).
SPLIT lv_pull_request AT '@' INTO lv_url lv_branch. SPLIT lv_pull_request AT '@' INTO lv_url lv_branch.
IF lv_branch IS NOT INITIAL. IF lv_branch IS NOT INITIAL.
lv_branch = zif_abapgit_definitions=>c_git_branch-heads_prefix && lv_branch. lv_branch = zif_abapgit_git_definitions=>c_git_branch-heads_prefix && lv_branch.
ENDIF. ENDIF.
lv_branch_check_error_id = c_id-pull_request. lv_branch_check_error_id = c_id-pull_request.
WHEN c_head_types-commit. WHEN c_head_types-commit.

10
src/ui/pages/zcl_abapgit_gui_page_tags.clas.abap
View File

@ -169,10 +169,10 @@ CLASS zcl_abapgit_gui_page_tags IMPLEMENTATION.
iv_action = c_event-change_type iv_action = c_event-change_type
)->option( )->option(
iv_label = 'Lightweight' iv_label = 'Lightweight'
iv_value = zif_abapgit_definitions=>c_git_branch_type-lightweight_tag iv_value = zif_abapgit_git_definitions=>c_git_branch_type-lightweight_tag
)->option( )->option(
iv_label = 'Annotated' iv_label = 'Annotated'
iv_value = zif_abapgit_definitions=>c_git_branch_type-annotated_tag iv_value = zif_abapgit_git_definitions=>c_git_branch_type-annotated_tag
)->text( )->text(
iv_name = c_id-name iv_name = c_id-name
iv_label = 'Tag Name' iv_label = 'Tag Name'
@ -186,7 +186,7 @@ CLASS zcl_abapgit_gui_page_tags IMPLEMENTATION.
iv_required = abap_true iv_required = abap_true
iv_side_action = c_event-choose_commit ). iv_side_action = c_event-choose_commit ).
IF ms_tag-type = zif_abapgit_definitions=>c_git_branch_type-annotated_tag. IF ms_tag-type = zif_abapgit_git_definitions=>c_git_branch_type-annotated_tag.
ro_form->start_group( ro_form->start_group(
iv_name = c_id-anno_group iv_name = c_id-anno_group
iv_label = 'Annotation' iv_label = 'Annotation'
@ -263,7 +263,7 @@ CLASS zcl_abapgit_gui_page_tags IMPLEMENTATION.
METHOD initialize_form_data. METHOD initialize_form_data.
ms_tag-type = zif_abapgit_definitions=>c_git_branch_type-lightweight_tag. ms_tag-type = zif_abapgit_git_definitions=>c_git_branch_type-lightweight_tag.
mo_form_data->set( mo_form_data->set(
iv_key = c_id-tag_type iv_key = c_id-tag_type
@ -358,7 +358,7 @@ CLASS zcl_abapgit_gui_page_tags IMPLEMENTATION.
WITH cl_abap_char_utilities=>newline. WITH cl_abap_char_utilities=>newline.
ms_tag-name = zcl_abapgit_git_tag=>add_tag_prefix( ms_tag-name ). ms_tag-name = zcl_abapgit_git_tag=>add_tag_prefix( ms_tag-name ).
ASSERT ms_tag-name CP zif_abapgit_definitions=>c_git_branch-tags. ASSERT ms_tag-name CP zif_abapgit_git_definitions=>c_git_branch-tags.
TRY. TRY.
zcl_abapgit_git_porcelain=>create_tag( zcl_abapgit_git_porcelain=>create_tag(

2
src/ui/routing/zcl_abapgit_gui_router.clas.abap
View File

@ -327,7 +327,7 @@ CLASS zcl_abapgit_gui_router IMPLEMENTATION.
zcx_abapgit_exception=>raise( `Staging is only possible for online repositories.` ). zcx_abapgit_exception=>raise( `Staging is only possible for online repositories.` ).
ENDTRY. ENDTRY.
IF lo_repo->get_selected_branch( ) CP zif_abapgit_definitions=>c_git_branch-tags. IF lo_repo->get_selected_branch( ) CP zif_abapgit_git_definitions=>c_git_branch-tags.
zcx_abapgit_exception=>raise( |You are working on a tag, must be on branch| ). zcx_abapgit_exception=>raise( |You are working on a tag, must be on branch| ).
ELSEIF lo_repo->get_selected_commit( ) IS NOT INITIAL. ELSEIF lo_repo->get_selected_commit( ) IS NOT INITIAL.
zcx_abapgit_exception=>raise( |You are working on a commit, must be on branch| ). zcx_abapgit_exception=>raise( |You are working on a commit, must be on branch| ).

10
src/ui/zcl_abapgit_popups.clas.abap
View File

@ -181,7 +181,7 @@ CLASS zcl_abapgit_popups IMPLEMENTATION.
lo_branches = zcl_abapgit_git_transport=>branches( iv_url ). lo_branches = zcl_abapgit_git_transport=>branches( iv_url ).
lt_branches = lo_branches->get_branches_only( ). lt_branches = lo_branches->get_branches_only( ).
lv_head_suffix = | ({ zif_abapgit_definitions=>c_head_name })|. lv_head_suffix = | ({ zif_abapgit_git_definitions=>c_head_name })|.
lv_head_symref = lo_branches->get_head_symref( ). lv_head_symref = lo_branches->get_head_symref( ).
IF iv_hide_branch IS NOT INITIAL. IF iv_hide_branch IS NOT INITIAL.
@ -189,7 +189,7 @@ CLASS zcl_abapgit_popups IMPLEMENTATION.
ENDIF. ENDIF.
IF iv_hide_head IS NOT INITIAL. IF iv_hide_head IS NOT INITIAL.
DELETE lt_branches WHERE name = zif_abapgit_definitions=>c_head_name DELETE lt_branches WHERE name = zif_abapgit_git_definitions=>c_head_name
OR is_head = abap_true. OR is_head = abap_true.
ENDIF. ENDIF.
@ -197,7 +197,7 @@ CLASS zcl_abapgit_popups IMPLEMENTATION.
IF iv_hide_head IS NOT INITIAL. IF iv_hide_head IS NOT INITIAL.
lv_text = 'main'. lv_text = 'main'.
ENDIF. ENDIF.
IF iv_hide_branch IS NOT INITIAL AND iv_hide_branch <> zif_abapgit_definitions=>c_git_branch-main. IF iv_hide_branch IS NOT INITIAL AND iv_hide_branch <> zif_abapgit_git_definitions=>c_git_branch-main.
IF lv_text IS INITIAL. IF lv_text IS INITIAL.
lv_text = iv_hide_branch && ' is'. lv_text = iv_hide_branch && ' is'.
ELSE. ELSE.
@ -219,7 +219,7 @@ CLASS zcl_abapgit_popups IMPLEMENTATION.
IF <ls_branch>-is_head = abap_true. IF <ls_branch>-is_head = abap_true.
IF <ls_branch>-name = zif_abapgit_definitions=>c_head_name. " HEAD IF <ls_branch>-name = zif_abapgit_git_definitions=>c_head_name. " HEAD
IF <ls_branch>-name <> lv_head_symref AND lv_head_symref IS NOT INITIAL. IF <ls_branch>-name <> lv_head_symref AND lv_head_symref IS NOT INITIAL.
" HEAD but other HEAD symref exists - ignore " HEAD but other HEAD symref exists - ignore
CONTINUE. CONTINUE.
@ -873,7 +873,7 @@ CLASS zcl_abapgit_popups IMPLEMENTATION.
lo_branches = zcl_abapgit_git_transport=>branches( iv_url ). lo_branches = zcl_abapgit_git_transport=>branches( iv_url ).
lt_tags = lo_branches->get_tags_only( ). lt_tags = lo_branches->get_tags_only( ).
LOOP AT lt_tags ASSIGNING <ls_tag> WHERE name NP '*' && zif_abapgit_definitions=>c_git_branch-peel. LOOP AT lt_tags ASSIGNING <ls_tag> WHERE name NP '*' && zif_abapgit_git_definitions=>c_git_branch-peel.
APPEND INITIAL LINE TO lt_selection ASSIGNING <ls_sel>. APPEND INITIAL LINE TO lt_selection ASSIGNING <ls_sel>.
<ls_sel>-varoption = zcl_abapgit_git_tag=>remove_tag_prefix( <ls_tag>-name ). <ls_sel>-varoption = zcl_abapgit_git_tag=>remove_tag_prefix( <ls_tag>-name ).

18
src/zif_abapgit_definitions.intf.abap
View File

@ -282,24 +282,6 @@ INTERFACE zif_abapgit_definitions
warning TYPE ty_sci_result VALUE 'W', warning TYPE ty_sci_result VALUE 'W',
passed TYPE ty_sci_result VALUE 'P', passed TYPE ty_sci_result VALUE 'P',
END OF c_sci_result. END OF c_sci_result.
CONSTANTS:
BEGIN OF c_git_branch_type,
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:
BEGIN OF c_git_branch,
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/*',
tags_prefix TYPE string VALUE 'refs/tags/',
tags TYPE string VALUE 'refs/tags/*',
peel TYPE string VALUE '^{}',
END OF c_git_branch.
CONSTANTS: CONSTANTS:
BEGIN OF c_diff, BEGIN OF c_diff,
unchanged TYPE c LENGTH 1 VALUE ' ', unchanged TYPE c LENGTH 1 VALUE ' ',