From 5307cbf7abb8a2c7708cc875184a8d5d0b36b7ad Mon Sep 17 00:00:00 2001 From: Jun Wu Date: Tue, 8 Oct 2019 14:18:34 -0700 Subject: [PATCH] cmdutil: remove i18n for afterresolvedstates Summary: Commands like `hg rebase --continue` shouldn't be translated, because if the user does type the translated command, their shell is unlikely to execute it correctly. Reviewed By: kulshrax Differential Revision: D17768761 fbshipit-source-id: 4b995382db12397424ef4391e4515bd7933818dd --- edenscm/hgext/histedit.py | 2 +- edenscm/hgext/rebase.py | 2 +- edenscm/hgext/shelve.py | 2 +- edenscm/mercurial/cmdutil.py | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/edenscm/hgext/histedit.py b/edenscm/hgext/histedit.py index 848df0134e..eec0f02b2b 100644 --- a/edenscm/hgext/histedit.py +++ b/edenscm/hgext/histedit.py @@ -1807,4 +1807,4 @@ def extsetup(ui): _("use 'hg histedit --continue' or 'hg histedit --abort'"), ] ) - cmdutil.afterresolvedstates.append(["histedit-state", _("hg histedit --continue")]) + cmdutil.afterresolvedstates.append(("histedit-state", "hg histedit --continue")) diff --git a/edenscm/hgext/rebase.py b/edenscm/hgext/rebase.py index 3b296561bb..d80950effc 100644 --- a/edenscm/hgext/rebase.py +++ b/edenscm/hgext/rebase.py @@ -2231,4 +2231,4 @@ def uisetup(ui): _("use 'hg rebase --continue' or 'hg rebase --abort'"), ] ) - cmdutil.afterresolvedstates.append(["rebasestate", _("hg rebase --continue")]) + cmdutil.afterresolvedstates.append(("rebasestate", "hg rebase --continue")) diff --git a/edenscm/hgext/shelve.py b/edenscm/hgext/shelve.py index 45fc9fa18f..5e0b146734 100644 --- a/edenscm/hgext/shelve.py +++ b/edenscm/hgext/shelve.py @@ -1291,7 +1291,7 @@ def extsetup(ui): ] ) cmdutil.afterresolvedstates.append( - [shelvedstate._filename, _("hg unshelve --continue")] + (shelvedstate._filename, "hg unshelve --continue") ) diff --git a/edenscm/mercurial/cmdutil.py b/edenscm/mercurial/cmdutil.py index 080331cd77..e821b23ebf 100644 --- a/edenscm/mercurial/cmdutil.py +++ b/edenscm/mercurial/cmdutil.py @@ -4279,8 +4279,8 @@ def clearunfinished(repo): afterresolvedstates = [ - ("graftstate", _("hg graft --continue")), - ("updatemergestate", _("hg update --continue")), + ("graftstate", "hg graft --continue"), + ("updatemergestate", "hg update --continue"), ]