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

Improve error messages when checking branches/tags (#6814)

Browse Source
This commit is contained in:
Marc Bernard 2024-02-16 09:25:57 +01:00 committed by GitHub
parent d4f6879a18
commit d76aa90cd1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 41 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,6 +45,11 @@ CLASS zcl_abapgit_git_branch_list DEFINITION
!iv_current_row_index TYPE sy-tabix OPTIONAL
RETURNING
VALUE(rv_type) TYPE zif_abapgit_git_definitions=>ty_git_branch_type .
CLASS-METHODS get_description
IMPORTING
!iv_branch_name TYPE clike
RETURNING
VALUE(rv_description) TYPE string.
CLASS-METHODS complete_heads_branch_name
IMPORTING
!iv_branch_name TYPE clike
@ -130,8 +135,7 @@ CLASS zcl_abapgit_git_branch_list IMPLEMENTATION.
WITH TABLE KEY name_key
COMPONENTS name = iv_branch_name.
IF sy-subrc <> 0.
zcx_abapgit_exception=>raise( |Branch { get_display_name( iv_branch_name )
} not found. Use 'Branch' > 'Switch' to select a different branch| ).
zcx_abapgit_exception=>raise( |{ get_description( iv_branch_name ) } not found| ).
ENDIF.
ENDIF.
@ -150,7 +154,7 @@ CLASS zcl_abapgit_git_branch_list IMPLEMENTATION.
WITH TABLE KEY name_key
COMPONENTS name = iv_branch_name.
IF sy-subrc <> 0.
zcx_abapgit_exception=>raise( 'Branch not found' ).
zcx_abapgit_exception=>raise( |{ get_description( iv_branch_name ) } not found| ).
ENDIF.
ENDIF.
@ -176,6 +180,24 @@ CLASS zcl_abapgit_git_branch_list IMPLEMENTATION.
ENDMETHOD.
METHOD get_description.
CASE get_type( iv_branch_name ).
WHEN zif_abapgit_git_definitions=>c_git_branch_type-branch.
rv_description = 'Branch'.
WHEN zif_abapgit_git_definitions=>c_git_branch_type-lightweight_tag.
rv_description = 'Tag'.
WHEN zif_abapgit_git_definitions=>c_git_branch_type-annotated_tag.
rv_description = 'Annotated Tag'.
WHEN OTHERS.
rv_description = 'Branch'.
ENDCASE.
rv_description = |{ rv_description } "{ get_display_name( iv_branch_name ) }"|.
ENDMETHOD.
METHOD get_display_name.
rv_display_name = iv_branch_name.

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

@ -174,6 +174,7 @@ CLASS zcl_abapgit_repo_online IMPLEMENTATION.
DATA:
lo_branch_list TYPE REF TO zcl_abapgit_git_branch_list,
lx_error TYPE REF TO zcx_abapgit_exception,
lv_branch TYPE string,
lv_head TYPE string,
lv_msg TYPE string.
@ -185,16 +186,10 @@ CLASS zcl_abapgit_repo_online IMPLEMENTATION.
TRY.
lo_branch_list->find_by_name( lv_branch ).
CATCH zcx_abapgit_exception.
CATCH zcx_abapgit_exception INTO lx_error.
" branch does not exist, fallback to head
lv_head = lo_branch_list->get_head_symref( ).
IF lo_branch_list->get_type( lv_branch ) = zif_abapgit_git_definitions=>c_git_branch_type-branch.
lv_msg = 'Branch'.
ELSE.
lv_msg = 'Tag'.
ENDIF.
lv_msg = |{ lv_msg } { lo_branch_list->get_display_name( lv_branch ) } does not exist.|
&& | Switched to { lo_branch_list->get_display_name( lv_head ) }|.
lv_msg = |{ lx_error->get_text( ) }. Switched to { lo_branch_list->get_display_name( lv_head ) }|.
MESSAGE lv_msg TYPE 'S'.
select_branch( lv_head ).
ENDTRY.

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

@ -890,7 +890,7 @@ CLASS zcl_abapgit_gui_page_sett_remo IMPLEMENTATION.
" Cannot check for commit existence currently (needs API that doesn't rely on finding the first commit
" in the branch), check format instead
IF lv_commit CN '0123456789abcdef'.
IF lv_commit CN '0123456789abcdef' AND ro_validation_log->get( c_id-commit ) IS INITIAL.
ro_validation_log->set(
iv_key = c_id-commit
iv_val = 'Commit needs to be hexadecimal and in lowercase' ).
@ -901,16 +901,19 @@ CLASS zcl_abapgit_gui_page_sett_remo IMPLEMENTATION.
iv_val = 'Unknown head type' ).
ENDCASE.
TRY.
IF lv_branch IS NOT INITIAL.
lo_branch_list = zcl_abapgit_git_factory=>get_git_transport( )->branches( lv_url ).
IF lv_branch IS NOT INITIAL.
" Problems with getting branches in general are raised to the page
lo_branch_list = zcl_abapgit_git_factory=>get_git_transport( )->branches( lv_url ).
TRY.
" Issues with finding a particular branch are shown next to corresponding field
lo_branch_list->find_by_name( lv_branch ).
ENDIF.
CATCH zcx_abapgit_exception INTO lx_error.
ro_validation_log->set(
iv_key = lv_branch_check_error_id
iv_val = lx_error->get_text( ) ).
ENDTRY.
CATCH zcx_abapgit_exception INTO lx_error.
ro_validation_log->set(
iv_key = lv_branch_check_error_id
iv_val = lx_error->get_text( ) ).
ENDTRY.
ENDIF.
ENDIF.
ENDMETHOD.