Press n or j to go to the next uncovered block, b, p or k for the previous block.
| 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 | 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x 1x | // zif_abapgit_merge.intf.abap
class zif_abapgit_merge {
static INTERNAL_TYPE = 'INTF';
static INTERNAL_NAME = 'ZIF_ABAPGIT_MERGE';
static ATTRIBUTES = {};
static METHODS = {"GET_CONFLICTS": {"visibility": "U", "parameters": {"RT_CONFLICTS": {"type": () => {return abap.types.TableFactory.construct(new abap.types.Structure({
"path": new abap.types.String({qualifiedName: "ZIF_ABAPGIT_MERGE=>TY_MERGE_CONFLICT-PATH"}),
"filename": new abap.types.String({qualifiedName: "ZIF_ABAPGIT_MERGE=>TY_MERGE_CONFLICT-FILENAME"}),
"source_sha1": new abap.types.Character(40, {"qualifiedName":"zif_abapgit_git_definitions=>ty_sha1"}),
"source_data": new abap.types.XString({qualifiedName: "ZIF_ABAPGIT_MERGE=>TY_MERGE_CONFLICT-SOURCE_DATA"}),
"target_sha1": new abap.types.Character(40, {"qualifiedName":"zif_abapgit_git_definitions=>ty_sha1"}),
"target_data": new abap.types.XString({qualifiedName: "ZIF_ABAPGIT_MERGE=>TY_MERGE_CONFLICT-TARGET_DATA"}),
"result_sha1": new abap.types.Character(40, {"qualifiedName":"zif_abapgit_git_definitions=>ty_sha1"}),
"result_data": new abap.types.XString({qualifiedName: "ZIF_ABAPGIT_MERGE=>TY_MERGE_CONFLICT-RESULT_DATA"})}, "zif_abapgit_merge=>ty_merge_conflict", undefined, {}, {}), {"withHeader":false,"keyType":"DEFAULT","primaryKey":{"name":"primary_key","type":"STANDARD","isUnique":false,"keyFields":[]},"secondary":[]}, "zif_abapgit_merge=>ty_merge_conflict_tt");}, "is_optional": " ", "parm_kind": "R", "type_name": "TableType"}}},
"GET_RESULT": {"visibility": "U", "parameters": {"RS_MERGE": {"type": () => {return new abap.types.Structure({
"repo_online": new abap.types.ABAPObject({qualifiedName: "ZIF_ABAPGIT_REPO_ONLINE", RTTIName: "\\INTERFACE=ZIF_ABAPGIT_REPO_ONLINE"}),
"source": new abap.types.Structure({
"sha1": new abap.types.Character(40, {"qualifiedName":"zif_abapgit_git_definitions=>ty_sha1"}),
"name": new abap.types.String({qualifiedName: "ZIF_ABAPGIT_GIT_DEFINITIONS=>TY_GIT_BRANCH-NAME"}),
"type": new abap.types.Character(2, {"qualifiedName":"zif_abapgit_git_definitions=>ty_git_branch_type"}),
"is_head": new abap.types.Character(1, {"qualifiedName":"ABAP_BOOL","ddicName":"ABAP_BOOL"}),
"display_name": new abap.types.String({qualifiedName: "ZIF_ABAPGIT_GIT_DEFINITIONS=>TY_GIT_BRANCH-DISPLAY_NAME"})}, "zif_abapgit_git_definitions=>ty_git_branch", undefined, {}, {}),
"target": new abap.types.Structure({
"sha1": new abap.types.Character(40, {"qualifiedName":"zif_abapgit_git_definitions=>ty_sha1"}),
"name": new abap.types.String({qualifiedName: "ZIF_ABAPGIT_GIT_DEFINITIONS=>TY_GIT_BRANCH-NAME"}),
"type": new abap.types.Character(2, {"qualifiedName":"zif_abapgit_git_definitions=>ty_git_branch_type"}),
"is_head": new abap.types.Character(1, {"qualifiedName":"ABAP_BOOL","ddicName":"ABAP_BOOL"}),
"display_name": new abap.types.String({qualifiedName: "ZIF_ABAPGIT_GIT_DEFINITIONS=>TY_GIT_BRANCH-DISPLAY_NAME"})}, "zif_abapgit_git_definitions=>ty_git_branch", undefined, {}, {}),
"common": new abap.types.Structure({
"commit": new abap.types.Character(40, {"qualifiedName":"zif_abapgit_git_definitions=>ty_sha1"}),
"tree": new abap.types.Character(40, {"qualifiedName":"zif_abapgit_git_definitions=>ty_sha1"}),
"time": new abap.types.String({qualifiedName: "ZIF_ABAPGIT_DEFINITIONS=>TY_ANCESTOR-TIME"}),
"body": new abap.types.String({qualifiedName: "ZIF_ABAPGIT_DEFINITIONS=>TY_ANCESTOR-BODY"})}, "zif_abapgit_definitions=>ty_ancestor", undefined, {}, {}),
"stree": abap.types.TableFactory.construct(new abap.types.Structure({
"path": new abap.types.String({qualifiedName: "ZIF_ABAPGIT_GIT_DEFINITIONS=>TY_EXPANDED-PATH"}),
"name": new abap.types.String({qualifiedName: "ZIF_ABAPGIT_GIT_DEFINITIONS=>TY_EXPANDED-NAME"}),
"sha1": new abap.types.Character(40, {"qualifiedName":"zif_abapgit_git_definitions=>ty_sha1"}),
"chmod": new abap.types.Character(6, {"qualifiedName":"zif_abapgit_git_definitions=>ty_chmod"})}, "zif_abapgit_git_definitions=>ty_expanded", undefined, {}, {}), {"withHeader":false,"keyType":"DEFAULT","primaryKey":{"name":"primary_key","type":"STANDARD","isUnique":false,"keyFields":[]},"secondary":[{"name":"path_name","type":"SORTED","isUnique":false,"keyFields":["PATH","NAME"]}]}, "zif_abapgit_git_definitions=>ty_expanded_tt"),
"ttree": abap.types.TableFactory.construct(new abap.types.Structure({
"path": new abap.types.String({qualifiedName: "ZIF_ABAPGIT_GIT_DEFINITIONS=>TY_EXPANDED-PATH"}),
"name": new abap.types.String({qualifiedName: "ZIF_ABAPGIT_GIT_DEFINITIONS=>TY_EXPANDED-NAME"}),
"sha1": new abap.types.Character(40, {"qualifiedName":"zif_abapgit_git_definitions=>ty_sha1"}),
"chmod": new abap.types.Character(6, {"qualifiedName":"zif_abapgit_git_definitions=>ty_chmod"})}, "zif_abapgit_git_definitions=>ty_expanded", undefined, {}, {}), {"withHeader":false,"keyType":"DEFAULT","primaryKey":{"name":"primary_key","type":"STANDARD","isUnique":false,"keyFields":[]},"secondary":[{"name":"path_name","type":"SORTED","isUnique":false,"keyFields":["PATH","NAME"]}]}, "zif_abapgit_git_definitions=>ty_expanded_tt"),
"ctree": abap.types.TableFactory.construct(new abap.types.Structure({
"path": new abap.types.String({qualifiedName: "ZIF_ABAPGIT_GIT_DEFINITIONS=>TY_EXPANDED-PATH"}),
"name": new abap.types.String({qualifiedName: "ZIF_ABAPGIT_GIT_DEFINITIONS=>TY_EXPANDED-NAME"}),
"sha1": new abap.types.Character(40, {"qualifiedName":"zif_abapgit_git_definitions=>ty_sha1"}),
"chmod": new abap.types.Character(6, {"qualifiedName":"zif_abapgit_git_definitions=>ty_chmod"})}, "zif_abapgit_git_definitions=>ty_expanded", undefined, {}, {}), {"withHeader":false,"keyType":"DEFAULT","primaryKey":{"name":"primary_key","type":"STANDARD","isUnique":false,"keyFields":[]},"secondary":[{"name":"path_name","type":"SORTED","isUnique":false,"keyFields":["PATH","NAME"]}]}, "zif_abapgit_git_definitions=>ty_expanded_tt"),
"result": abap.types.TableFactory.construct(new abap.types.Structure({
"path": new abap.types.String({qualifiedName: "ZIF_ABAPGIT_GIT_DEFINITIONS=>TY_EXPANDED-PATH"}),
"name": new abap.types.String({qualifiedName: "ZIF_ABAPGIT_GIT_DEFINITIONS=>TY_EXPANDED-NAME"}),
"sha1": new abap.types.Character(40, {"qualifiedName":"zif_abapgit_git_definitions=>ty_sha1"}),
"chmod": new abap.types.Character(6, {"qualifiedName":"zif_abapgit_git_definitions=>ty_chmod"})}, "zif_abapgit_git_definitions=>ty_expanded", undefined, {}, {}), {"withHeader":false,"keyType":"DEFAULT","primaryKey":{"name":"primary_key","type":"STANDARD","isUnique":false,"keyFields":[]},"secondary":[{"name":"path_name","type":"SORTED","isUnique":false,"keyFields":["PATH","NAME"]}]}, "zif_abapgit_git_definitions=>ty_expanded_tt"),
"stage": new abap.types.ABAPObject({qualifiedName: "ZCL_ABAPGIT_STAGE", RTTIName: "\\CLASS=ZCL_ABAPGIT_STAGE"}),
"conflict": new abap.types.String({qualifiedName: "ZIF_ABAPGIT_MERGE=>TY_MERGE-CONFLICT"})}, "zif_abapgit_merge=>ty_merge", undefined, {}, {});}, "is_optional": " ", "parm_kind": "R", "type_name": "StructureType"}}},
"GET_SOURCE_BRANCH": {"visibility": "U", "parameters": {"RV_SOURCE_BRANCH": {"type": () => {return new abap.types.String({qualifiedName: "STRING"});}, "is_optional": " ", "parm_kind": "R", "type_name": "StringType"}}},
"HAS_CONFLICTS": {"visibility": "U", "parameters": {"RV_CONFLICTS_EXISTS": {"type": () => {return new abap.types.Character(1, {"qualifiedName":"ABAP_BOOL","ddicName":"ABAP_BOOL"});}, "is_optional": " ", "parm_kind": "R", "type_name": "CharacterType"}}},
"RESOLVE_CONFLICT": {"visibility": "U", "parameters": {"IS_CONFLICT": {"type": () => {return new abap.types.Structure({
"path": new abap.types.String({qualifiedName: "ZIF_ABAPGIT_MERGE=>TY_MERGE_CONFLICT-PATH"}),
"filename": new abap.types.String({qualifiedName: "ZIF_ABAPGIT_MERGE=>TY_MERGE_CONFLICT-FILENAME"}),
"source_sha1": new abap.types.Character(40, {"qualifiedName":"zif_abapgit_git_definitions=>ty_sha1"}),
"source_data": new abap.types.XString({qualifiedName: "ZIF_ABAPGIT_MERGE=>TY_MERGE_CONFLICT-SOURCE_DATA"}),
"target_sha1": new abap.types.Character(40, {"qualifiedName":"zif_abapgit_git_definitions=>ty_sha1"}),
"target_data": new abap.types.XString({qualifiedName: "ZIF_ABAPGIT_MERGE=>TY_MERGE_CONFLICT-TARGET_DATA"}),
"result_sha1": new abap.types.Character(40, {"qualifiedName":"zif_abapgit_git_definitions=>ty_sha1"}),
"result_data": new abap.types.XString({qualifiedName: "ZIF_ABAPGIT_MERGE=>TY_MERGE_CONFLICT-RESULT_DATA"})}, "zif_abapgit_merge=>ty_merge_conflict", undefined, {}, {});}, "is_optional": " ", "parm_kind": "I", "type_name": "StructureType"}}},
"RUN": {"visibility": "U", "parameters": {}}};
}
abap.Classes['ZIF_ABAPGIT_MERGE'] = zif_abapgit_merge;zif_abapgit_merge.ty_merge = new abap.types.Structure({
"repo_online": new abap.types.ABAPObject({qualifiedName: "ZIF_ABAPGIT_REPO_ONLINE", RTTIName: "\\INTERFACE=ZIF_ABAPGIT_REPO_ONLINE"}),
"source": new abap.types.Structure({
"sha1": new abap.types.Character(40, {"qualifiedName":"zif_abapgit_git_definitions=>ty_sha1"}),
"name": new abap.types.String({qualifiedName: "ZIF_ABAPGIT_GIT_DEFINITIONS=>TY_GIT_BRANCH-NAME"}),
"type": new abap.types.Character(2, {"qualifiedName":"zif_abapgit_git_definitions=>ty_git_branch_type"}),
"is_head": new abap.types.Character(1, {"qualifiedName":"ABAP_BOOL","ddicName":"ABAP_BOOL"}),
"display_name": new abap.types.String({qualifiedName: "ZIF_ABAPGIT_GIT_DEFINITIONS=>TY_GIT_BRANCH-DISPLAY_NAME"})}, "zif_abapgit_git_definitions=>ty_git_branch", undefined, {}, {}),
"target": new abap.types.Structure({
"sha1": new abap.types.Character(40, {"qualifiedName":"zif_abapgit_git_definitions=>ty_sha1"}),
"name": new abap.types.String({qualifiedName: "ZIF_ABAPGIT_GIT_DEFINITIONS=>TY_GIT_BRANCH-NAME"}),
"type": new abap.types.Character(2, {"qualifiedName":"zif_abapgit_git_definitions=>ty_git_branch_type"}),
"is_head": new abap.types.Character(1, {"qualifiedName":"ABAP_BOOL","ddicName":"ABAP_BOOL"}),
"display_name": new abap.types.String({qualifiedName: "ZIF_ABAPGIT_GIT_DEFINITIONS=>TY_GIT_BRANCH-DISPLAY_NAME"})}, "zif_abapgit_git_definitions=>ty_git_branch", undefined, {}, {}),
"common": new abap.types.Structure({
"commit": new abap.types.Character(40, {"qualifiedName":"zif_abapgit_git_definitions=>ty_sha1"}),
"tree": new abap.types.Character(40, {"qualifiedName":"zif_abapgit_git_definitions=>ty_sha1"}),
"time": new abap.types.String({qualifiedName: "ZIF_ABAPGIT_DEFINITIONS=>TY_ANCESTOR-TIME"}),
"body": new abap.types.String({qualifiedName: "ZIF_ABAPGIT_DEFINITIONS=>TY_ANCESTOR-BODY"})}, "zif_abapgit_definitions=>ty_ancestor", undefined, {}, {}),
"stree": abap.types.TableFactory.construct(new abap.types.Structure({
"path": new abap.types.String({qualifiedName: "ZIF_ABAPGIT_GIT_DEFINITIONS=>TY_EXPANDED-PATH"}),
"name": new abap.types.String({qualifiedName: "ZIF_ABAPGIT_GIT_DEFINITIONS=>TY_EXPANDED-NAME"}),
"sha1": new abap.types.Character(40, {"qualifiedName":"zif_abapgit_git_definitions=>ty_sha1"}),
"chmod": new abap.types.Character(6, {"qualifiedName":"zif_abapgit_git_definitions=>ty_chmod"})}, "zif_abapgit_git_definitions=>ty_expanded", undefined, {}, {}), {"withHeader":false,"keyType":"DEFAULT","primaryKey":{"name":"primary_key","type":"STANDARD","isUnique":false,"keyFields":[]},"secondary":[{"name":"path_name","type":"SORTED","isUnique":false,"keyFields":["PATH","NAME"]}]}, "zif_abapgit_git_definitions=>ty_expanded_tt"),
"ttree": abap.types.TableFactory.construct(new abap.types.Structure({
"path": new abap.types.String({qualifiedName: "ZIF_ABAPGIT_GIT_DEFINITIONS=>TY_EXPANDED-PATH"}),
"name": new abap.types.String({qualifiedName: "ZIF_ABAPGIT_GIT_DEFINITIONS=>TY_EXPANDED-NAME"}),
"sha1": new abap.types.Character(40, {"qualifiedName":"zif_abapgit_git_definitions=>ty_sha1"}),
"chmod": new abap.types.Character(6, {"qualifiedName":"zif_abapgit_git_definitions=>ty_chmod"})}, "zif_abapgit_git_definitions=>ty_expanded", undefined, {}, {}), {"withHeader":false,"keyType":"DEFAULT","primaryKey":{"name":"primary_key","type":"STANDARD","isUnique":false,"keyFields":[]},"secondary":[{"name":"path_name","type":"SORTED","isUnique":false,"keyFields":["PATH","NAME"]}]}, "zif_abapgit_git_definitions=>ty_expanded_tt"),
"ctree": abap.types.TableFactory.construct(new abap.types.Structure({
"path": new abap.types.String({qualifiedName: "ZIF_ABAPGIT_GIT_DEFINITIONS=>TY_EXPANDED-PATH"}),
"name": new abap.types.String({qualifiedName: "ZIF_ABAPGIT_GIT_DEFINITIONS=>TY_EXPANDED-NAME"}),
"sha1": new abap.types.Character(40, {"qualifiedName":"zif_abapgit_git_definitions=>ty_sha1"}),
"chmod": new abap.types.Character(6, {"qualifiedName":"zif_abapgit_git_definitions=>ty_chmod"})}, "zif_abapgit_git_definitions=>ty_expanded", undefined, {}, {}), {"withHeader":false,"keyType":"DEFAULT","primaryKey":{"name":"primary_key","type":"STANDARD","isUnique":false,"keyFields":[]},"secondary":[{"name":"path_name","type":"SORTED","isUnique":false,"keyFields":["PATH","NAME"]}]}, "zif_abapgit_git_definitions=>ty_expanded_tt"),
"result": abap.types.TableFactory.construct(new abap.types.Structure({
"path": new abap.types.String({qualifiedName: "ZIF_ABAPGIT_GIT_DEFINITIONS=>TY_EXPANDED-PATH"}),
"name": new abap.types.String({qualifiedName: "ZIF_ABAPGIT_GIT_DEFINITIONS=>TY_EXPANDED-NAME"}),
"sha1": new abap.types.Character(40, {"qualifiedName":"zif_abapgit_git_definitions=>ty_sha1"}),
"chmod": new abap.types.Character(6, {"qualifiedName":"zif_abapgit_git_definitions=>ty_chmod"})}, "zif_abapgit_git_definitions=>ty_expanded", undefined, {}, {}), {"withHeader":false,"keyType":"DEFAULT","primaryKey":{"name":"primary_key","type":"STANDARD","isUnique":false,"keyFields":[]},"secondary":[{"name":"path_name","type":"SORTED","isUnique":false,"keyFields":["PATH","NAME"]}]}, "zif_abapgit_git_definitions=>ty_expanded_tt"),
"stage": new abap.types.ABAPObject({qualifiedName: "ZCL_ABAPGIT_STAGE", RTTIName: "\\CLASS=ZCL_ABAPGIT_STAGE"}),
"conflict": new abap.types.String({qualifiedName: "ZIF_ABAPGIT_MERGE=>TY_MERGE-CONFLICT"})}, "zif_abapgit_merge=>ty_merge", undefined, {}, {});
zif_abapgit_merge.ty_merge_conflict = new abap.types.Structure({
"path": new abap.types.String({qualifiedName: "ZIF_ABAPGIT_MERGE=>TY_MERGE_CONFLICT-PATH"}),
"filename": new abap.types.String({qualifiedName: "ZIF_ABAPGIT_MERGE=>TY_MERGE_CONFLICT-FILENAME"}),
"source_sha1": new abap.types.Character(40, {"qualifiedName":"zif_abapgit_git_definitions=>ty_sha1"}),
"source_data": new abap.types.XString({qualifiedName: "ZIF_ABAPGIT_MERGE=>TY_MERGE_CONFLICT-SOURCE_DATA"}),
"target_sha1": new abap.types.Character(40, {"qualifiedName":"zif_abapgit_git_definitions=>ty_sha1"}),
"target_data": new abap.types.XString({qualifiedName: "ZIF_ABAPGIT_MERGE=>TY_MERGE_CONFLICT-TARGET_DATA"}),
"result_sha1": new abap.types.Character(40, {"qualifiedName":"zif_abapgit_git_definitions=>ty_sha1"}),
"result_data": new abap.types.XString({qualifiedName: "ZIF_ABAPGIT_MERGE=>TY_MERGE_CONFLICT-RESULT_DATA"})}, "zif_abapgit_merge=>ty_merge_conflict", undefined, {}, {});
zif_abapgit_merge.ty_merge_conflict_tt = abap.types.TableFactory.construct(new abap.types.Structure({
"path": new abap.types.String({qualifiedName: "ZIF_ABAPGIT_MERGE=>TY_MERGE_CONFLICT-PATH"}),
"filename": new abap.types.String({qualifiedName: "ZIF_ABAPGIT_MERGE=>TY_MERGE_CONFLICT-FILENAME"}),
"source_sha1": new abap.types.Character(40, {"qualifiedName":"zif_abapgit_git_definitions=>ty_sha1"}),
"source_data": new abap.types.XString({qualifiedName: "ZIF_ABAPGIT_MERGE=>TY_MERGE_CONFLICT-SOURCE_DATA"}),
"target_sha1": new abap.types.Character(40, {"qualifiedName":"zif_abapgit_git_definitions=>ty_sha1"}),
"target_data": new abap.types.XString({qualifiedName: "ZIF_ABAPGIT_MERGE=>TY_MERGE_CONFLICT-TARGET_DATA"}),
"result_sha1": new abap.types.Character(40, {"qualifiedName":"zif_abapgit_git_definitions=>ty_sha1"}),
"result_data": new abap.types.XString({qualifiedName: "ZIF_ABAPGIT_MERGE=>TY_MERGE_CONFLICT-RESULT_DATA"})}, "zif_abapgit_merge=>ty_merge_conflict", undefined, {}, {}), {"withHeader":false,"keyType":"DEFAULT","primaryKey":{"name":"primary_key","type":"STANDARD","isUnique":false,"keyFields":[]},"secondary":[]}, "zif_abapgit_merge=>ty_merge_conflict_tt");
export {zif_abapgit_merge}; |