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

rollback 'remove/ignore' logic to Force stage

Browse Source
This commit is contained in:
sbcgua 2017-02-05 17:00:06 +02:00
parent 05e6086ea4
commit 1bdaac812f
5 changed files with 6 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/zabapgit_definitions.prog.abap
View File

@ -227,7 +227,6 @@ CONSTANTS: BEGIN OF gc_action,
go_debuginfo TYPE string VALUE 'go_debuginfo', go_debuginfo TYPE string VALUE 'go_debuginfo',
go_settings TYPE string VALUE 'go_settings', go_settings TYPE string VALUE 'go_settings',
go_tutorial TYPE string VALUE 'go_tutorial', go_tutorial TYPE string VALUE 'go_tutorial',
go_manage_files TYPE string VALUE 'go_manage_files',
jump TYPE string VALUE 'jump', jump TYPE string VALUE 'jump',
jump_pkg TYPE string VALUE 'jump_pkg', jump_pkg TYPE string VALUE 'jump_pkg',

7
src/zabapgit_gui_router.prog.abap
View File

@ -36,7 +36,6 @@ CLASS lcl_gui_router DEFINITION FINAL.
METHODS get_page_stage METHODS get_page_stage
IMPORTING iv_key TYPE lcl_persistence_repo=>ty_repo-key IMPORTING iv_key TYPE lcl_persistence_repo=>ty_repo-key
iv_manage_files TYPE abap_bool DEFAULT abap_false
RETURNING VALUE(ri_page) TYPE REF TO lif_gui_page RETURNING VALUE(ri_page) TYPE REF TO lif_gui_page
RAISING lcx_exception. RAISING lcx_exception.
@ -91,9 +90,6 @@ CLASS lcl_gui_router IMPLEMENTATION.
WHEN gc_action-go_stage. " Go Staging page WHEN gc_action-go_stage. " Go Staging page
ei_page = get_page_stage( lv_key ). ei_page = get_page_stage( lv_key ).
ev_state = gc_event_state-new_page_w_bookmark. ev_state = gc_event_state-new_page_w_bookmark.
WHEN gc_action-go_manage_files. " Go files management
ei_page = get_page_stage( iv_key = lv_key iv_manage_files = abap_true ).
ev_state = gc_event_state-new_page_w_bookmark.
WHEN gc_action-go_branch_overview. " Go repo branch overview WHEN gc_action-go_branch_overview. " Go repo branch overview
ei_page = get_page_branch_overview( iv_getdata ). ei_page = get_page_branch_overview( iv_getdata ).
ev_state = gc_event_state-new_page. ev_state = gc_event_state-new_page.
@ -314,8 +310,7 @@ CLASS lcl_gui_router IMPLEMENTATION.
CREATE OBJECT lo_stage_page CREATE OBJECT lo_stage_page
EXPORTING EXPORTING
io_repo = lo_repo io_repo = lo_repo.
iv_manage_files = iv_manage_files.
ri_page = lo_stage_page. ri_page = lo_stage_page.

9
src/zabapgit_page_stage.prog.abap
View File

@ -14,7 +14,6 @@ CLASS lcl_gui_page_stage DEFINITION FINAL INHERITING FROM lcl_gui_page.
constructor constructor
IMPORTING IMPORTING
io_repo TYPE REF TO lcl_repo_online io_repo TYPE REF TO lcl_repo_online
iv_manage_files TYPE abap_bool DEFAULT abap_false
RAISING lcx_exception, RAISING lcx_exception,
lif_gui_page~on_event REDEFINITION. lif_gui_page~on_event REDEFINITION.
@ -53,13 +52,7 @@ CLASS lcl_gui_page_stage IMPLEMENTATION.
ms_control-page_title = 'STAGE'. ms_control-page_title = 'STAGE'.
mo_repo = io_repo. mo_repo = io_repo.
IF iv_manage_files = abap_true. ms_files = lcl_stage_logic=>get( mo_repo ).
ms_files = lcl_stage_logic=>get(
io_repo = mo_repo
iv_remote_only = abap_true ).
ELSE.
ms_files = lcl_stage_logic=>get( mo_repo ).
ENDIF.
CREATE OBJECT mo_stage CREATE OBJECT mo_stage
EXPORTING EXPORTING

9
src/zabapgit_stage_logic.prog.abap
View File

@ -10,7 +10,6 @@ CLASS lcl_stage_logic DEFINITION FINAL.
CLASS-METHODS: CLASS-METHODS:
get get
IMPORTING io_repo TYPE REF TO lcl_repo_online IMPORTING io_repo TYPE REF TO lcl_repo_online
iv_remote_only TYPE abap_bool DEFAULT abap_false
RETURNING VALUE(rs_files) TYPE ty_stage_files RETURNING VALUE(rs_files) TYPE ty_stage_files
RAISING lcx_exception, RAISING lcx_exception,
count count
@ -32,13 +31,9 @@ CLASS lcl_stage_logic IMPLEMENTATION.
METHOD get. METHOD get.
rs_files-local = io_repo->get_files_local( ).
rs_files-remote = io_repo->get_files_remote( ). rs_files-remote = io_repo->get_files_remote( ).
remove_identical( CHANGING cs_files = rs_files ).
IF iv_remote_only = abap_false.
rs_files-local = io_repo->get_files_local( ).
remove_identical( CHANGING cs_files = rs_files ).
ENDIF.
remove_ignored( EXPORTING io_repo = io_repo remove_ignored( EXPORTING io_repo = io_repo
CHANGING cs_files = rs_files ). CHANGING cs_files = rs_files ).

4
src/zabapgit_view_repo.prog.abap
View File

@ -260,8 +260,8 @@ CLASS lcl_gui_view_repo_content IMPLEMENTATION.
lo_tb_advanced->add( iv_txt = 'Make off-line' lo_tb_advanced->add( iv_txt = 'Make off-line'
iv_act = |{ gc_action-repo_remote_detach }?{ lv_key }| ). iv_act = |{ gc_action-repo_remote_detach }?{ lv_key }| ).
IF iv_rstate IS INITIAL AND iv_lstate IS INITIAL. IF iv_rstate IS INITIAL AND iv_lstate IS INITIAL.
lo_tb_advanced->add( iv_txt = 'Remove/Ignore files' lo_tb_advanced->add( iv_txt = 'Force stage'
iv_act = |{ gc_action-go_manage_files }?{ lv_key }| ). iv_act = |{ gc_action-go_stage }?{ lv_key }| ).
ENDIF. ENDIF.
ELSE. ELSE.
lo_tb_advanced->add( iv_txt = 'Make on-line' lo_tb_advanced->add( iv_txt = 'Make on-line'