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

run code inspector after conflict resolution

Browse Source
This commit is contained in:
Christian Guenter 2018-07-06 14:28:46 +00:00 committed by christianguenter2
parent 47a313602d
commit c6ebf2be1f
2 changed files with 60 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/ui/zcl_abapgit_gui_page_code_insp.clas.abap
View File

@ -5,7 +5,8 @@ CLASS zcl_abapgit_gui_page_code_insp DEFINITION PUBLIC FINAL CREATE PUBLIC
METHODS: METHODS:
constructor constructor
IMPORTING IMPORTING
io_repo TYPE REF TO zcl_abapgit_repo io_repo TYPE REF TO zcl_abapgit_repo
io_stage TYPE REF TO zcl_abapgit_stage OPTIONAL
RAISING RAISING
zcx_abapgit_exception, zcx_abapgit_exception,
@ -25,12 +26,14 @@ CLASS zcl_abapgit_gui_page_code_insp DEFINITION PUBLIC FINAL CREATE PUBLIC
PRIVATE SECTION. PRIVATE SECTION.
CONSTANTS: CONSTANTS:
BEGIN OF c_actions, BEGIN OF c_actions,
stage TYPE string VALUE 'stage' ##NO_TEXT, stage TYPE string VALUE 'stage' ##NO_TEXT,
rerun TYPE string VALUE 'rerun' ##NO_TEXT, commit TYPE string VALUE 'commit' ##NO_TEXT,
rerun TYPE string VALUE 'rerun' ##NO_TEXT,
END OF c_actions. END OF c_actions.
DATA: DATA:
mt_result TYPE scit_alvlist. mt_result TYPE scit_alvlist,
mo_stage TYPE REF TO zcl_abapgit_stage.
METHODS: METHODS:
build_menu build_menu
@ -75,10 +78,24 @@ CLASS zcl_abapgit_gui_page_code_insp IMPLEMENTATION.
lv_opt = zif_abapgit_definitions=>gc_html_opt-crossout. lv_opt = zif_abapgit_definitions=>gc_html_opt-crossout.
ENDIF. ENDIF.
ro_menu->add( iv_txt = 'Stage' IF mo_stage IS BOUND.
iv_act = c_actions-stage
iv_cur = abap_false " Staging info already available, we can directly
iv_opt = lv_opt ) ##NO_TEXT. " offer to commit
ro_menu->add( iv_txt = 'Commit'
iv_act = c_actions-commit
iv_cur = abap_false
iv_opt = lv_opt ) ##NO_TEXT.
ELSE.
ro_menu->add( iv_txt = 'Stage'
iv_act = c_actions-stage
iv_cur = abap_false
iv_opt = lv_opt ) ##NO_TEXT.
ENDIF.
ENDMETHOD. ENDMETHOD.
@ -86,6 +103,7 @@ CLASS zcl_abapgit_gui_page_code_insp IMPLEMENTATION.
METHOD constructor. METHOD constructor.
super->constructor( ). super->constructor( ).
mo_repo ?= io_repo. mo_repo ?= io_repo.
mo_stage = io_stage.
ms_control-page_title = 'Code Inspector'. ms_control-page_title = 'Code Inspector'.
run_code_inspector( ). run_code_inspector( ).
ENDMETHOD. " constructor. ENDMETHOD. " constructor.
@ -178,14 +196,29 @@ CLASS zcl_abapgit_gui_page_code_insp IMPLEMENTATION.
WHEN c_actions-stage. WHEN c_actions-stage.
IF is_stage_allowed( ) = abap_true. IF is_stage_allowed( ) = abap_true.
" we need to refresh as the source might have changed " we need to refresh as the source might have changed
lo_repo_online->refresh( ). lo_repo_online->refresh( ).
CREATE OBJECT ei_page TYPE zcl_abapgit_gui_page_stage CREATE OBJECT ei_page TYPE zcl_abapgit_gui_page_stage
EXPORTING EXPORTING
io_repo = lo_repo_online. io_repo = lo_repo_online.
ev_state = zif_abapgit_definitions=>gc_event_state-new_page.
ELSE.
ei_page = me.
ev_state = zif_abapgit_definitions=>gc_event_state-no_more_act.
ENDIF.
WHEN c_actions-commit.
IF is_stage_allowed( ) = abap_true.
CREATE OBJECT ei_page TYPE zcl_abapgit_gui_page_commit
EXPORTING
io_repo = mo_repo
io_stage = mo_stage.
ev_state = zif_abapgit_definitions=>gc_event_state-new_page. ev_state = zif_abapgit_definitions=>gc_event_state-new_page.
ELSE. ELSE.

24
src/ui/zcl_abapgit_gui_page_merge.clas.abap
View File

@ -38,7 +38,7 @@ ENDCLASS.
CLASS ZCL_ABAPGIT_GUI_PAGE_MERGE IMPLEMENTATION. CLASS zcl_abapgit_gui_page_merge IMPLEMENTATION.
METHOD build_menu. METHOD build_menu.
@ -184,11 +184,23 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_MERGE IMPLEMENTATION.
zcx_abapgit_exception=>raise( 'nothing to merge' ). zcx_abapgit_exception=>raise( 'nothing to merge' ).
ENDIF. ENDIF.
CREATE OBJECT ei_page TYPE zcl_abapgit_gui_page_commit IF mo_repo->get_local_settings( )-code_inspector_check_variant IS NOT INITIAL.
EXPORTING
io_repo = mo_repo CREATE OBJECT ei_page TYPE zcl_abapgit_gui_page_code_insp
io_stage = mo_merge->get_result( )-stage. EXPORTING
ev_state = zif_abapgit_definitions=>gc_event_state-new_page. io_repo = mo_repo
io_stage = mo_merge->get_result( )-stage.
ev_state = zif_abapgit_definitions=>gc_event_state-new_page.
ELSE.
CREATE OBJECT ei_page TYPE zcl_abapgit_gui_page_commit
EXPORTING
io_repo = mo_repo
io_stage = mo_merge->get_result( )-stage.
ev_state = zif_abapgit_definitions=>gc_event_state-new_page.
ENDIF.
WHEN c_actions-res_conflicts. WHEN c_actions-res_conflicts.
CREATE OBJECT ei_page TYPE zcl_abapgit_gui_page_merge_res CREATE OBJECT ei_page TYPE zcl_abapgit_gui_page_merge_res