@@ -301,6 +301,7 @@ def git_pull_request(
301
301
target_branch = None ,
302
302
title = None ,
303
303
message = None ,
304
+ keep_message = None ,
304
305
comment = None ,
305
306
rebase = True ,
306
307
download = None ,
@@ -395,6 +396,7 @@ def git_pull_request(
395
396
user ,
396
397
title ,
397
398
message ,
399
+ keep_message ,
398
400
comment ,
399
401
fork ,
400
402
setup_only ,
@@ -445,7 +447,7 @@ def edit_file_get_content_and_remove(filename):
445
447
editor = _run_shell_command (["git" , "var" , "GIT_EDITOR" ], output = True )
446
448
if not editor :
447
449
LOG .warning (
448
- "$EDITOR is unset, you will not be able to edit the " " pull-request message"
450
+ "$EDITOR is unset, you will not be able to edit the pull-request message"
449
451
)
450
452
editor = "cat"
451
453
status = os .system (editor + " " + filename )
@@ -502,6 +504,7 @@ def fork_and_push_pull_request(
502
504
user ,
503
505
title ,
504
506
message ,
507
+ keep_message ,
505
508
comment ,
506
509
fork ,
507
510
setup_only ,
@@ -645,15 +648,19 @@ def fork_and_push_pull_request(
645
648
else :
646
649
ptitle = title
647
650
648
- body = textparse .concat_with_ignore_marker (
649
- message or git_message ,
650
- ">\n > Current pull request content:\n "
651
- + pull .title
652
- + "\n \n "
653
- + pull .body ,
654
- )
651
+ if keep_message :
652
+ ptitle = pull .title
653
+ body = pull .body
654
+ else :
655
+ body = textparse .concat_with_ignore_marker (
656
+ message or git_message ,
657
+ ">\n > Current pull request content:\n "
658
+ + pull .title
659
+ + "\n \n "
660
+ + pull .body ,
661
+ )
655
662
656
- ptitle , body = edit_title_and_message (ptitle , body )
663
+ ptitle , body = edit_title_and_message (ptitle , body )
657
664
658
665
if ptitle is None :
659
666
LOG .critical ("Pull-request message is empty, aborting" )
@@ -794,6 +801,13 @@ def build_parser():
794
801
)
795
802
parser .add_argument ("--title" , help = "Title of the pull request." )
796
803
parser .add_argument ("--message" , "-m" , help = "Message of the pull request." )
804
+ parser .add_argument (
805
+ "--keep-message" ,
806
+ "-k" ,
807
+ action = "store_true" ,
808
+ help = "Don't open an editor to change the pull request message. "
809
+ "Useful when just refreshing an already-open pull request." ,
810
+ )
797
811
parser .add_argument (
798
812
"--label" ,
799
813
"-l" ,
@@ -863,6 +877,7 @@ def main():
863
877
target_branch = args .target_branch ,
864
878
title = args .title ,
865
879
message = args .message ,
880
+ keep_message = args .keep_message ,
866
881
comment = args .comment ,
867
882
rebase = not args .no_rebase ,
868
883
download = args .download ,
0 commit comments