diff --git a/src/zabapgit_forms.prog.abap b/src/zabapgit_forms.prog.abap index 14c7788af..b20ebabb8 100644 --- a/src/zabapgit_forms.prog.abap +++ b/src/zabapgit_forms.prog.abap @@ -54,7 +54,7 @@ FORM branch_popup TABLES tt_fields TYPE ty_sval_tt DATA: lv_url TYPE string, lx_error TYPE REF TO lcx_exception, ls_package_data TYPE scompkdtln, - ls_branch TYPE lcl_git_transport=>ty_branch_list. + ls_branch TYPE ty_git_branch. FIELD-SYMBOLS: LIKE LINE OF tt_fields, LIKE LINE OF tt_fields. diff --git a/src/zabapgit_git.prog.abap b/src/zabapgit_git.prog.abap index 5583cb42c..4e98ff093 100644 --- a/src/zabapgit_git.prog.abap +++ b/src/zabapgit_git.prog.abap @@ -7,22 +7,27 @@ CLASS ltcl_git_pack DEFINITION DEFERRED. *----------------------------------------------------------------------* * CLASS lcl_transport DEFINITION *----------------------------------------------------------------------* -* -*----------------------------------------------------------------------* -CLASS lcl_git_transport DEFINITION FINAL. +" TODO: move types to global definitions when code is stable +TYPES: ty_git_branch_type TYPE char2. +TYPES: BEGIN OF ty_git_branch, + sha1 TYPE ty_sha1, + name TYPE string, + type TYPE ty_git_branch_type, + is_head TYPE abap_bool, + display_name TYPE string, + END OF ty_git_branch. +TYPES: ty_git_branch_list_tt TYPE STANDARD TABLE OF ty_git_branch WITH DEFAULT KEY. + + +CLASS lcl_git_transport DEFINITION FINAL. PUBLIC SECTION. - TYPES: BEGIN OF ty_branch_list, - sha1 TYPE ty_sha1, - name TYPE string, - END OF ty_branch_list. - TYPES: ty_branch_list_tt TYPE STANDARD TABLE OF ty_branch_list WITH DEFAULT KEY. * remote to local CLASS-METHODS upload_pack IMPORTING io_repo TYPE REF TO lcl_repo_online iv_deepen TYPE abap_bool DEFAULT abap_true - it_branches TYPE ty_branch_list_tt OPTIONAL + it_branches TYPE ty_git_branch_list_tt OPTIONAL EXPORTING et_objects TYPE ty_objects_tt ev_branch TYPE ty_sha1 RAISING lcx_exception. @@ -38,7 +43,7 @@ CLASS lcl_git_transport DEFINITION FINAL. CLASS-METHODS branches IMPORTING iv_url TYPE string - RETURNING VALUE(rt_branch_list) TYPE ty_branch_list_tt + RETURNING VALUE(rt_branch_list) TYPE ty_git_branch_list_tt RAISING lcx_exception. CLASS-METHODS class_constructor. @@ -58,7 +63,7 @@ CLASS lcl_git_transport DEFINITION FINAL. IMPORTING iv_url TYPE string iv_service TYPE string EXPORTING ei_client TYPE REF TO if_http_client - et_branch_list TYPE ty_branch_list_tt + et_branch_list TYPE ty_git_branch_list_tt RAISING lcx_exception. CLASS-METHODS pkt_string @@ -115,15 +120,15 @@ ENDCLASS. "lcl_transport DEFINITION *----------------------------------------------------------------------* CLASS lcl_git_branch_helper DEFINITION FINAL. PUBLIC SECTION. + CLASS-METHODS parse_branch_list IMPORTING iv_data TYPE string - RETURNING VALUE(rt_list) TYPE lcl_git_transport=>ty_branch_list_tt + RETURNING VALUE(rt_list) TYPE ty_git_branch_list_tt RAISING lcx_exception. ENDCLASS. "lcl_git_branch_helper - *----------------------------------------------------------------------* * CLASS lcl_pack DEFINITION *----------------------------------------------------------------------* @@ -338,7 +343,7 @@ CLASS lcl_git_transport IMPLEMENTATION. METHOD find_branch. - DATA: lt_branch_list TYPE ty_branch_list_tt, + DATA: lt_branch_list TYPE ty_git_branch_list_tt, ls_branch_list LIKE LINE OF lt_branch_list. @@ -601,7 +606,7 @@ CLASS lcl_git_transport IMPLEMENTATION. lv_xstring TYPE xstring, lv_line TYPE string, lv_pack TYPE xstring, - lt_branches TYPE ty_branch_list_tt, + lt_branches TYPE ty_git_branch_list_tt, lv_capa TYPE string. FIELD-SYMBOLS: LIKE LINE OF lt_branches. @@ -691,6 +696,7 @@ ENDCLASS. "lcl_transport IMPLEMENTATION * CLASS lcl_git_branch_helper IMPLEMENTATION *----------------------------------------------------------------------* CLASS lcl_git_branch_helper IMPLEMENTATION. + METHOD parse_branch_list. DATA: lt_result TYPE TABLE OF string, @@ -731,6 +737,8 @@ CLASS lcl_git_branch_helper IMPLEMENTATION. ENDLOOP. ENDMETHOD. "parse_branch_list + + ENDCLASS. "lcl_git_branch_helper @@ -1446,7 +1454,7 @@ CLASS lcl_git_porcelain DEFINITION FINAL FRIENDS ltcl_git_porcelain. CLASS-METHODS delete_branch IMPORTING io_repo TYPE REF TO lcl_repo_online - is_branch TYPE lcl_git_transport=>ty_branch_list + is_branch TYPE ty_git_branch RAISING lcx_exception. CLASS-METHODS full_tree @@ -1635,7 +1643,7 @@ CLASS lcl_git_porcelain IMPLEMENTATION. lv_sha1 TYPE ty_sha1, lt_trees TYPE ty_trees_tt, lt_objects TYPE ty_objects_tt, - lt_branches TYPE lcl_git_transport=>ty_branch_list_tt, + lt_branches TYPE ty_git_branch_list_tt, lt_stage TYPE lcl_stage=>ty_stage_tt. FIELD-SYMBOLS: LIKE LINE OF lt_stage, diff --git a/src/zabapgit_page_branch_overview.prog.abap b/src/zabapgit_page_branch_overview.prog.abap index a3c879ea7..3e408fb94 100644 --- a/src/zabapgit_page_branch_overview.prog.abap +++ b/src/zabapgit_page_branch_overview.prog.abap @@ -37,7 +37,7 @@ CLASS lcl_branch_overview DEFINITION FINAL. RAISING lcx_exception. CLASS-METHODS: get_branches - RETURNING VALUE(rt_branches) TYPE lcl_git_transport=>ty_branch_list_tt. + RETURNING VALUE(rt_branches) TYPE ty_git_branch_list_tt. PRIVATE SECTION. @@ -57,7 +57,7 @@ CLASS lcl_branch_overview DEFINITION FINAL. RAISING lcx_exception. CLASS-DATA: - gt_branches TYPE lcl_git_transport=>ty_branch_list_tt, + gt_branches TYPE ty_git_branch_list_tt, gt_commits TYPE TABLE OF ty_commit. ENDCLASS. @@ -379,7 +379,7 @@ CLASS lcl_gui_page_branch_overview IMPLEMENTATION. METHOD form_select. DATA: lv_name TYPE string, - lt_branches TYPE lcl_git_transport=>ty_branch_list_tt. + lt_branches TYPE ty_git_branch_list_tt. FIELD-SYMBOLS: LIKE LINE OF lt_branches. diff --git a/src/zabapgit_page_merge.prog.abap b/src/zabapgit_page_merge.prog.abap index 95e129579..937347bdf 100644 --- a/src/zabapgit_page_merge.prog.abap +++ b/src/zabapgit_page_merge.prog.abap @@ -14,8 +14,8 @@ CLASS lcl_merge DEFINITION FINAL. TYPES: BEGIN OF ty_merge, repo TYPE REF TO lcl_repo_online, - source TYPE lcl_git_transport=>ty_branch_list, - target TYPE lcl_git_transport=>ty_branch_list, + source TYPE ty_git_branch, + target TYPE ty_git_branch, common TYPE ty_ancestor, stree TYPE lcl_git_porcelain=>ty_expanded_tt, ttree TYPE lcl_git_porcelain=>ty_expanded_tt, @@ -304,8 +304,8 @@ CLASS lcl_merge IMPLEMENTATION. END-OF-DEFINITION. DATA: lv_name TYPE string, - lt_branches TYPE lcl_git_transport=>ty_branch_list_tt, - lt_upload TYPE lcl_git_transport=>ty_branch_list_tt. + lt_branches TYPE ty_git_branch_list_tt, + lt_upload TYPE ty_git_branch_list_tt. lt_branches = lcl_git_transport=>branches( gs_merge-repo->get_url( ) ). diff --git a/src/zabapgit_popups.prog.abap b/src/zabapgit_popups.prog.abap index 132f51197..e8b5c84a9 100644 --- a/src/zabapgit_popups.prog.abap +++ b/src/zabapgit_popups.prog.abap @@ -31,7 +31,7 @@ CLASS lcl_popups DEFINITION. RAISING lcx_exception, branch_list_popup IMPORTING iv_url TYPE string - RETURNING VALUE(rs_branch) TYPE lcl_git_transport=>ty_branch_list + RETURNING VALUE(rs_branch) TYPE ty_git_branch RAISING lcx_exception, repo_popup IMPORTING iv_url TYPE string @@ -194,7 +194,7 @@ CLASS lcl_popups IMPLEMENTATION. METHOD delete_branch. DATA: lo_repo TYPE REF TO lcl_repo_online, - ls_branch TYPE lcl_git_transport=>ty_branch_list. + ls_branch TYPE ty_git_branch. lo_repo ?= lcl_app=>repo_srv( )->get( iv_key ). @@ -220,7 +220,7 @@ CLASS lcl_popups IMPLEMENTATION. METHOD branch_list_popup. - DATA: lt_branches TYPE lcl_git_transport=>ty_branch_list_tt, + DATA: lt_branches TYPE ty_git_branch_list_tt, lv_answer TYPE c LENGTH 1, lt_selection TYPE TABLE OF spopli.