Mercurial > hg
comparison mercurial/changegroup.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 | aad4b46e89bb |
children | 73cf21b2e8a6 |
comparison
equal
deleted
inserted
replaced
39242:1347bcf52d51 | 39243:0d97530eb535 |
---|---|
1066 | 1066 |
1067 while tmfnodes: | 1067 while tmfnodes: |
1068 tree, nodes = tmfnodes.popitem() | 1068 tree, nodes = tmfnodes.popitem() |
1069 store = dirlog(tree) | 1069 store = dirlog(tree) |
1070 | 1070 |
1071 if not self._filematcher.visitdir(store._dir[:-1] or '.'): | 1071 if not self._filematcher.visitdir(store._tree[:-1] or '.'): |
1072 prunednodes = [] | 1072 prunednodes = [] |
1073 else: | 1073 else: |
1074 frev, flr = store.rev, store.linkrev | 1074 frev, flr = store.rev, store.linkrev |
1075 prunednodes = [n for n in nodes | 1075 prunednodes = [n for n in nodes |
1076 if flr(frev(n)) not in commonrevs] | 1076 if flr(frev(n)) not in commonrevs] |