This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1853

visiblity: pass a normal repo to _getfilteredreason
ClosedPublic

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

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHG22c42bfbe7ab: visibility: pass a normal repo to _getfilteredreason
rHGea9bd35529f2: visiblity: pass a normal repo to _getfilteredreason
Summary

There is no reason to pass an unfiltered-repo to _getfilteredreason and
successorssets, so use a normal repo instead.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

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
Closed by commit rHGea9bd35529f2: visiblity: pass a normal repo to _getfilteredreason (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 (2 lines)
Mmercurial/obsutil.py (4 lines)

Diff 4802

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():
msg = obsutil._getfilteredreason(unfilteredrepo, changeid, ctx) msg = obsutil._getfilteredreason(repo, changeid, ctx)
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

"pruned": _("hidden revision '%s' is pruned"), "pruned": _("hidden revision '%s' is pruned"),
"diverged": _("hidden revision '%s' has diverged"), "diverged": _("hidden revision '%s' has diverged"),
"superseded": _("hidden revision '%s' was rewritten as: %s"), "superseded": _("hidden revision '%s' was rewritten as: %s"),
"superseded_split": _("hidden revision '%s' was split as: %s"), "superseded_split": _("hidden revision '%s' was split as: %s"),
"superseded_split_several": _("hidden revision '%s' was split as: %s and " "superseded_split_several": _("hidden revision '%s' was split as: %s and "
"%d more"), "%d more"),
} }
def _getfilteredreason(unfilteredrepo, changeid, ctx): def _getfilteredreason(repo, 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(repo, 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':
return filteredmsgtable['pruned'] % changeid return filteredmsgtable['pruned'] % changeid
elif fate == 'diverged': elif fate == 'diverged':
return filteredmsgtable['diverged'] % changeid return filteredmsgtable['diverged'] % changeid
elif fate == 'superseded': elif fate == 'superseded':