This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7697

rebase: restore i18n of a hint message
ClosedPublic

Authored by martinvonz on Dec 18 2019, 2:38 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGd77230743968: rebase: restore i18n of a hint message
Summary

As noticed by Yuya, I lost the _() call in 71fee4564410 (rebase: use
rewriteutil.precheck() instead of reimplementing it, 2019-12-18).

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Dec 18 2019, 2:38 PM
pulkit accepted this revision.Dec 19 2019, 12:10 PM
This revision is now accepted and ready to land.Dec 19 2019, 12:10 PM
martinvonz added a commit: rHGd77230743968: rebase: restore i18n of a hint message.Dec 19 2019, 12:55 PM
Closed by commit rHGd77230743968: rebase: restore i18n of a hint message (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (2 lines)

Diff 18882

hgext/rebase.py

return _nothingtorebase() return _nothingtorebase()
rebaseset = destmap.keys() rebaseset = destmap.keys()
if not self.keepf: if not self.keepf:
try: try:
rewriteutil.precheck(self.repo, rebaseset, action=b'rebase') rewriteutil.precheck(self.repo, rebaseset, action=b'rebase')
except error.Abort as e: except error.Abort as e:
if e.hint is None: 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 raise e
result = buildstate(self.repo, destmap, self.collapsef) result = buildstate(self.repo, destmap, self.collapsef)
if not result: if not result:
# Empty state built, nothing to rebase # Empty state built, nothing to rebase
self.ui.status(_(b'nothing to rebase\n')) self.ui.status(_(b'nothing to rebase\n'))
return _nothingtorebase() return _nothingtorebase()