From a6658e360ecb0fddd6eb782d0f9182c47057b7d4 Mon Sep 17 00:00:00 2001 From: Lars Hvam Date: Tue, 7 Feb 2023 08:39:15 +0100 Subject: [PATCH] git: replace newline with builtin (#6044) --- package.json | 6 ++-- src/git/zcl_abapgit_git_add_patch.clas.abap | 4 +-- src/git/zcl_abapgit_git_branch_list.clas.abap | 2 +- ...pgit_git_branch_list.clas.testclasses.abap | 2 +- src/git/zcl_abapgit_git_commit.clas.abap | 2 +- src/git/zcl_abapgit_git_pack.clas.abap | 28 +++++++++---------- ...zcl_abapgit_git_pack.clas.testclasses.abap | 8 +++--- src/git/zcl_abapgit_git_porcelain.clas.abap | 4 +-- src/git/zcl_abapgit_git_transport.clas.abap | 14 +++++----- ...bapgit_git_transport.clas.testclasses.abap | 18 ++++++------ 10 files changed, 44 insertions(+), 44 deletions(-) diff --git a/package.json b/package.json index 05915f660..b2e9ececa 100644 --- a/package.json +++ b/package.json @@ -26,10 +26,10 @@ ] }, "devDependencies": { - "@abaplint/cli": "^2.95.8", + "@abaplint/cli": "^2.95.13", "@abaplint/database-sqlite": "^2.4.0", - "@abaplint/runtime": "^2.4.0", - "@abaplint/transpiler-cli": "^2.4.0", + "@abaplint/runtime": "^2.4.8", + "@abaplint/transpiler-cli": "^2.4.8", "abapmerge": "^0.14.8", "c8": "^7.12.0", "eslint": "^8.33.0" diff --git a/src/git/zcl_abapgit_git_add_patch.clas.abap b/src/git/zcl_abapgit_git_add_patch.clas.abap index 551922272..017b0fcde 100644 --- a/src/git/zcl_abapgit_git_add_patch.clas.abap +++ b/src/git/zcl_abapgit_git_add_patch.clas.abap @@ -108,8 +108,8 @@ CLASS ZCL_ABAPGIT_GIT_ADD_PATCH IMPLEMENTATION. mt_patch = calculate_patch( ). ENDIF. - CONCATENATE LINES OF mt_patch INTO lv_string SEPARATED BY zif_abapgit_definitions=>c_newline. - lv_string = lv_string && zif_abapgit_definitions=>c_newline. + CONCATENATE LINES OF mt_patch INTO lv_string SEPARATED BY cl_abap_char_utilities=>newline. + lv_string = lv_string && cl_abap_char_utilities=>newline. rv_patch_binary = zcl_abapgit_convert=>string_to_xstring_utf8( lv_string ). diff --git a/src/git/zcl_abapgit_git_branch_list.clas.abap b/src/git/zcl_abapgit_git_branch_list.clas.abap index af88b854f..234e13eb4 100644 --- a/src/git/zcl_abapgit_git_branch_list.clas.abap +++ b/src/git/zcl_abapgit_git_branch_list.clas.abap @@ -261,7 +261,7 @@ CLASS zcl_abapgit_git_branch_list IMPLEMENTATION. CLEAR: et_list, ev_head_symref. lv_data = skip_first_pkt( iv_data ). - SPLIT lv_data AT zif_abapgit_definitions=>c_newline INTO TABLE lt_result. + SPLIT lv_data AT cl_abap_char_utilities=>newline INTO TABLE lt_result. LOOP AT lt_result INTO lv_data. lv_current_row_index = sy-tabix. diff --git a/src/git/zcl_abapgit_git_branch_list.clas.testclasses.abap b/src/git/zcl_abapgit_git_branch_list.clas.testclasses.abap index 1aab9ee28..781396ecc 100644 --- a/src/git/zcl_abapgit_git_branch_list.clas.testclasses.abap +++ b/src/git/zcl_abapgit_git_branch_list.clas.testclasses.abap @@ -32,7 +32,7 @@ CLASS ltcl_parse IMPLEMENTATION. DATA: lv_data TYPE string, lt_list TYPE zif_abapgit_git_definitions=>ty_git_branch_list_tt. - CONCATENATE LINES OF mt_data INTO lv_data SEPARATED BY zif_abapgit_definitions=>c_newline. + CONCATENATE LINES OF mt_data INTO lv_data SEPARATED BY cl_abap_char_utilities=>newline. zcl_abapgit_git_branch_list=>parse_branch_list( EXPORTING diff --git a/src/git/zcl_abapgit_git_commit.clas.abap b/src/git/zcl_abapgit_git_commit.clas.abap index eaf0ae8cd..dab27f2a8 100644 --- a/src/git/zcl_abapgit_git_commit.clas.abap +++ b/src/git/zcl_abapgit_git_commit.clas.abap @@ -247,7 +247,7 @@ CLASS zcl_abapgit_git_commit IMPLEMENTATION. ls_commit-parent1 = ls_raw-parent. ls_commit-parent2 = ls_raw-parent2. - SPLIT ls_raw-body AT zif_abapgit_definitions=>c_newline INTO TABLE lt_body. + SPLIT ls_raw-body AT cl_abap_char_utilities=>newline INTO TABLE lt_body. READ TABLE lt_body WITH KEY table_line = ' -----END PGP SIGNATURE-----' TRANSPORTING NO FIELDS. IF sy-subrc = 0. diff --git a/src/git/zcl_abapgit_git_pack.clas.abap b/src/git/zcl_abapgit_git_pack.clas.abap index a25f0efa8..779ba29bc 100644 --- a/src/git/zcl_abapgit_git_pack.clas.abap +++ b/src/git/zcl_abapgit_git_pack.clas.abap @@ -302,7 +302,7 @@ CLASS ZCL_ABAPGIT_GIT_PACK IMPLEMENTATION. lv_string = zcl_abapgit_convert=>xstring_to_string_utf8( iv_data ). - SPLIT lv_string AT zif_abapgit_definitions=>c_newline INTO TABLE lt_string. + SPLIT lv_string AT cl_abap_char_utilities=>newline INTO TABLE lt_string. LOOP AT lt_string ASSIGNING . lv_length = strlen( ) + 1. @@ -398,7 +398,7 @@ CLASS ZCL_ABAPGIT_GIT_PACK IMPLEMENTATION. lv_string = zcl_abapgit_convert=>xstring_to_string_utf8( iv_data ). - SPLIT lv_string AT zif_abapgit_definitions=>c_newline INTO TABLE lt_string. + SPLIT lv_string AT cl_abap_char_utilities=>newline INTO TABLE lt_string. LOOP AT lt_string ASSIGNING . @@ -433,7 +433,7 @@ CLASS ZCL_ABAPGIT_GIT_PACK IMPLEMENTATION. ELSE. IF rs_tag-body IS NOT INITIAL. - rs_tag-body = rs_tag-body && zif_abapgit_definitions=>c_newline. + rs_tag-body = rs_tag-body && cl_abap_char_utilities=>newline. ENDIF. rs_tag-body = rs_tag-body && . @@ -693,7 +693,7 @@ CLASS ZCL_ABAPGIT_GIT_PACK IMPLEMENTATION. lv_string = ''. CONCATENATE 'tree' lv_tree_lower INTO lv_tmp SEPARATED BY space. - CONCATENATE lv_string lv_tmp zif_abapgit_definitions=>c_newline INTO lv_string. + CONCATENATE lv_string lv_tmp cl_abap_char_utilities=>newline INTO lv_string. IF NOT is_commit-parent IS INITIAL. lv_parent_lower = is_commit-parent. @@ -701,7 +701,7 @@ CLASS ZCL_ABAPGIT_GIT_PACK IMPLEMENTATION. CONCATENATE 'parent' lv_parent_lower INTO lv_tmp SEPARATED BY space. - CONCATENATE lv_string lv_tmp zif_abapgit_definitions=>c_newline INTO lv_string. + CONCATENATE lv_string lv_tmp cl_abap_char_utilities=>newline INTO lv_string. ENDIF. IF NOT is_commit-parent2 IS INITIAL. @@ -710,16 +710,16 @@ CLASS ZCL_ABAPGIT_GIT_PACK IMPLEMENTATION. CONCATENATE 'parent' lv_parent_lower INTO lv_tmp SEPARATED BY space. - CONCATENATE lv_string lv_tmp zif_abapgit_definitions=>c_newline INTO lv_string. + CONCATENATE lv_string lv_tmp cl_abap_char_utilities=>newline INTO lv_string. ENDIF. CONCATENATE 'author' is_commit-author INTO lv_tmp SEPARATED BY space. - CONCATENATE lv_string lv_tmp zif_abapgit_definitions=>c_newline INTO lv_string. + CONCATENATE lv_string lv_tmp cl_abap_char_utilities=>newline INTO lv_string. CONCATENATE 'committer' is_commit-committer INTO lv_tmp SEPARATED BY space. - CONCATENATE lv_string lv_tmp zif_abapgit_definitions=>c_newline INTO lv_string. + CONCATENATE lv_string lv_tmp cl_abap_char_utilities=>newline INTO lv_string. IF NOT is_commit-gpgsig IS INITIAL. CONCATENATE 'gpgsig' is_commit-gpgsig @@ -727,7 +727,7 @@ CLASS ZCL_ABAPGIT_GIT_PACK IMPLEMENTATION. CONCATENATE lv_string lv_tmp INTO lv_string. ENDIF. - CONCATENATE lv_string zif_abapgit_definitions=>c_newline is_commit-body INTO lv_string. + CONCATENATE lv_string cl_abap_char_utilities=>newline is_commit-body INTO lv_string. rv_data = zcl_abapgit_convert=>string_to_xstring_utf8( lv_string ). @@ -741,12 +741,12 @@ CLASS ZCL_ABAPGIT_GIT_PACK IMPLEMENTATION. lv_time = zcl_abapgit_git_time=>get_unix( ). - lv_string = |object { is_tag-object }{ zif_abapgit_definitions=>c_newline }| - && |type { is_tag-type }{ zif_abapgit_definitions=>c_newline }| - && |tag { zcl_abapgit_git_tag=>remove_tag_prefix( is_tag-tag ) }{ zif_abapgit_definitions=>c_newline }| + lv_string = |object { is_tag-object }{ cl_abap_char_utilities=>newline }| + && |type { is_tag-type }{ cl_abap_char_utilities=>newline }| + && |tag { zcl_abapgit_git_tag=>remove_tag_prefix( is_tag-tag ) }{ cl_abap_char_utilities=>newline }| && |tagger { is_tag-tagger_name } <{ is_tag-tagger_email }> { lv_time }| - && |{ zif_abapgit_definitions=>c_newline }| - && |{ zif_abapgit_definitions=>c_newline }| + && |{ cl_abap_char_utilities=>newline }| + && |{ cl_abap_char_utilities=>newline }| && |{ is_tag-message }|. rv_data = zcl_abapgit_convert=>string_to_xstring_utf8( lv_string ). diff --git a/src/git/zcl_abapgit_git_pack.clas.testclasses.abap b/src/git/zcl_abapgit_git_pack.clas.testclasses.abap index 979557ef8..39061792c 100644 --- a/src/git/zcl_abapgit_git_pack.clas.testclasses.abap +++ b/src/git/zcl_abapgit_git_pack.clas.testclasses.abap @@ -473,8 +473,8 @@ CLASS ltcl_pack IMPLEMENTATION. ls_commit-author = 'larshp 1387823471 +0100'. ls_commit-committer = 'larshp 1387823471 +0100'. ls_commit-body = 'very informative' - && zif_abapgit_definitions=>c_newline - && zif_abapgit_definitions=>c_newline. + && cl_abap_char_utilities=>newline + && cl_abap_char_utilities=>newline. lv_data = zcl_abapgit_git_pack=>encode_commit( ls_commit ). ls_result = zcl_abapgit_git_pack=>decode_commit( lv_data ). @@ -497,7 +497,7 @@ CLASS ltcl_pack IMPLEMENTATION. ls_commit-committer = 'larshp 1387823471 +0100'. ls_commit-body = 'very informative'. ls_commit-gpgsig = '-----END PGP SIGNATURE-----' - && |{ zif_abapgit_definitions=>c_newline } { zif_abapgit_definitions=>c_newline }|. + && |{ cl_abap_char_utilities=>newline } { cl_abap_char_utilities=>newline }|. lv_data = zcl_abapgit_git_pack=>encode_commit( ls_commit ). ls_result = zcl_abapgit_git_pack=>decode_commit( lv_data ). @@ -544,7 +544,7 @@ CLASS ltcl_git_pack_decode_commit IMPLEMENTATION. METHOD add. - CONCATENATE mv_str iv_string zif_abapgit_definitions=>c_newline INTO mv_str. + CONCATENATE mv_str iv_string cl_abap_char_utilities=>newline INTO mv_str. ENDMETHOD. diff --git a/src/git/zcl_abapgit_git_porcelain.clas.abap b/src/git/zcl_abapgit_git_porcelain.clas.abap index 0429f24e3..bf4508ae6 100644 --- a/src/git/zcl_abapgit_git_porcelain.clas.abap +++ b/src/git/zcl_abapgit_git_porcelain.clas.abap @@ -576,8 +576,8 @@ CLASS zcl_abapgit_git_porcelain IMPLEMENTATION. ls_tag-tagger_name = is_tag-tagger_name. ls_tag-tagger_email = is_tag-tagger_email. ls_tag-message = is_tag-message - && |{ zif_abapgit_definitions=>c_newline }| - && |{ zif_abapgit_definitions=>c_newline }| + && |{ cl_abap_char_utilities=>newline }| + && |{ cl_abap_char_utilities=>newline }| && is_tag-body. lv_tag = zcl_abapgit_git_pack=>encode_tag( ls_tag ). diff --git a/src/git/zcl_abapgit_git_transport.clas.abap b/src/git/zcl_abapgit_git_transport.clas.abap index badaa3837..1600378ca 100644 --- a/src/git/zcl_abapgit_git_transport.clas.abap +++ b/src/git/zcl_abapgit_git_transport.clas.abap @@ -169,7 +169,7 @@ CLASS ZCL_ABAPGIT_GIT_TRANSPORT IMPLEMENTATION. lv_error = 'Missing pkt length for unpack status'. ELSE. lv_string = lv_string+4. - SPLIT lv_string AT zif_abapgit_definitions=>c_newline INTO lv_unpack_status lv_string. + SPLIT lv_string AT cl_abap_char_utilities=>newline INTO lv_unpack_status lv_string. SPLIT lv_unpack_status AT space INTO lv_unpack_text lv_unpack_code. IF lv_unpack_text <> 'unpack'. @@ -182,7 +182,7 @@ CLASS ZCL_ABAPGIT_GIT_TRANSPORT IMPLEMENTATION. lv_error = 'Missing pkt length for command status'. ELSE. lv_string = lv_string+4. - SPLIT lv_string AT zif_abapgit_definitions=>c_newline INTO lv_commnd_status lv_string. + SPLIT lv_string AT cl_abap_char_utilities=>newline INTO lv_commnd_status lv_string. SPLIT lv_commnd_status AT space INTO lv_commnd_code lv_commnd_text. IF lv_commnd_code <> 'ok'. "=ng @@ -315,7 +315,7 @@ CLASS ZCL_ABAPGIT_GIT_TRANSPORT IMPLEMENTATION. zcl_abapgit_git_utils=>get_null( ) && ` ` && lv_cap_list && - zif_abapgit_definitions=>c_newline. + cl_abap_char_utilities=>newline. lv_cmd_pkt = zcl_abapgit_git_utils=>pkt_string( lv_line ). lv_buffer = lv_cmd_pkt && '0000'. @@ -350,22 +350,22 @@ CLASS ZCL_ABAPGIT_GIT_TRANSPORT IMPLEMENTATION. IF sy-tabix = 1. lv_capa = 'side-band-64k no-progress multi_ack'. lv_line = 'want' && ` ` && - && ` ` && lv_capa && zif_abapgit_definitions=>c_newline. + && ` ` && lv_capa && cl_abap_char_utilities=>newline. ELSE. lv_line = 'want' && ` ` && - && zif_abapgit_definitions=>c_newline. + && cl_abap_char_utilities=>newline. ENDIF. lv_buffer = lv_buffer && zcl_abapgit_git_utils=>pkt_string( lv_line ). ENDLOOP. IF iv_deepen_level > 0. lv_buffer = lv_buffer && zcl_abapgit_git_utils=>pkt_string( |deepen { iv_deepen_level }| && - zif_abapgit_definitions=>c_newline ). + cl_abap_char_utilities=>newline ). ENDIF. lv_buffer = lv_buffer && '0000' - && '0009done' && zif_abapgit_definitions=>c_newline. + && '0009done' && cl_abap_char_utilities=>newline. lv_xstring = io_client->send_receive_close( zcl_abapgit_convert=>string_to_xstring_utf8( lv_buffer ) ). diff --git a/src/git/zcl_abapgit_git_transport.clas.testclasses.abap b/src/git/zcl_abapgit_git_transport.clas.testclasses.abap index 319043a24..c2b66989c 100644 --- a/src/git/zcl_abapgit_git_transport.clas.testclasses.abap +++ b/src/git/zcl_abapgit_git_transport.clas.testclasses.abap @@ -77,9 +77,9 @@ CLASS ltcl_git_transport IMPLEMENTATION. DATA lv_status TYPE string. lv_status = `000eunpack ok` && - zif_abapgit_definitions=>c_newline && + cl_abap_char_utilities=>newline && `0017ok refs/heads/main` && - zif_abapgit_definitions=>c_newline && + cl_abap_char_utilities=>newline && `00000000`. TRY. zcl_abapgit_git_transport=>check_report_status( lv_status ). @@ -95,7 +95,7 @@ CLASS ltcl_git_transport IMPLEMENTATION. DATA lx_error TYPE REF TO zcx_abapgit_exception. lv_status = `0012unpack failed` && - zif_abapgit_definitions=>c_newline && + cl_abap_char_utilities=>newline && `00000000`. TRY. @@ -116,10 +116,10 @@ CLASS ltcl_git_transport IMPLEMENTATION. DATA lx_error TYPE REF TO zcx_abapgit_exception. lv_status = `000eunpack ok` && - zif_abapgit_definitions=>c_newline && + cl_abap_char_utilities=>newline && `009fng refs/heads/main cannot lock ref 'refs/heads/main':` && ` is at 625990aec9a9ebacbb99021804ce07bb6c350d05 but expected 77d2cfba9595de4c247d26b12cd40ce6cb75d61e` && - zif_abapgit_definitions=>c_newline && + cl_abap_char_utilities=>newline && `00000000`. TRY. @@ -140,9 +140,9 @@ CLASS ltcl_git_transport IMPLEMENTATION. DATA lx_error TYPE REF TO zcx_abapgit_exception. lv_status = `000eunpack ok` && - zif_abapgit_definitions=>c_newline && + cl_abap_char_utilities=>newline && `0017ok refs/heads/main` && - zif_abapgit_definitions=>c_newline && + cl_abap_char_utilities=>newline && '0020ok refs/heads/main'. " example for more data instead of flush TRY. @@ -164,9 +164,9 @@ CLASS ltcl_git_transport IMPLEMENTATION. DATA lv_status TYPE string. lv_status = `000eunpack ok` && - zif_abapgit_definitions=>c_newline && + cl_abap_char_utilities=>newline && `0019ok refs/heads/master` && - zif_abapgit_definitions=>c_newline && + cl_abap_char_utilities=>newline && `0000`. TRY.