This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3032

narrow: add trailing slash to dir earlier for debug{revlog,index,data}
ClosedPublic

Authored by martinvonz on Apr 3 2018, 3:11 AM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG6ff8bd691fb8: narrow: add trailing slash to dir earlier for debug{revlog,index,data}
Summary

The treemanifest code internally uses trailing slashes on directories
(except for the root directory, which is an empty string). We should
make sure we pass in directories with trailing slashes when we work
with the treemanifest code. For some reason, I seem to have decided to
be nice to the callers instead in 49c583ca48c4 (treemanifest: add
--dir option to debug{revlog,data,index}, 2015-04-12). Let's fix that
and pay the cost of fixing up the directory name close close to where
we get it from the user.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Apr 3 2018, 3:11 AM
Closed by commit rHG6ff8bd691fb8: narrow: add trailing slash to dir earlier for debug{revlog,index,data} (authored by martinvonz). · Explain WhyApr 3 2018, 8:48 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 7533

hgext/narrow/narrowrevlog.py

if util.safehasattr(mfrevlog, '_narrowed'): if util.safehasattr(mfrevlog, '_narrowed'):
return return
class narrowmanifestrevlog(mfrevlog.__class__): class narrowmanifestrevlog(mfrevlog.__class__):
# This function is called via debug{revlog,index,data}, but also during # This function is called via debug{revlog,index,data}, but also during
# at least some push operations. This will be used to wrap/exclude the # at least some push operations. This will be used to wrap/exclude the
# child directories when using treemanifests. # child directories when using treemanifests.
def dirlog(self, d): def dirlog(self, d):
if d and not d.endswith('/'):
d = d + '/'
if not repo.narrowmatch().visitdir(d[:-1] or '.'): if not repo.narrowmatch().visitdir(d[:-1] or '.'):
return excludedmanifestrevlog(d) return excludedmanifestrevlog(d)
result = super(narrowmanifestrevlog, self).dirlog(d) result = super(narrowmanifestrevlog, self).dirlog(d)
makenarrowmanifestrevlog(result, repo) makenarrowmanifestrevlog(result, repo)
return result return result
mfrevlog.__class__ = narrowmanifestrevlog mfrevlog.__class__ = narrowmanifestrevlog
mfrevlog._narrowed = True mfrevlog._narrowed = True

mercurial/cmdutil.py

r = None r = None
if repo: if repo:
if cl: if cl:
r = repo.unfiltered().changelog r = repo.unfiltered().changelog
elif dir: elif dir:
if 'treemanifest' not in repo.requirements: if 'treemanifest' not in repo.requirements:
raise error.Abort(_("--dir can only be used on repos with " raise error.Abort(_("--dir can only be used on repos with "
"treemanifest enabled")) "treemanifest enabled"))
if not dir.endswith('/'):
dir = dir + '/'
dirlog = repo.manifestlog._revlog.dirlog(dir) dirlog = repo.manifestlog._revlog.dirlog(dir)
if len(dirlog): if len(dirlog):
r = dirlog r = dirlog
elif mf: elif mf:
r = repo.manifestlog._revlog r = repo.manifestlog._revlog
elif file_: elif file_:
filelog = repo.file(file_) filelog = repo.file(file_)
if len(filelog): if len(filelog):

mercurial/manifest.py

optiontreemanifest = opts.get('treemanifest', False) optiontreemanifest = opts.get('treemanifest', False)
self._treeondisk = optiontreemanifest or treemanifest self._treeondisk = optiontreemanifest or treemanifest
self._fulltextcache = util.lrucachedict(cachesize) self._fulltextcache = util.lrucachedict(cachesize)
if dir: if dir:
assert self._treeondisk, 'opts is %r' % opts assert self._treeondisk, 'opts is %r' % opts
if not dir.endswith('/'):
dir = dir + '/'
if indexfile is None: if indexfile is None:
indexfile = '00manifest.i' indexfile = '00manifest.i'
if dir: if dir:
indexfile = "meta/" + dir + indexfile indexfile = "meta/" + dir + indexfile
self._dir = dir self._dir = dir
# The dirlogcache is kept on the root manifest log # The dirlogcache is kept on the root manifest log