##// END OF EJS Templates
changegroup: rename _fullnodes to _fullclnodes...
Gregory Szorc -
r39032:5baafb8f default
parent child Browse files
Show More
@@ -620,9 +620,10 b' class cgpacker(object):'
620 shallow indicates whether shallow data might be sent. The packer may
620 shallow indicates whether shallow data might be sent. The packer may
621 need to pack file contents not introduced by the changes being packed.
621 need to pack file contents not introduced by the changes being packed.
622
622
623 fullnodes is the list of nodes which should not be ellipsis nodes. We
623 fullnodes is the set of changelog nodes which should not be ellipsis
624 store this rather than the set of nodes that should be ellipsis because
624 nodes. We store this rather than the set of nodes that should be
625 for very large histories we expect this to be significantly smaller.
625 ellipsis because for very large histories we expect this to be
626 significantly smaller.
626 """
627 """
627 assert filematcher
628 assert filematcher
628 self._filematcher = filematcher
629 self._filematcher = filematcher
@@ -638,7 +639,7 b' class cgpacker(object):'
638 bundlecaps = set()
639 bundlecaps = set()
639 self._bundlecaps = bundlecaps
640 self._bundlecaps = bundlecaps
640 self._isshallow = shallow
641 self._isshallow = shallow
641 self._fullnodes = fullnodes
642 self._fullclnodes = fullnodes
642
643
643 # Maps ellipsis revs to their roots at the changelog level.
644 # Maps ellipsis revs to their roots at the changelog level.
644 self._precomputedellipsis = ellipsisroots
645 self._precomputedellipsis = ellipsisroots
@@ -715,7 +716,7 b' class cgpacker(object):'
715
716
716 # This is a node to send in full, because the changeset it
717 # This is a node to send in full, because the changeset it
717 # corresponds to was a full changeset.
718 # corresponds to was a full changeset.
718 if linknode in self._fullnodes:
719 if linknode in self._fullclnodes:
719 delta = _revisiondeltanormal(store, curr, prev, linknode,
720 delta = _revisiondeltanormal(store, curr, prev, linknode,
720 self._deltaparentfn)
721 self._deltaparentfn)
721 elif linkrev not in self._precomputedellipsis:
722 elif linkrev not in self._precomputedellipsis:
@@ -869,7 +870,7 b' class cgpacker(object):'
869 # end up with bogus linkrevs specified for manifests and
870 # end up with bogus linkrevs specified for manifests and
870 # we skip some manifest nodes that we should otherwise
871 # we skip some manifest nodes that we should otherwise
871 # have sent.
872 # have sent.
872 if (x in self._fullnodes
873 if (x in self._fullclnodes
873 or cl.rev(x) in self._precomputedellipsis):
874 or cl.rev(x) in self._precomputedellipsis):
874 n = c[0]
875 n = c[0]
875 # Record the first changeset introducing this manifest
876 # Record the first changeset introducing this manifest
@@ -1099,7 +1100,7 b' class cgpacker(object):'
1099 walk = walk[1:]
1100 walk = walk[1:]
1100 if p in self._clrevtolocalrev:
1101 if p in self._clrevtolocalrev:
1101 return self._clrevtolocalrev[p]
1102 return self._clrevtolocalrev[p]
1102 elif p in self._fullnodes:
1103 elif p in self._fullclnodes:
1103 walk.extend([pp for pp in self._repo.changelog.parentrevs(p)
1104 walk.extend([pp for pp in self._repo.changelog.parentrevs(p)
1104 if pp != nullrev])
1105 if pp != nullrev])
1105 elif p in self._precomputedellipsis:
1106 elif p in self._precomputedellipsis:
General Comments 0
You need to be logged in to leave comments. Login now