| durin42 |
| hg-reviewers |
dirstate wrapping in narrow extension converts the manifest object to a list. So
let's assume we get a list of files in sparse extension.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/sparse.py (2 lines) | |||
| M | tests/test-narrow-sparse.t (40 lines) |
| return orig(self, match, subrepos, unknown, ignored, full) | return orig(self, match, subrepos, unknown, ignored, full) | ||||
| extensions.wrapfunction(dirstate.dirstate, 'walk', walk) | extensions.wrapfunction(dirstate.dirstate, 'walk', walk) | ||||
| # dirstate.rebuild should not add non-matching files | # dirstate.rebuild should not add non-matching files | ||||
| def _rebuild(orig, self, parent, allfiles, changedfiles=None): | def _rebuild(orig, self, parent, allfiles, changedfiles=None): | ||||
| matcher = self._sparsematcher | matcher = self._sparsematcher | ||||
| if not matcher.always(): | if not matcher.always(): | ||||
| allfiles = allfiles.matches(matcher) | allfiles = [f for f in allfiles if matcher(f)] | ||||
| if changedfiles: | if changedfiles: | ||||
| changedfiles = [f for f in changedfiles if matcher(f)] | changedfiles = [f for f in changedfiles if matcher(f)] | ||||
| if changedfiles is not None: | if changedfiles is not None: | ||||
| # In _rebuild, these files will be deleted from the dirstate | # In _rebuild, these files will be deleted from the dirstate | ||||
| # when they are not found to be in allfiles | # when they are not found to be in allfiles | ||||
| dirstatefilestoremove = set(f for f in self if not matcher(f)) | dirstatefilestoremove = set(f for f in self if not matcher(f)) | ||||
| changedfiles = dirstatefilestoremove.union(changedfiles) | changedfiles = dirstatefilestoremove.union(changedfiles) | ||||
| generaldelta | generaldelta | ||||
| narrowhg-experimental | narrowhg-experimental | ||||
| revlogv1 | revlogv1 | ||||
| sparserevlog | sparserevlog | ||||
| store | store | ||||
| treemanifest (tree !) | treemanifest (tree !) | ||||
| $ hg debugrebuilddirstate | $ hg debugrebuilddirstate | ||||
| ** unknown exception encountered, please report by visiting | |||||
| ** https://mercurial-scm.org/wiki/BugTracker | |||||
| ** Python 2.7.12 (default, Nov 12 2018, 14:36:49) [GCC 5.4.0 20160609] | |||||
| ** Mercurial Distributed SCM (version 4.8.1+588-479a5ea51ccc+20181224) | |||||
| ** Extensions loaded: narrow, sparse | |||||
| Traceback (most recent call last): | |||||
| File "/place/vartmp/hgtests.zMelCK/install/bin/hg", line 43, in <module> | |||||
| dispatch.run() | |||||
| File "/place/vartmp/hgtests.zMelCK/install/lib/python/mercurial/dispatch.py", line 99, in run | |||||
| status = dispatch(req) | |||||
| File "/place/vartmp/hgtests.zMelCK/install/lib/python/mercurial/dispatch.py", line 225, in dispatch | |||||
| ret = _runcatch(req) or 0 | |||||
| File "/place/vartmp/hgtests.zMelCK/install/lib/python/mercurial/dispatch.py", line 376, in _runcatch | |||||
| return _callcatch(ui, _runcatchfunc) | |||||
| File "/place/vartmp/hgtests.zMelCK/install/lib/python/mercurial/dispatch.py", line 384, in _callcatch | |||||
| return scmutil.callcatch(ui, func) | |||||
| File "/place/vartmp/hgtests.zMelCK/install/lib/python/mercurial/scmutil.py", line 166, in callcatch | |||||
| return func() | |||||
| File "/place/vartmp/hgtests.zMelCK/install/lib/python/mercurial/dispatch.py", line 367, in _runcatchfunc | |||||
| return _dispatch(req) | |||||
| File "/place/vartmp/hgtests.zMelCK/install/lib/python/mercurial/dispatch.py", line 1021, in _dispatch | |||||
| cmdpats, cmdoptions) | |||||
| File "/place/vartmp/hgtests.zMelCK/install/lib/python/mercurial/dispatch.py", line 756, in runcommand | |||||
| ret = _runcommand(ui, options, cmd, d) | |||||
| File "/place/vartmp/hgtests.zMelCK/install/lib/python/mercurial/dispatch.py", line 1030, in _runcommand | |||||
| return cmdfunc() | |||||
| File "/place/vartmp/hgtests.zMelCK/install/lib/python/mercurial/dispatch.py", line 1018, in <lambda> | |||||
| d = lambda: util.checksignature(func)(ui, *args, **strcmdopt) | |||||
| File "/place/vartmp/hgtests.zMelCK/install/lib/python/mercurial/util.py", line 1670, in check | |||||
| return func(*args, **kwargs) | |||||
| File "/place/vartmp/hgtests.zMelCK/install/lib/python/mercurial/debugcommands.py", line 1998, in debugrebuilddirstate | |||||
| dirstate.rebuild(ctx.node(), ctx.manifest(), changedfiles) | |||||
| File "/place/vartmp/hgtests.zMelCK/install/lib/python/hgext/narrow/narrowdirstate.py", line 60, in rebuild | |||||
| super(narrowdirstate, self).rebuild(parent, allfiles, changedfiles) | |||||
| File "/place/vartmp/hgtests.zMelCK/install/lib/python/mercurial/extensions.py", line 437, in closure | |||||
| return func(*(args + a), **kw) | |||||
| File "/place/vartmp/hgtests.zMelCK/install/lib/python/hgext/sparse.py", line 213, in _rebuild | |||||
| allfiles = allfiles.matches(matcher) | |||||
| AttributeError: 'list' object has no attribute 'matches' | |||||
| [1] | |||||