Patchwork D2492: narrow: reduce depedence on narrowspec.save()

login
register
mail settings
Submitter phabricator
Date Feb. 28, 2018, 8:57 p.m.
Message ID <differential-rev-PHID-DREV-bdx656h6pgjywiebm6hj-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/28492/
State Superseded
Headers show

Comments

phabricator - Feb. 28, 2018, 8:57 p.m.
martinvonz created this revision.
Herald added a reviewer: durin42.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  I think narrowspec should be a simple, low-level module and not depend
  on the hg module. This prepares for moving that dependency out of
  narrowspec.

REPOSITORY
  rHG Mercurial

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

AFFECTED FILES
  hgext/narrow/narrowbundle2.py
  hgext/narrow/narrowcommands.py

CHANGE DETAILS




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

Patch

diff --git a/hgext/narrow/narrowcommands.py b/hgext/narrow/narrowcommands.py
--- a/hgext/narrow/narrowcommands.py
+++ b/hgext/narrow/narrowcommands.py
@@ -88,7 +88,7 @@ 
                 # everything, except what they asked to exclude.
                 includepats = {'path:.'}
 
-            narrowspec.save(pullop.repo, includepats, excludepats)
+            pullop.repo.setnarrowpats(includepats, excludepats)
 
             # This will populate 'includepats' etc with the values from the
             # narrowspec we just saved.
diff --git a/hgext/narrow/narrowbundle2.py b/hgext/narrow/narrowbundle2.py
--- a/hgext/narrow/narrowbundle2.py
+++ b/hgext/narrow/narrowbundle2.py
@@ -361,11 +361,10 @@ 
 def _handlechangespec_2(op, inpart):
     includepats = set(inpart.params.get(_SPECPART_INCLUDE, '').splitlines())
     excludepats = set(inpart.params.get(_SPECPART_EXCLUDE, '').splitlines())
-    narrowspec.save(op.repo, includepats, excludepats)
     if not changegroup.NARROW_REQUIREMENT in op.repo.requirements:
         op.repo.requirements.add(changegroup.NARROW_REQUIREMENT)
         op.repo._writerequirements()
-    op.repo.invalidate(clearfilecache=True)
+    op.repo.setnarrowpats(includepats, excludepats)
 
 @bundle2.parthandler(_CHANGESPECPART)
 def _handlechangespec(op, inpart):