new design complete

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,

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 <ls_local>.
       APPEND INITIAL LINE TO rt_results ASSIGNING <ls_result>.
+      IF <ls_local>-item IS NOT INITIAL.
         APPEND <ls_local>-item TO lt_items. " Collect for item index
+      ENDIF.
 
       READ TABLE lt_remote ASSIGNING <ls_remote>
         WITH KEY path = <ls_local>-file-path filename = <ls_local>-file-filename

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
 

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
 

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,
+                 orphan     TYPE i VALUE 2,
-                 new        TYPE i VALUE 3,
+                 changed    TYPE i VALUE 3,
-                 changed    TYPE i VALUE 4,
                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,10 +96,22 @@ 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,
+          lt_subitems LIKE ct_repo_items,
+          ls_subitem  LIKE LINE OF ct_repo_items,
           ls_folder   LIKE LINE OF ct_repo_items.
 
     FIELD-SYMBOLS <item> LIKE LINE OF ct_repo_items.
@@ -108,17 +121,19 @@ CLASS lcl_repo_content_browser IMPLEMENTATION.
       CHECK <item>-path <> iv_cur_dir. " files in target dir - just leave them be
 
       IF lcl_path=>is_subdir( iv_path = <item>-path  iv_parent = iv_cur_dir ) = abap_true.
-        ls_folder-changes = <item>-changes.
+        ls_subitem-changes = <item>-changes.
-        ls_folder-path    = <item>-path.
+        ls_subitem-path    = <item>-path.
-        APPEND ls_folder TO lt_folders.
+        ls_subitem-lstate  = <item>-lstate.
+        ls_subitem-rstate  = <item>-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 <item>.
+    LOOP AT lt_subitems ASSIGNING <item>.
       AT NEW path.
         CLEAR ls_folder.
         ls_folder-path    = <item>-path.
@@ -127,6 +142,8 @@ CLASS lcl_repo_content_browser IMPLEMENTATION.
       ENDAT.
 
       ls_folder-changes = ls_folder-changes + <item>-changes.
+      _reduce_state ls_folder-lstate <item>-lstate.
+      _reduce_state ls_folder-rstate <item>-rstate.
 
       AT END OF path.
         APPEND ls_folder TO ct_repo_items.
@@ -203,14 +220,14 @@ CLASS lcl_repo_content_browser IMPLEMENTATION.
         IF ls_file-is_changed = abap_true.
           <ls_repo_item>-sortkey = c_sortkey-changed. " Changed files
           <ls_repo_item>-changes = <ls_repo_item>-changes + 1.
+          _reduce_state <ls_repo_item>-lstate ls_file-lstate.
+          _reduce_state <ls_repo_item>-rstate ls_file-rstate.
         ENDIF.
       ENDIF.
 
       AT END OF obj_name. "obj_type + obj_name
         IF <ls_repo_item>-obj_type IS INITIAL.
-          <ls_repo_item>-sortkey = c_sortkey-wo_obj. "Virtual objects
+          <ls_repo_item>-sortkey = c_sortkey-orphan. "Virtual objects
-        ELSEIF lines( <ls_repo_item>-files ) = 0.
-          <ls_repo_item>-sortkey = c_sortkey-new. "New object to commit
         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
+        IMPORTING iv1            TYPE char1
-                  iv_r           TYPE char1
+                  iv2            TYPE char1
         RETURNING VALUE(rv_html) TYPE string,
       render_empty_package
         RETURNING VALUE(rv_html) TYPE string,
@@ -572,32 +589,6 @@ CLASS lcl_gui_view_repo_content IMPLEMENTATION.
 
   ENDMETHOD. "get_item_icon
 
-  METHOD render_state.
-
-    rv_html = '<span class="state-block">'.
-
-    CASE iv_l. " Local
-      WHEN 'C'. "Changed
-        rv_html = rv_html && '<span class="changed">&#x25A0;</span>'.
-      WHEN 'U'. "Unchanged
-        rv_html = rv_html && '<span class="unchanged">&#x25A0;</span>'.
-      WHEN '_'. "None
-        rv_html = rv_html && '<span class="none">&#x25A0;</span>'.
-    ENDCASE.
-
-    CASE iv_r. " Remote
-      WHEN 'C'. "Changed
-        rv_html = rv_html && '<span class="changed">&#x25A0;</span>'.
-      WHEN 'U'. "Unchanged
-        rv_html = rv_html && '<span class="unchanged">&#x25A0;</span>'.
-      WHEN '_'. "None
-        rv_html = rv_html && '<span class="none">&#x25A0;</span>'.
-    ENDCASE.
-
-    rv_html = rv_html && '</span>'.
-
-  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( |<div class="grey">{ is_item-changes } changes</div>| ).
-
-    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( '<div>' ).
-      ro_html->add_anchor(
+      ro_html->add( |<span class="grey">{ is_item-changes } changes</span>| ).
-        iv_txt = |diff|
+      ro_html->add( render_state( iv1 = is_item-lstate iv2 = is_item-rstate ) ).
-        iv_act = |{ gc_action-go_diff }?{ lv_difflink }| ).
-      ro_html->add( render_state( iv_l = 'C' iv_r = '_' ) ).
       ro_html->add( '</div>' ).
 
     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( '<div>' ).
-        IF is_item-changes = 1.
+        ro_html->add_anchor( iv_txt = |view diff ({ is_item-changes })|
-          ro_html->add_anchor(
-            iv_txt = |{ is_item-changes } diff|
                              iv_act = |{ gc_action-go_diff }?{ lv_difflink }| ).
-        ELSE.
+        ro_html->add( render_state( iv1 = is_item-lstate iv2 = is_item-rstate ) ).
-          ro_html->add_anchor(
-            iv_txt = |{ is_item-changes } diffs|
-            iv_act = |{ gc_action-go_diff }?{ lv_difflink }| ).
-        ENDIF.
         ro_html->add( '</div>' ).
+
       ELSE.
         LOOP AT is_item-files INTO ls_file.
 
+          ro_html->add( '<div>' ).
           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( '<div>' ).
             ro_html->add_anchor(
-              iv_txt = |diff|
+              iv_txt = 'view diff'
               iv_act = |{ gc_action-go_diff }?{ lv_difflink }| ).
-
+            ro_html->add( render_state( iv1 = ls_file-lstate iv2 = ls_file-rstate ) ).
-            ro_html->add( render_state( iv_l = ls_file-lstate iv_r = ls_file-rstate ) ).
-            ro_html->add( '</div>' ).
           ELSE.
-            ro_html->add( |<div>&nbsp;</div>| ).
+            ro_html->add( '&nbsp;' ).
           ENDIF.
+          ro_html->add( '</div>' ).
 
         ENDLOOP.
       ENDIF.
@@ -724,6 +703,40 @@ CLASS lcl_gui_view_repo_content IMPLEMENTATION.
 
   ENDMETHOD.  "render_item_command
 
+  METHOD render_state.
+
+    FIELD-SYMBOLS <state> TYPE char1.
+
+    rv_html = '<span class="state-block">'.
+
+    DO 2 TIMES.
+      CASE sy-index.
+        WHEN 1.
+          ASSIGN iv1 TO <state>.
+        WHEN 2.
+          ASSIGN iv2 TO <state>.
+      ENDCASE.
+
+      CASE <state>.
+        WHEN gc_state-unchanged.  "None or unchanged
+          IF iv1 = gc_state-added OR iv2 = gc_state-added.
+            rv_html = rv_html && |<span class="none" title="Not exists">&#x00d7;</span>|.
+          ELSE.
+            rv_html = rv_html && |<span class="none" title="No changes">&nbsp;</span>|.
+          ENDIF.
+        WHEN gc_state-modified.   "Changed
+          rv_html = rv_html && '<span class="changed" title="Modified">M</span>'.
+        WHEN gc_state-added.      "Added new
+          rv_html = rv_html && '<span class="added" title="Added new">A</span>'.
+        WHEN gc_state-mixed.      "Added and changed (multifile)
+          rv_html = rv_html && '<span class="mixed" title="Added and modified">~</span>'.
+      ENDCASE.
+    ENDDO.
+
+    rv_html = rv_html && '</span>'.
+
+  ENDMETHOD. "render_state
+
   METHOD render_empty_package.
 
     rv_html = '<tr class="unsupported"><td class="paddings">'