Mercurial > public > mercurial-scm > hg-stable
diff mercurial/upgrade.py @ 39271:0d97530eb535
manifest: rename dir argument and attribute to tree
dir shadows a built-in. We use it throughout the manifest code, which
is unfortunate.
This commit updates just manifestrevlog to be more well behaved.
.. api:: renamed manifest.manifestrevlog.__init__ dir argument to tree
Differential Revision: https://phab.mercurial-scm.org/D4276
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Fri, 10 Aug 2018 14:44:50 -0700 |
| parents | 93777d16a25d |
| children | 41aa5dced975 |
line wrap: on
line diff
--- a/mercurial/upgrade.py Fri Aug 10 14:40:02 2018 -0700 +++ b/mercurial/upgrade.py Fri Aug 10 14:44:50 2018 -0700 @@ -450,7 +450,7 @@ return changelog.changelog(repo.svfs) elif path.endswith('00manifest.i'): mandir = path[:-len('00manifest.i')] - return manifest.manifestrevlog(repo.svfs, dir=mandir) + return manifest.manifestrevlog(repo.svfs, tree=mandir) else: #reverse of "/".join(("data", path + ".i")) return filelog.filelog(repo.svfs, path[5:-2])