This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4898

narrow: only walk files within narrowspec also for committed revisions
ClosedPublic

Authored by martinvonz on Oct 5 2018, 6:35 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG2cf18f46a1ce: narrow: only walk files within narrowspec also for committed revisions
Summary

Narrow has been walking only paths matching the narrowspec when
walking the working copy. We have not done the same filtering when
walking committed revisions (e.g. "hg files -r "), which seems a
little odd. Let's make it consistent.

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.

Revision Contents
Changeset List

PathPackages
Mmercurial/context.py (4 lines)
Mtests/test-narrow-commit.t (2 lines)

Diff 11736

mercurial/context.py

def bad(fn, msg): def bad(fn, msg):
# The manifest doesn't know about subrepos, so don't complain about # The manifest doesn't know about subrepos, so don't complain about
# paths into valid subrepos. # paths into valid subrepos.
if any(fn == s or fn.startswith(s + '/') if any(fn == s or fn.startswith(s + '/')
for s in self.substate): for s in self.substate):
return return
match.bad(fn, _('no such file in rev %s') % self) match.bad(fn, _('no such file in rev %s') % self)
m = matchmod.badmatch(match, bad) m = matchmod.badmatch(self._repo.narrowmatch(match), bad)
return self._manifest.walk(m) return self._manifest.walk(m)
def matches(self, match): def matches(self, match):
return self.walk(match) return self.walk(match)
class basefilectx(object): class basefilectx(object):
"""A filecontext object represents the common logic for its children: """A filecontext object represents the common logic for its children:
filectx: read-only access to a filerevision that is already present filectx: read-only access to a filerevision that is already present
return '' return ''
def ancestor(self, c2): def ancestor(self, c2):
"""return the "best" ancestor context of self and c2""" """return the "best" ancestor context of self and c2"""
return self._parents[0].ancestor(c2) # punt on two parents for now return self._parents[0].ancestor(c2) # punt on two parents for now
def walk(self, match): def walk(self, match):
'''Generates matching file names.''' '''Generates matching file names.'''
return sorted(self._repo.dirstate.walk(match, return sorted(self._repo.dirstate.walk(self._repo.narrowmatch(match),
subrepos=sorted(self.substate), subrepos=sorted(self.substate),
unknown=True, ignored=False)) unknown=True, ignored=False))
def matches(self, match): def matches(self, match):
ds = self._repo.dirstate ds = self._repo.dirstate
return sorted(f for f in ds.matches(match) if ds[f] != 'r') return sorted(f for f in ds.matches(match) if ds[f] != 'r')
def ancestors(self): def ancestors(self):

tests/test-narrow-commit.t

$ hg manifest --debug $ hg manifest --debug
4d6a634d5ba06331a60c29ee0db8412490a54fcd 644 inside/f1 4d6a634d5ba06331a60c29ee0db8412490a54fcd 644 inside/f1
7fb3bb6356d28d4dc352c5ba52d7350a81b6bd46 644 outside/f1 (flat !) 7fb3bb6356d28d4dc352c5ba52d7350a81b6bd46 644 outside/f1 (flat !)
d0f2f706468ab0e8bec7af87446835fb1b13511b 755 d outside/ (tree !) d0f2f706468ab0e8bec7af87446835fb1b13511b 755 d outside/ (tree !)
$ hg commit -m 'modify inside/f1' $ hg commit -m 'modify inside/f1'
created new head created new head
$ hg files -r . $ hg files -r .
inside/f1 inside/f1
outside/f1 (flat !)
outside/ (tree !)
$ hg manifest --debug $ hg manifest --debug
3f4197b4a11b9016e77ebc47fe566944885fd11b 644 inside/f1 3f4197b4a11b9016e77ebc47fe566944885fd11b 644 inside/f1
7fb3bb6356d28d4dc352c5ba52d7350a81b6bd46 644 outside/f1 (flat !) 7fb3bb6356d28d4dc352c5ba52d7350a81b6bd46 644 outside/f1 (flat !)
d0f2f706468ab0e8bec7af87446835fb1b13511b 755 d outside/ (tree !) d0f2f706468ab0e8bec7af87446835fb1b13511b 755 d outside/ (tree !)
Some filesystems (notably FAT/exFAT only store timestamps with 2 Some filesystems (notably FAT/exFAT only store timestamps with 2
seconds of precision, so by sleeping for 3 seconds, we can ensure that seconds of precision, so by sleeping for 3 seconds, we can ensure that
the timestamps of files stored by dirstate will appear older than the the timestamps of files stored by dirstate will appear older than the
dirstate file, and therefore we'll be able to get stable output from dirstate file, and therefore we'll be able to get stable output from
debugdirstate. If we don't do this, the test can be slightly flaky. debugdirstate. If we don't do this, the test can be slightly flaky.
$ sleep 3 $ sleep 3
$ hg status $ hg status
$ hg debugdirstate --no-dates $ hg debugdirstate --no-dates
n 644 10 set inside/f1 n 644 10 set inside/f1