mirror of
https://github.com/abapGit/abapGit.git
synced 2025-05-01 12:20:51 +08:00
full_tree: Rename iv_branch to iv_parent (#4041)
Co-authored-by: Lars Hvam <larshp@hotmail.com>
This commit is contained in:
parent
5504c67669
commit
a366e024ea
|
@ -75,7 +75,7 @@ CLASS zcl_abapgit_git_porcelain DEFINITION
|
||||||
CLASS-METHODS full_tree
|
CLASS-METHODS full_tree
|
||||||
IMPORTING
|
IMPORTING
|
||||||
!it_objects TYPE zif_abapgit_definitions=>ty_objects_tt
|
!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
|
RETURNING
|
||||||
VALUE(rt_expanded) TYPE zif_abapgit_definitions=>ty_expanded_tt
|
VALUE(rt_expanded) TYPE zif_abapgit_definitions=>ty_expanded_tt
|
||||||
RAISING
|
RAISING
|
||||||
|
@ -405,7 +405,7 @@ CLASS zcl_abapgit_git_porcelain IMPLEMENTATION.
|
||||||
READ TABLE it_objects INTO ls_object
|
READ TABLE it_objects INTO ls_object
|
||||||
WITH KEY type COMPONENTS
|
WITH KEY type COMPONENTS
|
||||||
type = zif_abapgit_definitions=>c_type-commit
|
type = zif_abapgit_definitions=>c_type-commit
|
||||||
sha1 = iv_branch.
|
sha1 = iv_parent.
|
||||||
IF sy-subrc <> 0.
|
IF sy-subrc <> 0.
|
||||||
zcx_abapgit_exception=>raise( 'commit not found' ).
|
zcx_abapgit_exception=>raise( 'commit not found' ).
|
||||||
ENDIF.
|
ENDIF.
|
||||||
|
@ -488,7 +488,7 @@ CLASS zcl_abapgit_git_porcelain IMPLEMENTATION.
|
||||||
|
|
||||||
|
|
||||||
lt_expanded = full_tree( it_objects = it_old_objects
|
lt_expanded = full_tree( it_objects = it_old_objects
|
||||||
iv_branch = iv_parent ).
|
iv_parent = iv_parent ).
|
||||||
|
|
||||||
lt_stage = io_stage->get_all( ).
|
lt_stage = io_stage->get_all( ).
|
||||||
LOOP AT lt_stage ASSIGNING <ls_stage>.
|
LOOP AT lt_stage ASSIGNING <ls_stage>.
|
||||||
|
|
|
@ -433,13 +433,13 @@ CLASS ZCL_ABAPGIT_MERGE IMPLEMENTATION.
|
||||||
|
|
||||||
ms_merge-stree = zcl_abapgit_git_porcelain=>full_tree(
|
ms_merge-stree = zcl_abapgit_git_porcelain=>full_tree(
|
||||||
it_objects = mt_objects
|
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(
|
ms_merge-ttree = zcl_abapgit_git_porcelain=>full_tree(
|
||||||
it_objects = mt_objects
|
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(
|
ms_merge-ctree = zcl_abapgit_git_porcelain=>full_tree(
|
||||||
it_objects = mt_objects
|
it_objects = mt_objects
|
||||||
iv_branch = ms_merge-common-commit ).
|
iv_parent = ms_merge-common-commit ).
|
||||||
|
|
||||||
calculate_result( ).
|
calculate_result( ).
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user