Patchwork D5479: sparse: don't enable on clone if it was a narrow clone

login
register
mail settings
Submitter phabricator
Date Jan. 9, 2019, 7:48 p.m.
Message ID <bafc0ee3091177e88220ba27cbf9b533@localhost.localdomain>
Download mbox | patch
Permalink /patch/37582/
State Not Applicable
Headers show

Comments

phabricator - Jan. 9, 2019, 7:48 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG8eaf693b1409: sparse: don&#039;t enable on clone if it was a narrow clone (authored by pulkit, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D5479?vs=12973&id=13101

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

AFFECTED FILES
  hgext/sparse.py
  tests/test-narrow-sparse.t

CHANGE DETAILS




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

Patch

diff --git a/tests/test-narrow-sparse.t b/tests/test-narrow-sparse.t
--- a/tests/test-narrow-sparse.t
+++ b/tests/test-narrow-sparse.t
@@ -52,14 +52,12 @@ 
   $ hg files
   inside/f
 
-XXX: we should not have sparse enabled
-  $ cat .hg/sparse
-  [include]
-  inside/f
+XXX: we should have a flag in `hg debugsparse` to list the sparse profile
+  $ test -f .hg/sparse
+  [1]
 
   $ cat .hg/requires
   dotencode
-  exp-sparse
   fncache
   generaldelta
   narrowhg-experimental
diff --git a/hgext/sparse.py b/hgext/sparse.py
--- a/hgext/sparse.py
+++ b/hgext/sparse.py
@@ -141,6 +141,7 @@ 
     include_pat = opts.get(r'include')
     exclude_pat = opts.get(r'exclude')
     enableprofile_pat = opts.get(r'enable_profile')
+    narrow_pat = opts.get(r'narrow')
     include = exclude = enableprofile = False
     if include_pat:
         pat = include_pat
@@ -153,7 +154,9 @@ 
         enableprofile = True
     if sum([include, exclude, enableprofile]) > 1:
         raise error.Abort(_("too many flags specified."))
-    if include or exclude or enableprofile:
+    # if --narrow is passed, it means they are includes and excludes for narrow
+    # clone
+    if not narrow_pat and (include or exclude or enableprofile):
         def clonesparse(orig, self, node, overwrite, *args, **kwargs):
             sparse.updateconfig(self.unfiltered(), pat, {}, include=include,
                                 exclude=exclude, enableprofile=enableprofile,