From de8618af320f5b8f4f5a8538b5e7b558b4ebf284 Mon Sep 17 00:00:00 2001
From: Sdfraga <sdfraga@gmail.com>
Date: Fri, 29 Mar 2019 07:10:23 +0100
Subject: [PATCH] Fixing Page Branch Overview Hierarchy (#2594)

* Divide determine_branch for simplicity

* Separate Branches and Commits

* Sort branches by Commit Time

* Fixing abaplint errors
---
 src/zcl_abapgit_branch_overview.clas.abap | 50 ++++++++++++++++++-----
 1 file changed, 40 insertions(+), 10 deletions(-)

diff --git a/src/zcl_abapgit_branch_overview.clas.abap b/src/zcl_abapgit_branch_overview.clas.abap
index a1a176f55..7714e44bc 100644
--- a/src/zcl_abapgit_branch_overview.clas.abap
+++ b/src/zcl_abapgit_branch_overview.clas.abap
@@ -75,7 +75,7 @@ ENDCLASS.
 
 
 
-CLASS ZCL_ABAPGIT_BRANCH_OVERVIEW IMPLEMENTATION.
+CLASS zcl_abapgit_branch_overview IMPLEMENTATION.
 
 
   METHOD constructor.
@@ -103,15 +103,23 @@ CLASS ZCL_ABAPGIT_BRANCH_OVERVIEW IMPLEMENTATION.
 
     CONSTANTS: lc_head TYPE string VALUE 'HEAD'.
 
-    DATA: lv_name TYPE string.
+    TYPES: BEGIN OF ty_branch_with_time,
+             time TYPE string,
+             name TYPE string,
+             sha1 TYPE zif_abapgit_definitions=>ty_sha1,
+           END OF ty_branch_with_time.
 
-    FIELD-SYMBOLS: <ls_branch> LIKE LINE OF mt_branches,
-                   <ls_head>   LIKE LINE OF mt_branches,
-                   <ls_commit> LIKE LINE OF mt_commits,
-                   <ls_create> LIKE LINE OF <ls_commit>-create.
+    DATA: lt_branches_sorted_by_time TYPE SORTED TABLE OF ty_branch_with_time WITH NON-UNIQUE KEY time,
+          ls_branches_with_time      TYPE ty_branch_with_time.
+
+    FIELD-SYMBOLS: <ls_branch>                LIKE LINE OF mt_branches,
+                   <ls_branch_sorted_by_time> LIKE LINE OF lt_branches_sorted_by_time,
+                   <ls_head>                  LIKE LINE OF mt_branches,
+                   <ls_commit>                LIKE LINE OF mt_commits,
+                   <ls_create>                LIKE LINE OF <ls_commit>-create.
 
 
-* exchange HEAD, and make sure the branch determination starts with the HEAD branch
+* Exchange HEAD, and make sure the branch determination starts with the HEAD branch
     READ TABLE mt_branches ASSIGNING <ls_head> WITH KEY name = lc_head.
     ASSERT sy-subrc = 0.
     LOOP AT mt_branches ASSIGNING <ls_branch>
@@ -121,17 +129,39 @@ CLASS ZCL_ABAPGIT_BRANCH_OVERVIEW IMPLEMENTATION.
       EXIT.
     ENDLOOP.
 
+* Sort Branches by Commit Time
     LOOP AT mt_branches ASSIGNING <ls_branch>.
-      lv_name = <ls_branch>-name+11.
+
       READ TABLE mt_commits ASSIGNING <ls_commit> WITH KEY sha1 = <ls_branch>-sha1.
+      IF sy-subrc = 0.
+
+        ls_branches_with_time-name = <ls_branch>-name+11.
+        ls_branches_with_time-sha1 = <ls_branch>-sha1.
+
+        IF <ls_branch>-is_head = abap_true.
+          ls_branches_with_time-time = '0000000000'. "Force HEAD to be the first one
+        ELSE.
+          ls_branches_with_time-time = <ls_commit>-time.
+        ENDIF.
+
+        INSERT ls_branches_with_time INTO TABLE lt_branches_sorted_by_time.
+        CLEAR ls_branches_with_time.
+
+      ENDIF.
+    ENDLOOP.
+
+
+    LOOP AT lt_branches_sorted_by_time ASSIGNING <ls_branch_sorted_by_time>.
+
+      READ TABLE mt_commits ASSIGNING <ls_commit> WITH KEY sha1 = <ls_branch_sorted_by_time>-sha1.
       ASSERT sy-subrc = 0.
 
       DO.
         IF <ls_commit>-branch IS INITIAL.
-          <ls_commit>-branch = lv_name.
+          <ls_commit>-branch = <ls_branch_sorted_by_time>-name.
         ELSE.
           APPEND INITIAL LINE TO <ls_commit>-create ASSIGNING <ls_create>.
-          <ls_create>-name = lv_name.
+          <ls_create>-name = <ls_branch_sorted_by_time>-name.
           <ls_create>-parent = <ls_commit>-branch.
           EXIT.
         ENDIF.