From e42fa60841b16d800bb81fe087a0033fee77f83e Mon Sep 17 00:00:00 2001 From: Lars Hvam Date: Fri, 15 Feb 2019 06:52:11 -0800 Subject: [PATCH] git minor changes (#2403) * git minor changes code inspector changes * pretty print --- src/git/zcl_abapgit_git_add_patch.clas.abap | 5 +- ...bapgit_git_add_patch.clas.testclasses.abap | 67 +++++++++---------- src/git/zcl_abapgit_git_branch_list.clas.abap | 39 +++-------- src/git/zcl_abapgit_git_pack.clas.abap | 33 ++++----- src/git/zcl_abapgit_git_porcelain.clas.abap | 9 ++- 5 files changed, 66 insertions(+), 87 deletions(-) diff --git a/src/git/zcl_abapgit_git_add_patch.clas.abap b/src/git/zcl_abapgit_git_add_patch.clas.abap index 06b76cd9d..f340d1347 100644 --- a/src/git/zcl_abapgit_git_add_patch.clas.abap +++ b/src/git/zcl_abapgit_git_add_patch.clas.abap @@ -22,6 +22,7 @@ CLASS zcl_abapgit_git_add_patch DEFINITION RAISING zcx_abapgit_exception. + PROTECTED SECTION. PRIVATE SECTION. DATA: mt_diff TYPE zif_abapgit_definitions=>ty_diffs_tt, @@ -38,12 +39,12 @@ ENDCLASS. -CLASS zcl_abapgit_git_add_patch IMPLEMENTATION. +CLASS ZCL_ABAPGIT_GIT_ADD_PATCH IMPLEMENTATION. METHOD calculate_patch. - FIELD-SYMBOLS: TYPE zif_abapgit_definitions=>ty_diff. + FIELD-SYMBOLS: LIKE LINE OF mt_diff. LOOP AT mt_diff ASSIGNING . diff --git a/src/git/zcl_abapgit_git_add_patch.clas.testclasses.abap b/src/git/zcl_abapgit_git_add_patch.clas.testclasses.abap index 02ad94ac3..99bc687ea 100644 --- a/src/git/zcl_abapgit_git_add_patch.clas.testclasses.abap +++ b/src/git/zcl_abapgit_git_add_patch.clas.testclasses.abap @@ -146,9 +146,9 @@ CLASS ltcl_calculate_patch IMPLEMENTATION. given_diff: " patch_flag new_num new result old_num old - ' ' ' 1' ' ' ' ' ' 1' ' ' , + ' ' ' 1' ' ' ' ' ' 1' ' ', 'X' ' ' ' ' 'D' ' 2' 'write: `Test`.', - ' ' ' 2' ' ' ' ' ' 3' ' ' . + ' ' ' 2' ' ' ' ' ' 3' ' '. when_patch_is_calculated( ). @@ -160,10 +160,10 @@ CLASS ltcl_calculate_patch IMPLEMENTATION. given_diff: " patch_flag new_num new result old_num old - ' ' ' 1' ' ' ' ' ' 1' ' ' , - 'X' ' ' ' ' 'D' ' 2' 'write: `Test`.' , + ' ' ' 1' ' ' ' ' ' 1' ' ', + 'X' ' ' ' ' 'D' ' 2' 'write: `Test`.', 'X' ' ' ' ' 'D' ' 3' 'write: `Hello world`.', - ' ' ' 2' ' ' ' ' ' 4' ' ' . + ' ' ' 2' ' ' ' ' ' 4' ' '. when_patch_is_calculated( ). @@ -175,11 +175,11 @@ CLASS ltcl_calculate_patch IMPLEMENTATION. given_diff: " patch_flag new_num new result old_num old - ' ' ' 1' ' ' ' ' ' 1' ' ' , - 'X' ' ' ' ' 'D' ' 2' 'write: `Test`.' , + ' ' ' 1' ' ' ' ' ' 1' ' ', + 'X' ' ' ' ' 'D' ' 2' 'write: `Test`.', ' ' ' ' ' ' 'D' ' 3' 'write: `Hello world`.', - 'X' ' ' ' ' 'D' ' 4' 'write: `Hello 123`.' , - ' ' ' 2' ' ' ' ' ' 5' ' ' . + 'X' ' ' ' ' 'D' ' 4' 'write: `Hello 123`.', + ' ' ' 2' ' ' ' ' ' 5' ' '. when_patch_is_calculated( ). @@ -194,12 +194,12 @@ CLASS ltcl_calculate_patch IMPLEMENTATION. given_diff: " patch_flag new_num new result old_num old - ' ' ' 1' ' ' ' ' ' 1' ' ' , - 'X' ' ' ' ' 'D' ' 2' 'write: `Test`.' , + ' ' ' 1' ' ' ' ' ' 1' ' ', + 'X' ' ' ' ' 'D' ' 2' 'write: `Test`.', ' ' ' ' ' ' 'D' ' 3' 'write: `Hello world`.', - ' ' ' ' ' ' 'D' ' 4' 'write: `Hello 123`.' , - 'X' ' ' ' ' 'D' ' 5' 'write: `Hello test`.' , - ' ' ' 2' ' ' ' ' ' 6' ' ' . + ' ' ' ' ' ' 'D' ' 4' 'write: `Hello 123`.', + 'X' ' ' ' ' 'D' ' 5' 'write: `Hello test`.', + ' ' ' 2' ' ' ' ' ' 6' ' '. when_patch_is_calculated( ). @@ -215,9 +215,9 @@ CLASS ltcl_calculate_patch IMPLEMENTATION. given_diff: " patch_flag new_num new result old_num old - ' ' ' 1' ' ' ' ' ' 1' ' ' , + ' ' ' 1' ' ' ' ' ' 1' ' ', 'X' ' 2' 'write: `Hello world`.' 'U' ' 2' 'write: `Test`.', - ' ' ' 3' ' ' ' ' ' 3' ' ' . + ' ' ' 3' ' ' ' ' ' 3' ' '. when_patch_is_calculated( ). @@ -232,10 +232,10 @@ CLASS ltcl_calculate_patch IMPLEMENTATION. given_diff: " patch_flag new_num new result old_num old - ' ' ' 1' ' ' ' ' ' 1' ' ' , - 'X' ' 2' 'write: `Hello world`.' 'U' ' 2' 'write: `Test`.' , + ' ' ' 1' ' ' ' ' ' 1' ' ', + 'X' ' 2' 'write: `Hello world`.' 'U' ' 2' 'write: `Test`.', 'X' ' 3' 'write: `Test`.' 'U' ' 3' 'write: `Hello world`.', - ' ' ' 4' ' ' ' ' ' 4' ' ' . + ' ' ' 4' ' ' ' ' ' 4' ' '. when_patch_is_calculated( ). @@ -251,11 +251,11 @@ CLASS ltcl_calculate_patch IMPLEMENTATION. given_diff: " patch_flag new_num new result old_num old - ' ' ' 1' ' ' ' ' ' 1' ' ' , - 'X' ' 2' 'write: `Hello world`.' 'U' ' 2' 'write: `Test`.' , - ' ' ' 3' ' ' ' ' ' 3' ' ' , + ' ' ' 1' ' ' ' ' ' 1' ' ', + 'X' ' 2' 'write: `Hello world`.' 'U' ' 2' 'write: `Test`.', + ' ' ' 3' ' ' ' ' ' 3' ' ', 'X' ' 4' 'write: `Test`.' 'U' ' 4' 'write: `Hello world`.', - ' ' ' 5' ' ' ' ' ' 5' ' ' . + ' ' ' 5' ' ' ' ' ' 5' ' '. when_patch_is_calculated( ). @@ -272,11 +272,11 @@ CLASS ltcl_calculate_patch IMPLEMENTATION. given_diff: " patch_flag new_num new result old_num old - ' ' ' 1' ' ' ' ' ' 1' ' ' , - 'X' ' 2' 'write: `Hello world`.' 'U' ' 2' 'write: `Test`.' , - ' ' ' 3' ' ' ' ' ' 3' ' ' , + ' ' ' 1' ' ' ' ' ' 1' ' ', + 'X' ' 2' 'write: `Hello world`.' 'U' ' 2' 'write: `Test`.', + ' ' ' 3' ' ' ' ' ' 3' ' ', ' ' ' 4' 'write: `Test`.' 'U' ' 4' 'write: `Hello world`.', - ' ' ' 5' ' ' ' ' ' 5' ' ' . + ' ' ' 5' ' ' ' ' ' 5' ' '. when_patch_is_calculated( ). @@ -293,12 +293,12 @@ CLASS ltcl_calculate_patch IMPLEMENTATION. given_diff: " patch_flag new_num new result old_num old - ' ' ' 1' ' ' ' ' ' 1' ' ' , - 'X' ' 2' 'write: `Hello world`.' 'U' ' 2' 'write: `Test`.' , - ' ' ' 3' ' ' ' ' ' 3' ' ' , + ' ' ' 1' ' ' ' ' ' 1' ' ', + 'X' ' 2' 'write: `Hello world`.' 'U' ' 2' 'write: `Test`.', + ' ' ' 3' ' ' ' ' ' 3' ' ', ' ' ' 4' 'write: `Test`.' 'U' ' 4' 'write: `Hello world`.', - ' ' ' 5' ' ' ' ' ' 5' ' ' , - 'X' ' 6' 'write: `newline`.' 'I' ' ' ' ' . + ' ' ' 5' ' ' ' ' ' 5' ' ', + 'X' ' 6' 'write: `newline`.' 'I' ' ' ' '. when_patch_is_calculated( ). @@ -351,8 +351,7 @@ CLASS ltcl_calculate_patch IMPLEMENTATION. TRY. mt_patch = lo_git_add_patch->get_patch( ). - - CATCH zcx_abapgit_exception INTO mx_error. + CATCH zcx_abapgit_exception INTO mx_error ##NO_HANDLER. ENDTRY. ENDMETHOD. diff --git a/src/git/zcl_abapgit_git_branch_list.clas.abap b/src/git/zcl_abapgit_git_branch_list.clas.abap index 748f13b84..499fdfe55 100644 --- a/src/git/zcl_abapgit_git_branch_list.clas.abap +++ b/src/git/zcl_abapgit_git_branch_list.clas.abap @@ -16,11 +16,6 @@ CLASS zcl_abapgit_git_branch_list DEFINITION VALUE(rs_branch) TYPE zif_abapgit_definitions=>ty_git_branch RAISING zcx_abapgit_exception . - METHODS get_head " For potential future use - RETURNING - VALUE(rs_branch) TYPE zif_abapgit_definitions=>ty_git_branch - RAISING - zcx_abapgit_exception . METHODS get_head_symref RETURNING VALUE(rv_head_symref) TYPE string . @@ -29,16 +24,11 @@ CLASS zcl_abapgit_git_branch_list DEFINITION VALUE(rt_branches) TYPE zif_abapgit_definitions=>ty_git_branch_list_tt RAISING zcx_abapgit_exception . - METHODS get_tags_only " For potential future use + METHODS get_tags_only " For potential future use RETURNING VALUE(rt_tags) TYPE zif_abapgit_definitions=>ty_git_branch_list_tt RAISING zcx_abapgit_exception . - CLASS-METHODS is_ignored - IMPORTING - !iv_branch_name TYPE clike - RETURNING - VALUE(rv_ignore) TYPE abap_bool . CLASS-METHODS get_display_name IMPORTING !iv_branch_name TYPE clike @@ -61,6 +51,7 @@ CLASS zcl_abapgit_git_branch_list DEFINITION !iv_branch_name TYPE clike RETURNING VALUE(rv_name) TYPE string . + PROTECTED SECTION. PRIVATE SECTION. DATA mt_branches TYPE zif_abapgit_definitions=>ty_git_branch_list_tt . @@ -91,6 +82,11 @@ CLASS zcl_abapgit_git_branch_list DEFINITION !iv_data TYPE string RETURNING VALUE(rv_head_symref) TYPE string . + CLASS-METHODS is_ignored + IMPORTING + !iv_branch_name TYPE clike + RETURNING + VALUE(rv_ignore) TYPE abap_bool . ENDCLASS. @@ -180,17 +176,6 @@ CLASS ZCL_ABAPGIT_GIT_BRANCH_LIST IMPLEMENTATION. ENDMETHOD. - METHOD get_head. - - IF mv_head_symref IS NOT INITIAL. - rs_branch = find_by_name( mv_head_symref ). - ELSE. - rs_branch = find_by_name( zif_abapgit_definitions=>c_head_name ). - ENDIF. - - ENDMETHOD. - - METHOD get_head_symref. rv_head_symref = mv_head_symref. ENDMETHOD. @@ -333,20 +318,14 @@ CLASS ZCL_ABAPGIT_GIT_BRANCH_LIST IMPLEMENTATION. METHOD skip_first_pkt. DATA: lv_hex TYPE x LENGTH 1, - lv_length TYPE i, - lv_0a_pos TYPE i. + lv_length TYPE i. * channel ASSERT iv_data(2) = '00'. lv_hex = to_upper( iv_data+2(2) ). - lv_0a_pos = lv_hex - 1. - IF iv_data+lv_0a_pos(1) = cl_abap_char_utilities=>newline. - lv_length = lv_hex. - ELSE. - lv_length = lv_hex. - ENDIF. + lv_length = lv_hex. rv_data = iv_data+lv_length. diff --git a/src/git/zcl_abapgit_git_pack.clas.abap b/src/git/zcl_abapgit_git_pack.clas.abap index 6b35445e4..8839c224a 100644 --- a/src/git/zcl_abapgit_git_pack.clas.abap +++ b/src/git/zcl_abapgit_git_pack.clas.abap @@ -167,20 +167,21 @@ CLASS ZCL_ABAPGIT_GIT_PACK IMPLEMENTATION. lv_decompress_len TYPE i, lv_xstring TYPE xstring, lv_expected TYPE i, - ls_object LIKE LINE OF rt_objects. - DATA: lv_uindex TYPE sy-index. + ls_object LIKE LINE OF rt_objects, + lv_uindex TYPE sy-index. + lv_data = iv_data. * header IF NOT xstrlen( lv_data ) > 4 OR lv_data(4) <> c_pack_start. - zcx_abapgit_exception=>raise( 'Unexpected pack header' ). + zcx_abapgit_exception=>raise( |Unexpected pack header| ). ENDIF. lv_data = lv_data+4. * version IF lv_data(4) <> c_version. - zcx_abapgit_exception=>raise( 'Version not supported' ). + zcx_abapgit_exception=>raise( |Version not supported| ). ENDIF. lv_data = lv_data+4. @@ -208,7 +209,7 @@ CLASS ZCL_ABAPGIT_GIT_PACK IMPLEMENTATION. * strip header, '789C', CMF + FLG lv_zlib = lv_data(2). IF lv_zlib <> c_zlib AND lv_zlib <> c_zlib_hmm. - zcx_abapgit_exception=>raise( 'Unexpected zlib header' ). + zcx_abapgit_exception=>raise( |Unexpected zlib header| ). ENDIF. lv_data = lv_data+2. @@ -223,7 +224,7 @@ CLASS ZCL_ABAPGIT_GIT_PACK IMPLEMENTATION. raw_out_len = lv_decompress_len ). IF lv_expected <> lv_decompress_len. - zcx_abapgit_exception=>raise( 'Decompression falied' ). + zcx_abapgit_exception=>raise( |Decompression falied| ). ENDIF. cl_abap_gzip=>compress_binary( @@ -274,7 +275,7 @@ CLASS ZCL_ABAPGIT_GIT_PACK IMPLEMENTATION. lv_xstring = iv_data(lv_len). lv_sha1 = zcl_abapgit_hash=>sha1_raw( lv_xstring ). IF to_upper( lv_sha1 ) <> lv_data. - zcx_abapgit_exception=>raise( 'SHA1 at end of pack doesnt match' ). + zcx_abapgit_exception=>raise( |SHA1 at end of pack doesnt match| ). ENDIF. decode_deltas( CHANGING ct_objects = rt_objects ). @@ -326,7 +327,7 @@ CLASS ZCL_ABAPGIT_GIT_PACK IMPLEMENTATION. IF rs_commit-author IS INITIAL OR rs_commit-committer IS INITIAL OR rs_commit-tree IS INITIAL. - zcx_abapgit_exception=>raise( 'multiple parents? not supported' ). + zcx_abapgit_exception=>raise( |multiple parents? not supported| ). ENDIF. ENDMETHOD. @@ -340,8 +341,8 @@ CLASS ZCL_ABAPGIT_GIT_PACK IMPLEMENTATION. LOOP AT ct_objects INTO ls_object - USING KEY type - WHERE type = zif_abapgit_definitions=>c_type-ref_d. + USING KEY type + WHERE type = zif_abapgit_definitions=>c_type-ref_d. INSERT ls_object INTO TABLE lt_deltas. ENDLOOP. @@ -460,7 +461,7 @@ CLASS ZCL_ABAPGIT_GIT_PACK IMPLEMENTATION. IF ls_node-chmod <> zif_abapgit_definitions=>c_chmod-dir AND ls_node-chmod <> zif_abapgit_definitions=>c_chmod-file AND ls_node-chmod <> zif_abapgit_definitions=>c_chmod-executable. - zcx_abapgit_exception=>raise( 'Unknown chmod' ). + zcx_abapgit_exception=>raise( |Unknown chmod| ). ENDIF. lv_offset = lv_match + 1. @@ -513,7 +514,7 @@ CLASS ZCL_ABAPGIT_GIT_PACK IMPLEMENTATION. zcx_abapgit_exception=>raise( |Base not found, { is_object-sha1 }| ). ELSEIF -type = zif_abapgit_definitions=>c_type-ref_d. * sanity check - zcx_abapgit_exception=>raise( 'Delta, base eq delta' ). + zcx_abapgit_exception=>raise( |Delta, base eq delta| ). ENDIF. lv_base = -data. @@ -810,7 +811,7 @@ CLASS ZCL_ABAPGIT_GIT_PACK IMPLEMENTATION. WHEN 112. rv_type = zif_abapgit_definitions=>c_type-ref_d. WHEN OTHERS. - zcx_abapgit_exception=>raise( 'Todo, unknown type' ). + zcx_abapgit_exception=>raise( |Todo, unknown git pack type| ). ENDCASE. ENDMETHOD. @@ -870,7 +871,7 @@ CLASS ZCL_ABAPGIT_GIT_PACK IMPLEMENTATION. WHEN zif_abapgit_definitions=>c_type-ref_d. lv_type = 112. WHEN OTHERS. - zcx_abapgit_exception=>raise( 'Unexpected object type while encoding pack' ). + zcx_abapgit_exception=>raise( |Unexpected object type while encoding pack| ). ENDCASE. lv_length = iv_length. @@ -911,7 +912,7 @@ CLASS ZCL_ABAPGIT_GIT_PACK IMPLEMENTATION. cv_decompressed = ls_data-raw. IF lv_compressed_len IS INITIAL. - zcx_abapgit_exception=>raise( 'Decompression falied :o/' ). + zcx_abapgit_exception=>raise( |Decompression falied :o/| ). ENDIF. cv_data = cv_data+lv_compressed_len. @@ -924,7 +925,7 @@ CLASS ZCL_ABAPGIT_GIT_PACK IMPLEMENTATION. cv_data = cv_data+1. ENDIF. IF cv_data(4) <> lv_adler32. - zcx_abapgit_exception=>raise( 'Wrong Adler checksum' ). + zcx_abapgit_exception=>raise( |Wrong Adler checksum| ). ENDIF. ENDMETHOD. ENDCLASS. diff --git a/src/git/zcl_abapgit_git_porcelain.clas.abap b/src/git/zcl_abapgit_git_porcelain.clas.abap index 8ea5e4679..df193b79a 100644 --- a/src/git/zcl_abapgit_git_porcelain.clas.abap +++ b/src/git/zcl_abapgit_git_porcelain.clas.abap @@ -72,6 +72,7 @@ CLASS zcl_abapgit_git_porcelain DEFINITION VALUE(rt_expanded) TYPE zif_abapgit_definitions=>ty_expanded_tt RAISING zcx_abapgit_exception . + PROTECTED SECTION. PRIVATE SECTION. TYPES: @@ -544,7 +545,6 @@ CLASS ZCL_ABAPGIT_GIT_PORCELAIN IMPLEMENTATION. iv_type = zif_abapgit_definitions=>c_type-tag iv_data = lv_tag ). - CLEAR ls_object. ls_object-sha1 = lv_new_tag_sha1. ls_object-type = zif_abapgit_definitions=>c_type-tag. ls_object-data = lv_tag. @@ -569,8 +569,8 @@ CLASS ZCL_ABAPGIT_GIT_PORCELAIN IMPLEMENTATION. lv_commit TYPE xstring, lv_pack TYPE xstring, ls_object LIKE LINE OF et_new_objects, - ls_commit TYPE zcl_abapgit_git_pack=>ty_commit. - DATA: lv_uindex TYPE sy-index. + ls_commit TYPE zcl_abapgit_git_pack=>ty_commit, + lv_uindex TYPE sy-index. FIELD-SYMBOLS: LIKE LINE OF it_trees, LIKE LINE OF it_blobs. @@ -597,7 +597,6 @@ CLASS ZCL_ABAPGIT_GIT_PORCELAIN IMPLEMENTATION. ls_commit-body = is_comment-comment. lv_commit = zcl_abapgit_git_pack=>encode_commit( ls_commit ). - CLEAR ls_object. ls_object-sha1 = zcl_abapgit_hash=>sha1( iv_type = zif_abapgit_definitions=>c_type-commit iv_data = lv_commit ). ls_object-type = zif_abapgit_definitions=>c_type-commit. ls_object-data = lv_commit. @@ -641,7 +640,7 @@ CLASS ZCL_ABAPGIT_GIT_PORCELAIN IMPLEMENTATION. ENDIF. ls_object-type = zif_abapgit_definitions=>c_type-blob. -* ASSERT NOT -data IS INITIAL. "#1857 allow empty files - some more checks needed? +* note -data can be empty, #1857 allow empty files - some more checks needed? ls_object-data = -data. lv_uindex = lv_uindex + 1. ls_object-index = lv_uindex.