[PATCH 2 of 2] crecord: cleanup the remains of commit confirmation
Pierre-Yves David
pierre-yves.david at ens-lyon.org
Thu Apr 14 05:08:04 EDT 2016
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david at ens-lyon.org>
# Date 1460623049 25200
# Thu Apr 14 01:37:29 2016 -0700
# Node ID 8ff3041c3862ec357930d6756dcb75efef804bd3
# Parent e0fa2da7f3c18a2ba980fdfe829a322c7e88f446
crecord: cleanup the remains of commit confirmation
The confirmation screen is now only used for the 'review' option we simplify
the code and rename the function.
diff -r e0fa2da7f3c1 -r 8ff3041c3862 mercurial/crecord.py
--- a/mercurial/crecord.py Thu Apr 14 01:27:18 2016 -0700
+++ b/mercurial/crecord.py Thu Apr 14 01:37:29 2016 -0700
@@ -1417,11 +1417,10 @@
return response
- def confirmcommit(self, review=False):
+ def reviewcommit(self):
"""ask for 'y' to be pressed to confirm selected. return True if
confirmed."""
- if review:
- confirmtext = (
+ confirmtext = (
"""if you answer yes to the following, the your currently chosen patch chunks
will be loaded into an editor. you may modify the patch from the editor, and
save the changes if you wish to change the patch. otherwise, you can just
@@ -1432,10 +1431,6 @@
are you sure you want to review/edit and confirm the selected changes [yn]?
""")
- else:
- confirmtext = (
- "are you sure you want to confirm the selected changes [yn]? ")
-
response = self.confirmationwindow(confirmtext)
if response is None:
response = "n"
@@ -1604,7 +1599,7 @@
elif test and keypressed in ['X']:
return True
elif keypressed in ["r"]:
- if self.confirmcommit(review=True):
+ if self.reviewcommit():
self.opts['review'] = True
return True
elif test and keypressed in ['R']:
More information about the Mercurial-devel
mailing list