Mercurial > hg
changeset 37270:6ff8bd691fb8
narrow: add trailing slash to dir earlier for debug{revlog,index,data}
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.
Differential Revision: https://phab.mercurial-scm.org/D3032
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Mon, 02 Apr 2018 23:52:43 -0700 |
| parents | 14cd5290c4e6 |
| children | 0194dac77c93 |
| files | hgext/narrow/narrowrevlog.py mercurial/cmdutil.py mercurial/manifest.py |
| diffstat | 3 files changed, 2 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/narrow/narrowrevlog.py Sat Mar 31 23:49:58 2018 +0530 +++ b/hgext/narrow/narrowrevlog.py Mon Apr 02 23:52:43 2018 -0700 @@ -117,8 +117,6 @@ # at least some push operations. This will be used to wrap/exclude the # child directories when using treemanifests. def dirlog(self, d): - if d and not d.endswith('/'): - d = d + '/' if not repo.narrowmatch().visitdir(d[:-1] or '.'): return excludedmanifestrevlog(d) result = super(narrowmanifestrevlog, self).dirlog(d)
--- a/mercurial/cmdutil.py Sat Mar 31 23:49:58 2018 +0530 +++ b/mercurial/cmdutil.py Mon Apr 02 23:52:43 2018 -0700 @@ -1058,6 +1058,8 @@ if 'treemanifest' not in repo.requirements: raise error.Abort(_("--dir can only be used on repos with " "treemanifest enabled")) + if not dir.endswith('/'): + dir = dir + '/' dirlog = repo.manifestlog._revlog.dirlog(dir) if len(dirlog): r = dirlog