##// END OF EJS Templates
bundlerepo: update to use new deltaiter api...
Durham Goode -
r34294:0fe62d8b default
parent child Browse files
Show More
@@ -55,17 +55,9 b' class bundlerevlog(revlog.revlog):'
55 self.bundle = bundle
55 self.bundle = bundle
56 n = len(self)
56 n = len(self)
57 self.repotiprev = n - 1
57 self.repotiprev = n - 1
58 chain = None
59 self.bundlerevs = set() # used by 'bundle()' revset expression
58 self.bundlerevs = set() # used by 'bundle()' revset expression
60 getchunk = lambda: bundle.deltachunk(chain)
59 for deltadata in bundle.deltaiter():
61 for chunkdata in iter(getchunk, {}):
60 node, p1, p2, cs, deltabase, delta, flags = deltadata
62 node = chunkdata['node']
63 p1 = chunkdata['p1']
64 p2 = chunkdata['p2']
65 cs = chunkdata['cs']
66 deltabase = chunkdata['deltabase']
67 delta = chunkdata['delta']
68 flags = chunkdata['flags']
69
61
70 size = len(delta)
62 size = len(delta)
71 start = bundle.tell() - size
63 start = bundle.tell() - size
@@ -73,7 +65,6 b' class bundlerevlog(revlog.revlog):'
73 link = linkmapper(cs)
65 link = linkmapper(cs)
74 if node in self.nodemap:
66 if node in self.nodemap:
75 # this can happen if two branches make the same change
67 # this can happen if two branches make the same change
76 chain = node
77 self.bundlerevs.add(self.nodemap[node])
68 self.bundlerevs.add(self.nodemap[node])
78 continue
69 continue
79
70
@@ -93,7 +84,6 b' class bundlerevlog(revlog.revlog):'
93 self.index.insert(-1, e)
84 self.index.insert(-1, e)
94 self.nodemap[node] = n
85 self.nodemap[node] = n
95 self.bundlerevs.add(n)
86 self.bundlerevs.add(n)
96 chain = node
97 n += 1
87 n += 1
98
88
99 def _chunk(self, rev):
89 def _chunk(self, rev):
General Comments 0
You need to be logged in to leave comments. Login now