mirror of
https://github.com/abapGit/abapGit.git
synced 2025-05-02 04:36:49 +08:00
parent
65dd5f7568
commit
631132736d
|
@ -382,22 +382,17 @@ CLASS zcl_abapgit_objects IMPLEMENTATION.
|
||||||
|
|
||||||
"continue or abort?
|
"continue or abort?
|
||||||
IF zcl_abapgit_ui_factory=>get_frontend_services( )->gui_is_available( ) = abap_true.
|
IF zcl_abapgit_ui_factory=>get_frontend_services( )->gui_is_available( ) = abap_true.
|
||||||
CALL FUNCTION 'POPUP_TO_CONFIRM'
|
lv_answer = zcl_abapgit_ui_factory=>get_popups( )->popup_to_confirm(
|
||||||
EXPORTING
|
iv_titlebar = 'Warning'
|
||||||
titlebar = 'Warning'
|
iv_text_question = ls_result-text
|
||||||
text_question = ls_result-text
|
iv_text_button_1 = 'Pull Anyway'
|
||||||
text_button_1 = 'Abort'
|
iv_icon_button_1 = 'ICON_OKAY'
|
||||||
icon_button_1 = 'ICON_CANCEL'
|
iv_text_button_2 = 'Cancel'
|
||||||
text_button_2 = 'Pull anyway'
|
iv_icon_button_2 = 'ICON_CANCEL'
|
||||||
icon_button_2 = 'ICON_OKAY'
|
iv_default_button = '2'
|
||||||
default_button = '2'
|
iv_display_cancel_button = abap_false ).
|
||||||
display_cancel_button = abap_false
|
|
||||||
IMPORTING
|
IF lv_answer = '2'.
|
||||||
answer = lv_answer
|
|
||||||
EXCEPTIONS
|
|
||||||
text_not_found = 1
|
|
||||||
OTHERS = 2.
|
|
||||||
IF sy-subrc <> 0 OR lv_answer = 1.
|
|
||||||
zcx_abapgit_exception=>raise( |Deserialization for object { is_result-obj_name } | &
|
zcx_abapgit_exception=>raise( |Deserialization for object { is_result-obj_name } | &
|
||||||
|(type { is_result-obj_type }) aborted by user| ).
|
|(type { is_result-obj_type }) aborted by user| ).
|
||||||
ENDIF.
|
ENDIF.
|
||||||
|
|
|
@ -128,11 +128,10 @@ CLASS zcl_abapgit_requirement_helper IMPLEMENTATION.
|
||||||
|
|
||||||
show_requirement_popup( lt_met_status ).
|
show_requirement_popup( lt_met_status ).
|
||||||
|
|
||||||
CALL FUNCTION 'POPUP_TO_CONFIRM'
|
lv_answer = zcl_abapgit_ui_factory=>get_popups( )->popup_to_confirm(
|
||||||
EXPORTING
|
iv_titlebar = 'Warning'
|
||||||
text_question = 'The project has unmet requirements. Do you want to continue?'
|
iv_text_question = 'The project has unmet requirements. Do you want to continue?' ).
|
||||||
IMPORTING
|
|
||||||
answer = lv_answer.
|
|
||||||
IF lv_answer <> '1'.
|
IF lv_answer <> '1'.
|
||||||
zcx_abapgit_exception=>raise( 'Cancelling because of unmet requirements.' ).
|
zcx_abapgit_exception=>raise( 'Cancelling because of unmet requirements.' ).
|
||||||
ENDIF.
|
ENDIF.
|
||||||
|
|
|
@ -33,6 +33,8 @@ CLASS zcl_abapgit_xml DEFINITION
|
||||||
RAISING
|
RAISING
|
||||||
zcx_abapgit_exception .
|
zcx_abapgit_exception .
|
||||||
METHODS display_version_mismatch
|
METHODS display_version_mismatch
|
||||||
|
IMPORTING
|
||||||
|
!iv_vers TYPE string
|
||||||
RAISING
|
RAISING
|
||||||
zcx_abapgit_exception .
|
zcx_abapgit_exception .
|
||||||
METHODS raise_exception_for
|
METHODS raise_exception_for
|
||||||
|
@ -56,21 +58,19 @@ CLASS zcl_abapgit_xml IMPLEMENTATION.
|
||||||
|
|
||||||
METHOD display_version_mismatch.
|
METHOD display_version_mismatch.
|
||||||
|
|
||||||
DATA: lv_version TYPE string.
|
DATA lv_text TYPE string.
|
||||||
DATA: lv_file TYPE string.
|
|
||||||
|
lv_text = |The XML versions do not match, expected: { zif_abapgit_version=>c_xml_version }, actual: { iv_vers }|.
|
||||||
|
|
||||||
lv_version = |abapGit version: { zif_abapgit_version=>c_abap_version }|.
|
|
||||||
IF mv_filename IS NOT INITIAL.
|
IF mv_filename IS NOT INITIAL.
|
||||||
lv_file = |File: { mv_filename }|.
|
lv_text = lv_text && |, file: { mv_filename }|.
|
||||||
ENDIF.
|
ENDIF.
|
||||||
|
|
||||||
CALL FUNCTION 'POPUP_TO_INFORM'
|
lv_text = lv_text && | (see https://docs.abapgit.org/other-xml-mismatch.html)|.
|
||||||
EXPORTING
|
|
||||||
titel = 'abapGit XML version mismatch'
|
zcl_abapgit_ui_factory=>get_popups( )->popup_to_confirm(
|
||||||
txt1 = 'abapGit XML version mismatch'
|
iv_titlebar = 'abapGit XML Version Mismatch'
|
||||||
txt2 = 'See https://docs.abapgit.org/other-xml-mismatch.html'
|
iv_text_question = lv_text ).
|
||||||
txt3 = lv_version
|
|
||||||
txt4 = lv_file.
|
|
||||||
|
|
||||||
IF mv_filename IS INITIAL.
|
IF mv_filename IS INITIAL.
|
||||||
zcx_abapgit_exception=>raise( 'abapGit XML version mismatch' ).
|
zcx_abapgit_exception=>raise( 'abapGit XML version mismatch' ).
|
||||||
|
@ -125,7 +125,7 @@ CLASS zcl_abapgit_xml IMPLEMENTATION.
|
||||||
li_version = li_element->if_ixml_node~get_attributes(
|
li_version = li_element->if_ixml_node~get_attributes(
|
||||||
)->get_named_item_ns( c_attr_version ).
|
)->get_named_item_ns( c_attr_version ).
|
||||||
IF li_version->get_value( ) <> zif_abapgit_version=>c_xml_version.
|
IF li_version->get_value( ) <> zif_abapgit_version=>c_xml_version.
|
||||||
display_version_mismatch( ).
|
display_version_mismatch( li_version->get_value( ) ).
|
||||||
ENDIF.
|
ENDIF.
|
||||||
|
|
||||||
* buffer serializer metadata. Git node will be removed lateron
|
* buffer serializer metadata. Git node will be removed lateron
|
||||||
|
|
Loading…
Reference in New Issue
Block a user