( )⚙ D7501 changectx: use unfiltered changelog to walk ancestors in annotate

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7501

changectx: use unfiltered changelog to walk ancestors in annotate
ClosedPublic

Authored by marmoute on Nov 22 2019, 4:22 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGc472970339d2: changectx: use unfiltered changelog to walk ancestors in annotate
Summary

Since we are only walking ancestors, it is safe to use an unfiltered repository.
(Because if the original rev is not filtered, none of its ancestors will be).

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Revision Contents
Changeset List

Diff 18366

mercurial/context.py

if not '_filelog' in p.__dict__: if not '_filelog' in p.__dict__:
p._filelog = getlog(p.path()) p._filelog = getlog(p.path())
return pl return pl
# use linkrev to find the first changeset where self appeared # use linkrev to find the first changeset where self appeared
base = self.introfilectx() base = self.introfilectx()
if getattr(base, '_ancestrycontext', None) is None: if getattr(base, '_ancestrycontext', None) is None:
cl = self._repo.changelog # it is safe to use an unfiltered repository here because we are
# walking ancestors only.
cl = self._repo.unfiltered().changelog
if base.rev() is None: if base.rev() is None:
# wctx is not inclusive, but works because _ancestrycontext # wctx is not inclusive, but works because _ancestrycontext
# is used to test filelog revisions # is used to test filelog revisions
ac = cl.ancestors( ac = cl.ancestors(
[p.rev() for p in base.parents()], inclusive=True [p.rev() for p in base.parents()], inclusive=True
) )
else: else:
ac = cl.ancestors([base.rev()], inclusive=True) ac = cl.ancestors([base.rev()], inclusive=True)

tests/test-repo-filters-tiptoe.t

in a in a
+file +file
using annotate using annotate
- file with a single change - file with a single change
$ hg annotate a $ hg annotate a
debug.filters: computing revision filter for "visible"
0: a 0: a
- file with multiple change - file with multiple change
$ hg annotate z $ hg annotate z
debug.filters: computing revision filter for "visible"
0: some line 0: some line
1: in a 1: in a
2: file 2: file