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

full_tree: Rename iv_branch to iv_parent (#4041)

Browse Source 
Co-authored-by: Lars Hvam <larshp@hotmail.com>
This commit is contained in:
mariusraht2 2020-10-18 09:04:55 +02:00 committed by GitHub
parent 5504c67669
commit a366e024ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/git/zcl_abapgit_git_porcelain.clas.abap
View File

@ -75,7 +75,7 @@ CLASS zcl_abapgit_git_porcelain DEFINITION
CLASS-METHODS full_tree
IMPORTING
!it_objects TYPE zif_abapgit_definitions=>ty_objects_tt
!iv_branch TYPE zif_abapgit_definitions=>ty_sha1
!iv_parent TYPE zif_abapgit_definitions=>ty_sha1
RETURNING
VALUE(rt_expanded) TYPE zif_abapgit_definitions=>ty_expanded_tt
RAISING
@ -405,7 +405,7 @@ CLASS zcl_abapgit_git_porcelain IMPLEMENTATION.
READ TABLE it_objects INTO ls_object
WITH KEY type COMPONENTS
type = zif_abapgit_definitions=>c_type-commit
sha1 = iv_branch.
sha1 = iv_parent.
IF sy-subrc <> 0.
zcx_abapgit_exception=>raise( 'commit not found' ).
ENDIF.
@ -488,7 +488,7 @@ CLASS zcl_abapgit_git_porcelain IMPLEMENTATION.
lt_expanded = full_tree( it_objects = it_old_objects
iv_branch = iv_parent ).
iv_parent = iv_parent ).
lt_stage = io_stage->get_all( ).
LOOP AT lt_stage ASSIGNING <ls_stage>.

6
src/zcl_abapgit_merge.clas.abap
View File

@ -433,13 +433,13 @@ CLASS ZCL_ABAPGIT_MERGE IMPLEMENTATION.
ms_merge-stree = zcl_abapgit_git_porcelain=>full_tree(
it_objects = mt_objects
iv_branch = ms_merge-source-sha1 ).
iv_parent = ms_merge-source-sha1 ).
ms_merge-ttree = zcl_abapgit_git_porcelain=>full_tree(
it_objects = mt_objects
iv_branch = ms_merge-target-sha1 ).
iv_parent = ms_merge-target-sha1 ).
ms_merge-ctree = zcl_abapgit_git_porcelain=>full_tree(
it_objects = mt_objects
iv_branch = ms_merge-common-commit ).
iv_parent = ms_merge-common-commit ).
calculate_result( ).