##// END OF EJS Templates
changegroup: remove one special case from lookupmflinknode...
Augie Fackler -
r27239:65c47779 default
parent child Browse files
Show More
@@ -656,21 +656,23 b' class cg1packer(object):'
656 # Callback for the manifest, used to collect linkrevs for filelog
656 # Callback for the manifest, used to collect linkrevs for filelog
657 # revisions.
657 # revisions.
658 # Returns the linkrev node (collected in lookupcl).
658 # Returns the linkrev node (collected in lookupcl).
659 def lookupmflinknode(x):
659 if fastpathlinkrev:
660 """Callback for looking up the linknode for manifests.
660 lookupmflinknode = mfs.__getitem__
661 else:
662 def lookupmflinknode(x):
663 """Callback for looking up the linknode for manifests.
661
664
662 Returns the linkrev node for the specified manifest.
665 Returns the linkrev node for the specified manifest.
663
664 SIDE EFFECT:
665
666
666 fclnodes gets populated with the list of relevant
667 SIDE EFFECT:
667 file nodes if we're not using fastpathlinkrev.
668
669 fclnodes gets populated with the list of relevant
670 file nodes.
668
671
669 Note that this means you can't trust fclnodes until
672 Note that this means you can't trust fclnodes until
670 after manifests have been sent to the client.
673 after manifests have been sent to the client.
671 """
674 """
672 clnode = mfs[x]
675 clnode = mfs[x]
673 if not fastpathlinkrev:
674 mdata = ml.readfast(x)
676 mdata = ml.readfast(x)
675 for f in mfchangedfiles[x]:
677 for f in mfchangedfiles[x]:
676 try:
678 try:
@@ -683,7 +685,7 b' class cg1packer(object):'
683 fclnode = fclnodes.setdefault(n, clnode)
685 fclnode = fclnodes.setdefault(n, clnode)
684 if clrevorder[clnode] < clrevorder[fclnode]:
686 if clrevorder[clnode] < clrevorder[fclnode]:
685 fclnodes[n] = clnode
687 fclnodes[n] = clnode
686 return clnode
688 return clnode
687
689
688 mfnodes = self.prune(ml, mfs, commonrevs)
690 mfnodes = self.prune(ml, mfs, commonrevs)
689 for x in self._packmanifests(mfnodes, lookupmflinknode):
691 for x in self._packmanifests(mfnodes, lookupmflinknode):
General Comments 0
You need to be logged in to leave comments. Login now