This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2233

narrow: only diff manifest part within narrowspec when generating changegroup
ClosedPublic

Authored by martinvonz on Feb 13 2018, 5:42 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHGc407ccd06abd: narrow: only diff manifest part within narrowspec when generating changegroup
Summary

Since 959ebff3505a (manifest: add match argument to diff and
filesnotin, 2017-03-07), we have a more efficient way of diffing
manifests while applying a matcher. Let's use that while generating
narrowed changegroups, so we avoid diffing parts of the manifest that
don't match the narrowspec.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Feb 13 2018, 5:42 PM
durin42 accepted this revision.Feb 14 2018, 8:32 PM
This revision is now accepted and ready to land.Feb 14 2018, 8:32 PM
Closed by commit rHGc407ccd06abd: narrow: only diff manifest part within narrowspec when generating changegroup (authored by martinvonz). · Explain WhyFeb 14 2018, 9:04 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/narrow/narrowbundle2.py (4 lines)

Diff 5655

hgext/narrow/narrowbundle2.py

shallow_enough = depth is None or revdepth[rev] <= depth shallow_enough = depth is None or revdepth[rev] <= depth
if shallow_enough: if shallow_enough:
curmf = mfl[clrev.manifest].read() curmf = mfl[clrev.manifest].read()
if ps: if ps:
# We choose to not trust the changed files list in # We choose to not trust the changed files list in
# changesets because it's not always correct. TODO: could # changesets because it's not always correct. TODO: could
# we trust it for the non-merge case? # we trust it for the non-merge case?
p1mf = mfl[cl.changelogrevision(ps[0]).manifest].read() p1mf = mfl[cl.changelogrevision(ps[0]).manifest].read()
needed = any(match(f) for f in curmf.diff(p1mf).iterkeys()) needed = bool(curmf.diff(p1mf, match))
if not needed and len(ps) > 1: if not needed and len(ps) > 1:
# For merge changes, the list of changed files is not # For merge changes, the list of changed files is not
# helpful, since we need to emit the merge if a file # helpful, since we need to emit the merge if a file
# in the narrow spec has changed on either side of the # in the narrow spec has changed on either side of the
# merge. As a result, we do a manifest diff to check. # merge. As a result, we do a manifest diff to check.
p2mf = mfl[cl.changelogrevision(ps[1]).manifest].read() p2mf = mfl[cl.changelogrevision(ps[1]).manifest].read()
needed = any(match(f) for f in curmf.diff(p2mf).iterkeys()) needed = bool(curmf.diff(p2mf, match))
else: else:
# For a root node, we need to include the node if any # For a root node, we need to include the node if any
# files in the node match the narrowspec. # files in the node match the narrowspec.
needed = any(match(f) for f in curmf) needed = any(match(f) for f in curmf)
if needed: if needed:
for head in ellipsisheads[rev]: for head in ellipsisheads[rev]:
addroot(head, rev) addroot(head, rev)