This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5479

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

Authored by pulkit on Dec 24 2018, 8:18 AM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG8eaf693b1409: sparse: don't enable on clone if it was a narrow clone
Summary

When both sparse and narrow extensions are enabled and we do a narrow clone,
sparse enables itself because it reads --include flag and thinks that user is
trying to do a sparse clone.

This patch changes that behavior, and now if both extensions are enabled and
user passes --narrow, then the includes and excludes won't be considered as
part of sparse profile.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

pulkit created this revision.Dec 24 2018, 8:18 AM
Closed by commit rHG8eaf693b1409: sparse: don't enable on clone if it was a narrow clone (authored by pulkit). · Explain WhyJan 9 2019, 2:47 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/sparse.py (5 lines)
Mtests/test-narrow-sparse.t (8 lines)

Diff 13101

hgext/sparse.py

revs = revs.filter(ctxmatch) revs = revs.filter(ctxmatch)
return revs return revs
extensions.wrapfunction(logcmdutil, '_initialrevs', _initialrevs) extensions.wrapfunction(logcmdutil, '_initialrevs', _initialrevs)
def _clonesparsecmd(orig, ui, repo, *args, **opts): def _clonesparsecmd(orig, ui, repo, *args, **opts):
include_pat = opts.get(r'include') include_pat = opts.get(r'include')
exclude_pat = opts.get(r'exclude') exclude_pat = opts.get(r'exclude')
enableprofile_pat = opts.get(r'enable_profile') enableprofile_pat = opts.get(r'enable_profile')
narrow_pat = opts.get(r'narrow')
include = exclude = enableprofile = False include = exclude = enableprofile = False
if include_pat: if include_pat:
pat = include_pat pat = include_pat
include = True include = True
if exclude_pat: if exclude_pat:
pat = exclude_pat pat = exclude_pat
exclude = True exclude = True
if enableprofile_pat: if enableprofile_pat:
pat = enableprofile_pat pat = enableprofile_pat
enableprofile = True enableprofile = True
if sum([include, exclude, enableprofile]) > 1: if sum([include, exclude, enableprofile]) > 1:
raise error.Abort(_("too many flags specified.")) 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): def clonesparse(orig, self, node, overwrite, *args, **kwargs):
sparse.updateconfig(self.unfiltered(), pat, {}, include=include, sparse.updateconfig(self.unfiltered(), pat, {}, include=include,
exclude=exclude, enableprofile=enableprofile, exclude=exclude, enableprofile=enableprofile,
usereporootpaths=True) usereporootpaths=True)
return orig(self, node, overwrite, *args, **kwargs) return orig(self, node, overwrite, *args, **kwargs)
extensions.wrapfunction(hg, 'updaterepo', clonesparse) extensions.wrapfunction(hg, 'updaterepo', clonesparse)
return orig(ui, repo, *args, **opts) return orig(ui, repo, *args, **opts)

tests/test-narrow-sparse.t

updating to branch default updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd narrow $ cd narrow
$ hg tracked $ hg tracked
I path:inside/f I path:inside/f
$ hg files $ hg files
inside/f inside/f
XXX: we should not have sparse enabled XXX: we should have a flag in `hg debugsparse` to list the sparse profile
$ cat .hg/sparse $ test -f .hg/sparse
[include] [1]
inside/f
$ cat .hg/requires $ cat .hg/requires
dotencode dotencode
exp-sparse
fncache fncache
generaldelta generaldelta
narrowhg-experimental narrowhg-experimental
revlogv1 revlogv1
sparserevlog sparserevlog
store store
treemanifest (tree !) treemanifest (tree !)