This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1852

visibility: make the filtered message translatable
ClosedPublic

Authored by lothiraldan on Jan 12 2018, 6:33 AM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHGc026547454dd: visibility: make the filtered message translatable
rHG0e0daf46a30c: visibility: make the filtered message translatable
Summary

Introduce a filtered message table to ease translation of these messages.

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

lothiraldan created this revision.Jan 12 2018, 6:33 AM
yuja accepted this revision.Jan 12 2018, 7:30 AM
This revision is now accepted and ready to land.Jan 12 2018, 7:30 AM
yuja added a comment.Jan 12 2018, 7:34 AM

Queued, thanks.

FWIW, it might be good idea to move context._filterederror() to obsutil.py
because context.py is painfully big.

Closed by commit rHG0e0daf46a30c: visibility: make the filtered message translatable (authored by lothiraldan). · Explain WhyJan 12 2018, 7:48 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/context.py (3 lines)
Mmercurial/obsutil.py (31 lines)

Diff 4805

mercurial/context.py

# Check if the changeset is obsolete # Check if the changeset is obsolete
unfilteredrepo = repo.unfiltered() unfilteredrepo = repo.unfiltered()
ctx = unfilteredrepo[changeid] ctx = unfilteredrepo[changeid]
# If the changeset is obsolete, enrich the message with the reason # If the changeset is obsolete, enrich the message with the reason
# that made this changeset not visible # that made this changeset not visible
if ctx.obsolete(): if ctx.obsolete():
reason = obsutil._getfilteredreason(unfilteredrepo, ctx) msg = obsutil._getfilteredreason(unfilteredrepo, changeid, ctx)
msg = _("hidden revision '%s' %s") % (changeid, reason)
else: else:
msg = _("hidden revision '%s'") % changeid msg = _("hidden revision '%s'") % changeid
hint = _('use --hidden to access hidden revisions') hint = _('use --hidden to access hidden revisions')
return error.FilteredRepoLookupError(msg, hint=hint) return error.FilteredRepoLookupError(msg, hint=hint)
msg = _("filtered revision '%s' (not in '%s' subset)") msg = _("filtered revision '%s' (not in '%s' subset)")
msg %= (changeid, repo.filtername) msg %= (changeid, repo.filtername)

mercurial/obsutil.py

line.append(" (at %s)" % fmtmin_date) line.append(" (at %s)" % fmtmin_date)
else: else:
fmtmin_date = util.datestr(min_date, '%Y-%m-%d %H:%M %1%2') fmtmin_date = util.datestr(min_date, '%Y-%m-%d %H:%M %1%2')
fmtmax_date = util.datestr(max_date, '%Y-%m-%d %H:%M %1%2') fmtmax_date = util.datestr(max_date, '%Y-%m-%d %H:%M %1%2')
line.append(" (between %s and %s)" % (fmtmin_date, fmtmax_date)) line.append(" (between %s and %s)" % (fmtmin_date, fmtmax_date))
return "".join(line) return "".join(line)
def _getfilteredreason(unfilteredrepo, ctx):
filteredmsgtable = {
"pruned": _("hidden revision '%s' is pruned"),
"diverged": _("hidden revision '%s' has diverged"),
"superseded": _("hidden revision '%s' was rewritten as: %s"),
"superseded_split": _("hidden revision '%s' was split as: %s"),
"superseded_split_several": _("hidden revision '%s' was split as: %s and "
"%d more"),
}
def _getfilteredreason(unfilteredrepo, changeid, ctx):
"""return a human-friendly string on why a obsolete changeset is hidden """return a human-friendly string on why a obsolete changeset is hidden
""" """
successors = successorssets(unfilteredrepo, ctx.node()) successors = successorssets(unfilteredrepo, ctx.node())
fate = _getobsfate(successors) fate = _getobsfate(successors)
# Be more precise in case the revision is superseded # Be more precise in case the revision is superseded
if fate == 'pruned': if fate == 'pruned':
reason = _('is pruned') return filteredmsgtable['pruned'] % changeid
elif fate == 'diverged': elif fate == 'diverged':
reason = _('has diverged') return filteredmsgtable['diverged'] % changeid
elif fate == 'superseded': elif fate == 'superseded':
reason = _("was rewritten as: %s") % nodemod.short(successors[0][0]) single_successor = nodemod.short(successors[0][0])
return filteredmsgtable['superseded'] % (changeid, single_successor)
elif fate == 'superseded_split': elif fate == 'superseded_split':
succs = [] succs = []
for node_id in successors[0]: for node_id in successors[0]:
succs.append(nodemod.short(node_id)) succs.append(nodemod.short(node_id))
if len(succs) <= 2: if len(succs) <= 2:
reason = _("was split as: %s") % ", ".join(succs) fmtsuccs = ', '.join(succs)
return filteredmsgtable['superseded_split'] % (changeid, fmtsuccs)
else: else:
firstsuccessors = ", ".join(succs[:2]) firstsuccessors = ', '.join(succs[:2])
remainingnumber = len(succs) - 2 remainingnumber = len(succs) - 2
args = (firstsuccessors, remainingnumber) args = (changeid, firstsuccessors, remainingnumber)
successorsmsg = _("%s and %d more") % args return filteredmsgtable['superseded_split_several'] % args
reason = _("was split as: %s") % successorsmsg
return reason