Mercurial Mercurial > pub > hg > evolve / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgext3rd/evolve/cmdrewrite.py
changeset 4126 099e264bf3be
parent 4108 ef3c9ecb8099
parent 4121 7f18c7e1e744
child 4183 536c67823962
child 4191 5c734be63c3e 
--- a/hgext3rd/evolve/cmdrewrite.py	Sat Sep 22 13:09:06 2018 +0200
+++ b/hgext3rd/evolve/cmdrewrite.py	Fri Sep 21 18:33:55 2018 +0200
@@ -187,7 +187,6 @@
         lockmod.release(lock, wlock)
 
 def _editandapply(ui, repo, pats, old, p1, fp, diffopts):
-    RETRYCHOICE = _('try to fix the patch (yn)?$$ &Yes $$ &No')
     newnode = None
     while newnode is None:
         fp.seek(0)
@@ -221,7 +220,8 @@
             defaultchoice = 0 # yes
             if not ui.interactive:
                 defaultchoice = 1 # no
-            if ui.promptchoice(RETRYCHOICE, default=defaultchoice):
+            retrychoice = _('try to fix the patch (yn)?$$ &Yes $$ &No')
+            if ui.promptchoice(retrychoice, default=defaultchoice):
                 raise error.Abort(_("Could not apply amended path"))
             else:
                 # consider a third choice where we restore the original patch
evolve