Mercurial > hg
comparison mercurial/upgrade.py @ 39243: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 |
comparison
equal
deleted
inserted
replaced
39242:1347bcf52d51 | 39243:0d97530eb535 |
---|---|
448 """ | 448 """ |
449 if path == '00changelog.i': | 449 if path == '00changelog.i': |
450 return changelog.changelog(repo.svfs) | 450 return changelog.changelog(repo.svfs) |
451 elif path.endswith('00manifest.i'): | 451 elif path.endswith('00manifest.i'): |
452 mandir = path[:-len('00manifest.i')] | 452 mandir = path[:-len('00manifest.i')] |
453 return manifest.manifestrevlog(repo.svfs, dir=mandir) | 453 return manifest.manifestrevlog(repo.svfs, tree=mandir) |
454 else: | 454 else: |
455 #reverse of "/".join(("data", path + ".i")) | 455 #reverse of "/".join(("data", path + ".i")) |
456 return filelog.filelog(repo.svfs, path[5:-2]) | 456 return filelog.filelog(repo.svfs, path[5:-2]) |
457 | 457 |
458 def _copyrevlogs(ui, srcrepo, dstrepo, tr, deltareuse, deltabothparents): | 458 def _copyrevlogs(ui, srcrepo, dstrepo, tr, deltareuse, deltabothparents): |