comparison mercurial/changegroup.py @ 27691:b0d23a55f91e

changegroup: don't add a second trailing '/' in dir name The paths given from treemanifest.dir() already contains the trailing slash.
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 08 Jan 2016 14:47:02 -0800
parents 8b01558d5d23
children 5c0fd878779c
comparison
equal deleted inserted replaced
27690:8b01558d5d23 27691:b0d23a55f91e
901 mfnodes, {}, lookuplinknode): 901 mfnodes, {}, lookuplinknode):
902 yield x 902 yield x
903 dirlog = self._repo.manifest.dirlog 903 dirlog = self._repo.manifest.dirlog
904 for name, nodes in tmfnodes.iteritems(): 904 for name, nodes in tmfnodes.iteritems():
905 # For now, directory headers are simply file headers with 905 # For now, directory headers are simply file headers with
906 # a trailing '/' on the path. 906 # a trailing '/' on the path (already in the name).
907 yield self.fileheader(name + '/') 907 yield self.fileheader(name)
908 for chunk in self.group(nodes, dirlog(name), nodes.get): 908 for chunk in self.group(nodes, dirlog(name), nodes.get):
909 yield chunk 909 yield chunk
910 910
911 def builddeltaheader(self, node, p1n, p2n, basenode, linknode, flags): 911 def builddeltaheader(self, node, p1n, p2n, basenode, linknode, flags):
912 return struct.pack( 912 return struct.pack(