Patchwork D2233: narrow: only diff manifest part within narrowspec when generating changegroup

login
register
mail settings
Submitter phabricator
Date Feb. 13, 2018, 10:42 p.m.
Message ID <differential-rev-PHID-DREV-dlhmkvcejdscmk32pzq3-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/27849/
State Superseded
Headers show

Comments

phabricator - Feb. 13, 2018, 10:42 p.m.
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  Since https://phab.mercurial-scm.org/rHG959ebff3505a3e4c996b62b58659c286b7feb9a8 (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.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D2233

AFFECTED FILES
  hgext/narrow/narrowbundle2.py

CHANGE DETAILS




To: martinvonz, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/hgext/narrow/narrowbundle2.py b/hgext/narrow/narrowbundle2.py
--- a/hgext/narrow/narrowbundle2.py
+++ b/hgext/narrow/narrowbundle2.py
@@ -141,14 +141,14 @@ 
                 # changesets because it's not always correct. TODO: could
                 # we trust it for the non-merge case?
                 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:
                     # For merge changes, the list of changed files is not
                     # helpful, since we need to emit the merge if a file
                     # in the narrow spec has changed on either side of the
                     # merge. As a result, we do a manifest diff to check.
                     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:
                 # For a root node, we need to include the node if any
                 # files in the node match the narrowspec.