Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revert: indicate the default choice when prompting to forget files
authorDenis Laxalde <denis.laxalde@logilab.fr>
Fri, 25 Nov 2016 09:09:31 +0100
changeset 30540 841092fd6b85
parent 30539 74013a831872
child 30541 66b162fa3ffa
revert: indicate the default choice when prompting to forget files
mercurial/cmdutil.py file | annotate | diff | comparison | revisions
tests/test-revert-interactive.t file | annotate | diff | comparison | revisions 
--- a/mercurial/cmdutil.py	Fri Nov 25 09:09:03 2016 +0100
+++ b/mercurial/cmdutil.py	Fri Nov 25 09:09:31 2016 +0100
@@ -3171,7 +3171,7 @@
     for f in actions['forget'][0]:
         if interactive:
             choice = repo.ui.promptchoice(
-                _("forget added file %s (yn)?$$ &Yes $$ &No") % f)
+                _("forget added file %s (Yn)?$$ &Yes $$ &No") % f)
             if choice == 0:
                 repo.dirstate.drop(f)
             else:
--- a/tests/test-revert-interactive.t	Fri Nov 25 09:09:03 2016 +0100
+++ b/tests/test-revert-interactive.t	Fri Nov 25 09:09:31 2016 +0100
@@ -424,14 +424,14 @@
   > n
   > EOF
   forgetting newfile
-  forget added file newfile (yn)? n
+  forget added file newfile (Yn)? n
   $ hg status
   A newfile
   $ hg revert -i <<EOF
   > y
   > EOF
   forgetting newfile
-  forget added file newfile (yn)? y
+  forget added file newfile (Yn)? y
   $ hg status
   ? newfile
hg-stable