SAP/abapGit
1
0
Fork 0
mirror of https://github.com/abapGit/abapGit.git synced 2025-04-30 20:03:20 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'main' into alav-dcls

Browse Source
This commit is contained in:
Marc Bernard 2025-01-23 21:23:45 +01:00 committed by GitHub
commit 4f064d8d2e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 44 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/objects/zcl_abapgit_object_ddls.clas.abap
View File

@ -280,7 +280,8 @@ CLASS zcl_abapgit_object_ddls IMPLEMENTATION.
<lg_data_baseinfo> TYPE any, <lg_data_baseinfo> TYPE any,
<lg_source> TYPE any, <lg_source> TYPE any,
<lg_baseinfo_string> TYPE any, <lg_baseinfo_string> TYPE any,
<lg_baseinfo_ddlname> TYPE any. <lg_baseinfo_ddlname> TYPE any,
<lg_abap_language_version> TYPE any.
TRY. TRY.
CREATE DATA lr_data TYPE ('DDDDLSRCV'). CREATE DATA lr_data TYPE ('DDDDLSRCV').
@ -293,6 +294,11 @@ CLASS zcl_abapgit_object_ddls IMPLEMENTATION.
ASSERT sy-subrc = 0. ASSERT sy-subrc = 0.
<lg_source> = mo_files->read_string( 'asddls' ). <lg_source> = mo_files->read_string( 'asddls' ).
ASSIGN COMPONENT 'ABAP_LANGUAGE_VERSION' OF STRUCTURE <lg_data> TO <lg_abap_language_version>.
IF sy-subrc = 0.
set_abap_language_version( CHANGING cv_abap_language_version = <lg_abap_language_version> ).
ENDIF.
CALL METHOD ('CL_DD_DDL_HANDLER_FACTORY')=>('CREATE') CALL METHOD ('CL_DD_DDL_HANDLER_FACTORY')=>('CREATE')
RECEIVING RECEIVING
handler = lo_ddl. handler = lo_ddl.
@ -310,12 +316,22 @@ CLASS zcl_abapgit_object_ddls IMPLEMENTATION.
ASSERT sy-subrc = 0. ASSERT sy-subrc = 0.
<lg_baseinfo_ddlname> = ms_item-obj_name. <lg_baseinfo_ddlname> = ms_item-obj_name.
TRY.
CALL METHOD lo_ddl->('IF_DD_DDL_HANDLER~SAVE')
EXPORTING
name = ms_item-obj_name
put_state = 'N'
ddddlsrcv_wa = <lg_data>
baseinfo_string = <lg_data_baseinfo>
save_language_version = abap_true.
CATCH cx_sy_dyn_call_param_not_found.
CALL METHOD lo_ddl->('IF_DD_DDL_HANDLER~SAVE') CALL METHOD lo_ddl->('IF_DD_DDL_HANDLER~SAVE')
EXPORTING EXPORTING
name = ms_item-obj_name name = ms_item-obj_name
put_state = 'N' put_state = 'N'
ddddlsrcv_wa = <lg_data> ddddlsrcv_wa = <lg_data>
baseinfo_string = <lg_data_baseinfo>. baseinfo_string = <lg_data_baseinfo>.
ENDTRY.
ELSE. ELSE.
CALL METHOD lo_ddl->('IF_DD_DDL_HANDLER~SAVE') CALL METHOD lo_ddl->('IF_DD_DDL_HANDLER~SAVE')
EXPORTING EXPORTING
@ -453,7 +469,8 @@ CLASS zcl_abapgit_object_ddls IMPLEMENTATION.
<lt_data_baseinfo> TYPE ANY TABLE, <lt_data_baseinfo> TYPE ANY TABLE,
<lg_data_baseinfo> TYPE any, <lg_data_baseinfo> TYPE any,
<lg_ddlname> TYPE any, <lg_ddlname> TYPE any,
<lg_as4local> TYPE any. <lg_as4local> TYPE any,
<lg_abap_language_version> TYPE any.
TRY. TRY.
@ -506,12 +523,16 @@ CLASS zcl_abapgit_object_ddls IMPLEMENTATION.
zcx_abapgit_exception=>raise_with_text( lx_error ). zcx_abapgit_exception=>raise_with_text( lx_error ).
ENDTRY. ENDTRY.
ASSIGN COMPONENT 'ABAP_LANGUAGE_VERSION' OF STRUCTURE <lg_data> TO <lg_abap_language_version>.
IF sy-subrc = 0.
clear_abap_language_version( CHANGING cv_abap_language_version = <lg_abap_language_version> ).
ENDIF.
APPEND 'AS4USER' TO lt_clr_comps. APPEND 'AS4USER' TO lt_clr_comps.
APPEND 'AS4DATE' TO lt_clr_comps. APPEND 'AS4DATE' TO lt_clr_comps.
APPEND 'AS4TIME' TO lt_clr_comps. APPEND 'AS4TIME' TO lt_clr_comps.
APPEND 'ACTFLAG' TO lt_clr_comps. APPEND 'ACTFLAG' TO lt_clr_comps.
APPEND 'CHGFLAG' TO lt_clr_comps. APPEND 'CHGFLAG' TO lt_clr_comps.
APPEND 'ABAP_LANGUAGE_VERSION' TO lt_clr_comps.
APPEND 'ABAP_LANGU_VERSION' TO lt_clr_comps. APPEND 'ABAP_LANGU_VERSION' TO lt_clr_comps.
LOOP AT lt_clr_comps ASSIGNING <lv_comp>. LOOP AT lt_clr_comps ASSIGNING <lv_comp>.

3
src/ui/pages/zcl_abapgit_gui_page_patch.clas.abap
View File

@ -528,7 +528,10 @@ CLASS zcl_abapgit_gui_page_patch IMPLEMENTATION.
lv_patched TYPE abap_bool, lv_patched TYPE abap_bool,
lv_is_patch_possible TYPE abap_bool. lv_is_patch_possible TYPE abap_bool.
" In case an object is falsely detected as changed, filename is empty and there's no diff object
IF iv_filename IS NOT INITIAL.
lv_patched = get_diff_object( iv_filename )->is_line_patched( iv_index ). lv_patched = get_diff_object( iv_filename )->is_line_patched( iv_index ).
ENDIF.
lv_is_patch_possible = is_patch_line_possible( is_diff_line ). lv_is_patch_possible = is_patch_line_possible( is_diff_line ).