Patchwork D7697: rebase: restore i18n of a hint message

login
register
mail settings
Submitter phabricator
Date Dec. 18, 2019, 7:39 p.m.
Message ID <differential-rev-PHID-DREV-kt5mn3wzebmedxevc2im-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/43977/
State Superseded
Headers show

Comments

phabricator - Dec. 18, 2019, 7:39 p.m.
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  As noticed by Yuya, I lost the _() call in 71fee4564410 <https://phab.mercurial-scm.org/rHG71fee45644102ad77bc12a47cfb1e84f1b68773c> (rebase: use
  rewriteutil.precheck() instead of reimplementing it, 2019-12-18).

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D7697

AFFECTED FILES
  hgext/rebase.py

CHANGE DETAILS




To: martinvonz, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -399,7 +399,7 @@ 
                 rewriteutil.precheck(self.repo, rebaseset, action=b'rebase')
             except error.Abort as e:
                 if e.hint is None:
-                    e.hint = b'use --keep to keep original changesets'
+                    e.hint = _(b'use --keep to keep original changesets')
                 raise e
 
         result = buildstate(self.repo, destmap, self.collapsef)