Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/manifest.py @ 37272: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 | 0147a4730420 |
| children | 1b2fa531fd7a |
comparison
equal
deleted
inserted
replaced
| 37271:14cd5290c4e6 | 37272:6ff8bd691fb8 |
|---|---|
| 1158 | 1158 |
| 1159 self._fulltextcache = util.lrucachedict(cachesize) | 1159 self._fulltextcache = util.lrucachedict(cachesize) |
| 1160 | 1160 |
| 1161 if dir: | 1161 if dir: |
| 1162 assert self._treeondisk, 'opts is %r' % opts | 1162 assert self._treeondisk, 'opts is %r' % opts |
| 1163 if not dir.endswith('/'): | |
| 1164 dir = dir + '/' | |
| 1165 | 1163 |
| 1166 if indexfile is None: | 1164 if indexfile is None: |
| 1167 indexfile = '00manifest.i' | 1165 indexfile = '00manifest.i' |
| 1168 if dir: | 1166 if dir: |
| 1169 indexfile = "meta/" + dir + indexfile | 1167 indexfile = "meta/" + dir + indexfile |