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

better handle merge conflicts, and bugfix

Browse Source
This commit is contained in:
larshp 2016-07-14 07:37:09 +00:00
parent c6a242bb38
commit f7407fa2ce
1 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/zabapgit_page_merge.prog.abap
View File

@ -13,15 +13,16 @@ CLASS lcl_merge DEFINITION FINAL.
END OF ty_ancestor. END OF ty_ancestor.
TYPES: BEGIN OF ty_merge, TYPES: BEGIN OF ty_merge,
repo TYPE REF TO lcl_repo_online, repo TYPE REF TO lcl_repo_online,
source TYPE lcl_git_transport=>ty_branch_list, source TYPE lcl_git_transport=>ty_branch_list,
target TYPE lcl_git_transport=>ty_branch_list, target TYPE lcl_git_transport=>ty_branch_list,
common TYPE ty_ancestor, common TYPE ty_ancestor,
stree TYPE lcl_git_porcelain=>ty_expanded_tt, stree TYPE lcl_git_porcelain=>ty_expanded_tt,
ttree TYPE lcl_git_porcelain=>ty_expanded_tt, ttree TYPE lcl_git_porcelain=>ty_expanded_tt,
ctree TYPE lcl_git_porcelain=>ty_expanded_tt, ctree TYPE lcl_git_porcelain=>ty_expanded_tt,
result TYPE lcl_git_porcelain=>ty_expanded_tt, result TYPE lcl_git_porcelain=>ty_expanded_tt,
stage TYPE REF TO lcl_stage, stage TYPE REF TO lcl_stage,
conflict TYPE string,
END OF ty_merge. END OF ty_merge.
CLASS-METHODS: CLASS-METHODS:
@ -199,7 +200,7 @@ CLASS lcl_merge IMPLEMENTATION.
IF lv_found_source = abap_false IF lv_found_source = abap_false
OR lv_found_target = abap_false OR lv_found_target = abap_false
OR lv_found_common = abap_false. OR lv_found_common = abap_false.
_raise 'merge conflict'. _raise 'merge conflict, not found anywhere'.
ENDIF. ENDIF.
IF <ls_target>-sha1 = <ls_source>-sha1. IF <ls_target>-sha1 = <ls_source>-sha1.
@ -214,7 +215,10 @@ CLASS lcl_merge IMPLEMENTATION.
<ls_result>-sha1 = <ls_target>-sha1. <ls_result>-sha1 = <ls_target>-sha1.
ELSE. ELSE.
* changed in source and target, conflict * changed in source and target, conflict
_raise 'merge conflict'. CLEAR gs_merge-result.
gs_merge-conflict = |{ <ls_file>-name
} merge conflict, changed in source and target branch|.
RETURN.
ENDIF. ENDIF.
ENDLOOP. ENDLOOP.
@ -275,12 +279,12 @@ CLASS lcl_merge IMPLEMENTATION.
<ls_ancestor>-commit = lv_commit. <ls_ancestor>-commit = lv_commit.
<ls_ancestor>-tree = ls_commit-tree. <ls_ancestor>-tree = ls_commit-tree.
<ls_ancestor>-body = ls_commit-body. <ls_ancestor>-body = ls_commit-body.
FIND REGEX '^[\w\s]+ <(.*)> (\d{10}) .\d{4}$' IN ls_commit-author FIND REGEX '^[\w\s]+ <.*> (\d{10}) .\d{4}$' IN ls_commit-author
SUBMATCHES <ls_ancestor>-time ##NO_TEXT. SUBMATCHES <ls_ancestor>-time ##NO_TEXT.
ASSERT sy-subrc = 0. ASSERT sy-subrc = 0.
ENDLOOP. ENDLOOP.
SORT rt_ancestors BY time ASCENDING. SORT rt_ancestors BY time DESCENDING.
ENDMETHOD. ENDMETHOD.
@ -469,7 +473,10 @@ CLASS lcl_gui_page_merge IMPLEMENTATION.
ro_html->add( '</tr>' ). ro_html->add( '</tr>' ).
ENDLOOP. ENDLOOP.
ro_html->add( '</table>' ). ro_html->add( '</table>' ).
ro_html->add( '<br>' ).
ro_html->add( '<b>' ).
ro_html->add( ms_merge-conflict ).
ro_html->add( '</b>' ).
ro_html->add( '</div>' ). ro_html->add( '</div>' ).
ro_html->add( footer( ) ). ro_html->add( footer( ) ).