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

merge: refactor DEFINE _visit to method (#3171)

Browse Source
This commit is contained in:
Lars Hvam 2020-01-25 09:44:05 +01:00 committed by GitHub
parent 847a8d9444
commit 2c7f325ecb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/zcl_abapgit_merge.clas.abap
View File

@ -36,6 +36,8 @@ CLASS zcl_abapgit_merge DEFINITION
TYPES:
ty_ancestor_tt TYPE STANDARD TABLE OF zif_abapgit_definitions=>ty_ancestor WITH DEFAULT KEY .
TYPES:
ty_visit_tt TYPE STANDARD TABLE OF zif_abapgit_definitions=>ty_sha1 WITH DEFAULT KEY .
DATA mo_repo TYPE REF TO zcl_abapgit_repo_online .
DATA ms_merge TYPE zif_abapgit_definitions=>ty_merge .
@ -43,6 +45,11 @@ CLASS zcl_abapgit_merge DEFINITION
DATA mt_objects TYPE zif_abapgit_definitions=>ty_objects_tt .
DATA mv_source_branch TYPE string .
METHODS visit
IMPORTING
!iv_parent TYPE zif_abapgit_definitions=>ty_sha1
CHANGING
!ct_visit TYPE ty_visit_tt .
METHODS all_files
RETURNING
VALUE(rt_files) TYPE zif_abapgit_definitions=>ty_expanded_tt .
@ -282,17 +289,8 @@ CLASS ZCL_ABAPGIT_MERGE IMPLEMENTATION.
METHOD find_ancestors.
DEFINE _visit.
IF NOT &1 IS INITIAL.
READ TABLE lt_visit FROM &1 TRANSPORTING NO FIELDS.
IF sy-subrc <> 0.
APPEND &1 TO lt_visit.
ENDIF.
ENDIF.
END-OF-DEFINITION.
DATA: ls_commit TYPE zcl_abapgit_git_pack=>ty_commit,
lt_visit TYPE STANDARD TABLE OF zif_abapgit_definitions=>ty_sha1,
lt_visit TYPE ty_visit_tt,
lv_commit LIKE LINE OF lt_visit.
FIELD-SYMBOLS: <ls_ancestor> LIKE LINE OF rt_ancestors,
@ -310,8 +308,10 @@ CLASS ZCL_ABAPGIT_MERGE IMPLEMENTATION.
ls_commit = zcl_abapgit_git_pack=>decode_commit( <ls_object>-data ).
_visit ls_commit-parent.
_visit ls_commit-parent2.
visit( EXPORTING iv_parent = ls_commit-parent
CHANGING ct_visit = lt_visit ).
visit( EXPORTING iv_parent = ls_commit-parent2
CHANGING ct_visit = lt_visit ).
APPEND INITIAL LINE TO rt_ancestors ASSIGNING <ls_ancestor>.
<ls_ancestor>-commit = lv_commit.
@ -444,4 +444,16 @@ CLASS ZCL_ABAPGIT_MERGE IMPLEMENTATION.
calculate_result( ).
ENDMETHOD.
METHOD visit.
IF NOT iv_parent IS INITIAL.
READ TABLE ct_visit FROM iv_parent TRANSPORTING NO FIELDS.
IF sy-subrc <> 0.
APPEND iv_parent TO ct_visit.
ENDIF.
ENDIF.
ENDMETHOD.
ENDCLASS.