diff --git a/src/zabapgit_definitions.prog.abap b/src/zabapgit_definitions.prog.abap index 72c1a1015..f0bb8af46 100644 --- a/src/zabapgit_definitions.prog.abap +++ b/src/zabapgit_definitions.prog.abap @@ -118,6 +118,7 @@ CONSTANTS: BEGIN OF gc_state, " https://git-scm.com/docs/git-status added TYPE char1 VALUE 'A', modified TYPE char1 VALUE 'M', deleted TYPE char1 VALUE 'D', "For future use + mixed TYPE char1 VALUE '*', END OF gc_state. CONSTANTS: BEGIN OF gc_chmod, diff --git a/src/zabapgit_file_status.prog.abap b/src/zabapgit_file_status.prog.abap index 3c4bb1ddb..04d87585d 100644 --- a/src/zabapgit_file_status.prog.abap +++ b/src/zabapgit_file_status.prog.abap @@ -114,7 +114,9 @@ CLASS lcl_file_status IMPLEMENTATION. " Process local files and new local files LOOP AT it_local ASSIGNING . APPEND INITIAL LINE TO rt_results ASSIGNING . - APPEND -item TO lt_items. " Collect for item index + IF -item IS NOT INITIAL. + APPEND -item TO lt_items. " Collect for item index + ENDIF. READ TABLE lt_remote ASSIGNING WITH KEY path = -file-path filename = -file-filename diff --git a/src/zabapgit_page_main.prog.abap b/src/zabapgit_page_main.prog.abap index 38cd1fb15..590197280 100644 --- a/src/zabapgit_page_main.prog.abap +++ b/src/zabapgit_page_main.prog.abap @@ -336,16 +336,48 @@ CLASS lcl_gui_page_main IMPLEMENTATION. _add '.repo_tab td.cmd {'. _add ' text-align: right;'. _add ' padding-left: 0.5em;'. - _add ' padding-right: 1em;'. + _add ' padding-right: 0.7em;'. _add '}'. - _add '.repo_tab td.cmd span.changed { color: #ff9933; }'. - _add '.repo_tab td.cmd span.none { color: #dddddd; }'. - _add '.repo_tab td.cmd span.unchanged { color: #cedeee; }'. - _add '.repo_tab td.cmd span.state-block { margin-left: 10px; }'. _add '.repo_tab tr.unsupported { color: lightgrey; }'. _add '.repo_tab tr.modified { background: #fbf7e9; }'. _add '.repo_tab tr:first-child td { border-top: 0px; }'. - _add 'td.current_dir { color: #ccc; }'. + _add '.repo_tab td.current_dir { color: #ccc; }'. + + " States + _add '.repo_tab td.cmd span.state-block {'. + _add ' margin-left: 1em;'. + _add ' font-family: Consolas, Lucida Console, Courier, monospace;'. + _add ' font-size: x-small;'. + _add ' vertical-align: 13%;'. + _add ' display: inline-block;'. + _add ' text-align: center;'. + _add '}'. + _add '.repo_tab td.cmd span.state-block span {'. + _add ' display: inline-block;'. + _add ' padding: 0px 2px;'. + _add ' border: 1px solid #000;'. + _add '}'. + + _add '.repo_tab td.cmd span.state-block span.added {'. + _add ' background-color: #69ad74; '. + _add ' border-color: #579e64;'. + _add ' color: white;'. + _add '}'. + _add '.repo_tab td.cmd span.state-block span.changed {'. + _add ' background-color: #e0c150;'. + _add ' border-color: #d4af25;'. + _add ' color: white;'. + _add '}'. + _add '.repo_tab td.cmd span.state-block span.mixed {'. + _add ' background-color: #c0729a;'. + _add ' border-color: #b8618e;'. + _add ' color: white;'. + _add '}'. + _add '.repo_tab td.cmd span.state-block span.none {'. + _add ' background-color: #e8e8e8;'. + _add ' border-color: #dbdbdb;'. + _add ' color: #c8c8c8;'. + _add '}'. ENDMETHOD. "styles diff --git a/src/zabapgit_repo_impl.prog.abap b/src/zabapgit_repo_impl.prog.abap index fb011d10b..42be013e6 100644 --- a/src/zabapgit_repo_impl.prog.abap +++ b/src/zabapgit_repo_impl.prog.abap @@ -365,6 +365,27 @@ CLASS lcl_repo IMPLEMENTATION. ENDMETHOD. METHOD refresh_local_checksums. + + DATA lv_answer TYPE c. + + IF lines( get_local_checksums_per_file( ) ) > 0. + lv_answer = lcl_popups=>popup_to_confirm( + titlebar = 'Warning' + text_question = 'File checksums are not empty.' + && ' Are you sure to overwrite ?' + && ' This may lead to loss of local change state' + text_button_1 = 'OK' + icon_button_1 = 'ICON_DELETE' + text_button_2 = 'Cancel' + icon_button_2 = 'ICON_CANCEL' + default_button = '2' + display_cancel_button = abap_false ). "#EC NOTEXT + + IF lv_answer = '2'. + RETURN. + ENDIF. + ENDIF. + set( it_checksums = build_local_checksums( ) ). ENDMETHOD. "refresh_local_checksums diff --git a/src/zabapgit_view_repo.prog.abap b/src/zabapgit_view_repo.prog.abap index a567e771e..4d6114392 100644 --- a/src/zabapgit_view_repo.prog.abap +++ b/src/zabapgit_view_repo.prog.abap @@ -10,9 +10,8 @@ CLASS lcl_repo_content_browser DEFINITION FINAL. default TYPE i VALUE 9999, parent_dir TYPE i VALUE 0, dir TYPE i VALUE 1, - wo_obj TYPE i VALUE 2, - new TYPE i VALUE 3, - changed TYPE i VALUE 4, + orphan TYPE i VALUE 2, + changed TYPE i VALUE 3, END OF c_sortkey. TYPES: BEGIN OF ty_repo_item, @@ -22,6 +21,8 @@ CLASS lcl_repo_content_browser DEFINITION FINAL. path TYPE string, is_dir TYPE abap_bool, changes TYPE i, + lstate TYPE char1, + rstate TYPE char1, files TYPE tt_repo_files, END OF ty_repo_item. TYPES tt_repo_items TYPE STANDARD TABLE OF ty_repo_item WITH DEFAULT KEY. @@ -95,11 +96,23 @@ CLASS lcl_repo_content_browser IMPLEMENTATION. ENDMETHOD. "list + DEFINE _reduce_state. + " &1 - prev, &2 - cur + IF &1 = &2 OR &2 IS INITIAL. + ASSERT 1 = 1. " No change + ELSEIF &1 IS INITIAL. + &1 = &2. + ELSE. + &1 = gc_state-mixed. + ENDIF. + END-OF-DEFINITION. + METHOD build_folders. - DATA: lv_index TYPE i, - lt_folders LIKE ct_repo_items, - ls_folder LIKE LINE OF ct_repo_items. + DATA: lv_index TYPE i, + lt_subitems LIKE ct_repo_items, + ls_subitem LIKE LINE OF ct_repo_items, + ls_folder LIKE LINE OF ct_repo_items. FIELD-SYMBOLS LIKE LINE OF ct_repo_items. @@ -108,17 +121,19 @@ CLASS lcl_repo_content_browser IMPLEMENTATION. CHECK -path <> iv_cur_dir. " files in target dir - just leave them be IF lcl_path=>is_subdir( iv_path = -path iv_parent = iv_cur_dir ) = abap_true. - ls_folder-changes = -changes. - ls_folder-path = -path. - APPEND ls_folder TO lt_folders. + ls_subitem-changes = -changes. + ls_subitem-path = -path. + ls_subitem-lstate = -lstate. + ls_subitem-rstate = -rstate. + APPEND ls_subitem TO lt_subitems. ENDIF. DELETE ct_repo_items INDEX lv_index. ENDLOOP. - SORT lt_folders BY path. + SORT lt_subitems BY path ASCENDING. - LOOP AT lt_folders ASSIGNING . + LOOP AT lt_subitems ASSIGNING . AT NEW path. CLEAR ls_folder. ls_folder-path = -path. @@ -127,6 +142,8 @@ CLASS lcl_repo_content_browser IMPLEMENTATION. ENDAT. ls_folder-changes = ls_folder-changes + -changes. + _reduce_state ls_folder-lstate -lstate. + _reduce_state ls_folder-rstate -rstate. AT END OF path. APPEND ls_folder TO ct_repo_items. @@ -176,7 +193,7 @@ CLASS lcl_repo_content_browser IMPLEMENTATION. ls_file TYPE ty_repo_file, lt_status TYPE ty_results_tt. - FIELD-SYMBOLS: LIKE LINE OF lt_status, + FIELD-SYMBOLS: LIKE LINE OF lt_status, LIKE LINE OF rt_repo_items. lo_repo_online ?= mo_repo. @@ -203,14 +220,14 @@ CLASS lcl_repo_content_browser IMPLEMENTATION. IF ls_file-is_changed = abap_true. -sortkey = c_sortkey-changed. " Changed files -changes = -changes + 1. + _reduce_state -lstate ls_file-lstate. + _reduce_state -rstate ls_file-rstate. ENDIF. ENDIF. AT END OF obj_name. "obj_type + obj_name IF -obj_type IS INITIAL. - -sortkey = c_sortkey-wo_obj. "Virtual objects - ELSEIF lines( -files ) = 0. - -sortkey = c_sortkey-new. "New object to commit + -sortkey = c_sortkey-orphan. "Virtual objects ENDIF. ENDAT. ENDLOOP. @@ -271,8 +288,8 @@ CLASS lcl_gui_view_repo_content DEFINITION FINAL INHERITING FROM lcl_gui_page_su IMPORTING is_item TYPE lcl_repo_content_browser=>ty_repo_item RETURNING VALUE(rv_html) TYPE string, render_state - IMPORTING iv_l TYPE char1 - iv_r TYPE char1 + IMPORTING iv1 TYPE char1 + iv2 TYPE char1 RETURNING VALUE(rv_html) TYPE string, render_empty_package RETURNING VALUE(rv_html) TYPE string, @@ -317,7 +334,7 @@ CLASS lcl_gui_view_repo_content IMPLEMENTATION. ev_state = gc_event_state-re_render. WHEN c_actions-toggle_folders. " Toggle folder view mv_show_folders = boolc( mv_show_folders <> abap_true ). - mv_cur_dir = '/'. " Root + mv_cur_dir = '/'. " Root ev_state = gc_event_state-re_render. WHEN c_actions-toggle_changes. " Toggle changes only view mv_changes_only = lcl_app=>user( )->toggle_changes_only( ). @@ -572,32 +589,6 @@ CLASS lcl_gui_view_repo_content IMPLEMENTATION. ENDMETHOD. "get_item_icon - METHOD render_state. - - rv_html = ''. - - CASE iv_l. " Local - WHEN 'C'. "Changed - rv_html = rv_html && '■'. - WHEN 'U'. "Unchanged - rv_html = rv_html && '■'. - WHEN '_'. "None - rv_html = rv_html && '■'. - ENDCASE. - - CASE iv_r. " Remote - WHEN 'C'. "Changed - rv_html = rv_html && '■'. - WHEN 'U'. "Unchanged - rv_html = rv_html && '■'. - WHEN '_'. "None - rv_html = rv_html && '■'. - ENDCASE. - - rv_html = rv_html && ''. - - ENDMETHOD. "render_state - METHOD render_item. DATA: lv_link TYPE string, ls_file LIKE LINE OF is_item-files. @@ -662,60 +653,48 @@ CLASS lcl_gui_view_repo_content IMPLEMENTATION. METHOD render_item_command. DATA: lv_difflink TYPE string, + lv_text TYPE string, ls_file LIKE LINE OF is_item-files. CREATE OBJECT ro_html. IF is_item-is_dir = abap_true. " Directory - ro_html->add( |
{ is_item-changes } changes
| ). - - ELSEIF lines( is_item-files ) = 0. " New local object - - lv_difflink = lcl_html_action_utils=>obj_encode( - iv_key = mo_repo->get_key( ) - ig_object = is_item ). ro_html->add( '
' ). - ro_html->add_anchor( - iv_txt = |diff| - iv_act = |{ gc_action-go_diff }?{ lv_difflink }| ). - ro_html->add( render_state( iv_l = 'C' iv_r = '_' ) ). + ro_html->add( |{ is_item-changes } changes| ). + ro_html->add( render_state( iv1 = is_item-lstate iv2 = is_item-rstate ) ). ro_html->add( '
' ). ELSEIF is_item-changes > 0. IF mv_hide_files = abap_true AND is_item-obj_name IS NOT INITIAL. + lv_difflink = lcl_html_action_utils=>obj_encode( iv_key = mo_repo->get_key( ) ig_object = is_item ). + ro_html->add( '
' ). - IF is_item-changes = 1. - ro_html->add_anchor( - iv_txt = |{ is_item-changes } diff| - iv_act = |{ gc_action-go_diff }?{ lv_difflink }| ). - ELSE. - ro_html->add_anchor( - iv_txt = |{ is_item-changes } diffs| - iv_act = |{ gc_action-go_diff }?{ lv_difflink }| ). - ENDIF. + ro_html->add_anchor( iv_txt = |view diff ({ is_item-changes })| + iv_act = |{ gc_action-go_diff }?{ lv_difflink }| ). + ro_html->add( render_state( iv1 = is_item-lstate iv2 = is_item-rstate ) ). ro_html->add( '
' ). + ELSE. LOOP AT is_item-files INTO ls_file. + ro_html->add( '
' ). IF ls_file-is_changed = abap_true. lv_difflink = lcl_html_action_utils=>file_encode( iv_key = mo_repo->get_key( ) ig_file = ls_file ). - ro_html->add( '
' ). ro_html->add_anchor( - iv_txt = |diff| + iv_txt = 'view diff' iv_act = |{ gc_action-go_diff }?{ lv_difflink }| ). - - ro_html->add( render_state( iv_l = ls_file-lstate iv_r = ls_file-rstate ) ). - ro_html->add( '
' ). + ro_html->add( render_state( iv1 = ls_file-lstate iv2 = ls_file-rstate ) ). ELSE. - ro_html->add( |
 
| ). + ro_html->add( ' ' ). ENDIF. + ro_html->add( '
' ). ENDLOOP. ENDIF. @@ -724,6 +703,40 @@ CLASS lcl_gui_view_repo_content IMPLEMENTATION. ENDMETHOD. "render_item_command + METHOD render_state. + + FIELD-SYMBOLS TYPE char1. + + rv_html = ''. + + DO 2 TIMES. + CASE sy-index. + WHEN 1. + ASSIGN iv1 TO . + WHEN 2. + ASSIGN iv2 TO . + ENDCASE. + + CASE . + WHEN gc_state-unchanged. "None or unchanged + IF iv1 = gc_state-added OR iv2 = gc_state-added. + rv_html = rv_html && |×|. + ELSE. + rv_html = rv_html && | |. + ENDIF. + WHEN gc_state-modified. "Changed + rv_html = rv_html && 'M'. + WHEN gc_state-added. "Added new + rv_html = rv_html && 'A'. + WHEN gc_state-mixed. "Added and changed (multifile) + rv_html = rv_html && '~'. + ENDCASE. + ENDDO. + + rv_html = rv_html && ''. + + ENDMETHOD. "render_state + METHOD render_empty_package. rv_html = ''