Mercurial > public > mercurial-scm > hg-stable

diff mercurial/cmdutil.py @ 29326:d48fc6f318a3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch: define full messages for interactive record/revert Followup 14eee72c8d52 to provide complete context for proper localization. Also update cmdutil.recordfilter docstring to remove recommendation that "operation" argument should be translated. Indeed, for record/revert, we either go to patch.filterpatch or crecord.filterpatch (in curses mode) ; the former now build the full ui message from the operation parameter and the latter does not use this parameter (removing in a followup patch). For shelve, operation is not specified and this thus falls back to "record".
author Denis Laxalde <denis.laxalde@logilab.fr>
date Tue, 07 Jun 2016 10:37:19 +0200
parents 14eee72c8d52
children baab9ea4426c
line wrap: on
line diff
--- a/mercurial/cmdutil.py	Wed Jun 01 15:16:38 2016 +0200
+++ b/mercurial/cmdutil.py	Tue Jun 07 10:37:19 2016 +0200
@@ -91,9 +91,9 @@
 def recordfilter(ui, originalhunks, operation=None):
     """ Prompts the user to filter the originalhunks and return a list of
     selected hunks.
-    *operation* is used for ui purposes to indicate the user
-    what kind of filtering they are doing: reverting, committing, shelving, etc.
-    *operation* has to be a translated string.
+    *operation* is used for to build ui messages to indicate the user what
+    kind of filtering they are doing: reverting, committing, shelving, etc.
+    (see patch.filterpatch).
     """
     usecurses = crecordmod.checkcurses(ui)
     testfile = ui.config('experimental', 'crecordtest', None)
@@ -3301,7 +3301,7 @@
         else:
             diff = patch.diff(repo, None, ctx.node(), m, opts=diffopts)
         originalchunks = patch.parsepatch(diff)
-        operation = _('discard') if node == parent else _('revert')
+        operation = 'discard' if node == parent else 'revert'
 
         try: