##// END OF EJS Templates
upgrade: fix DELTAREUSEFULLADD implementation in revlog.clone...
marmoute -
r43268:8a31294f default
parent child Browse files
Show More
@@ -2437,7 +2437,14 class revlog(object):
2437 # the revlog chunk is a delta.
2437 # the revlog chunk is a delta.
2438 cachedelta = None
2438 cachedelta = None
2439 rawtext = None
2439 rawtext = None
2440 if (deltareuse != self.DELTAREUSEFULLADD and destrevlog._lazydelta):
2440 if deltareuse == self.DELTAREUSEFULLADD:
2441 text = self.revision(rev)
2442 destrevlog.addrevision(text, tr, linkrev, p1, p2,
2443 cachedelta=cachedelta,
2444 node=node, flags=flags,
2445 deltacomputer=deltacomputer)
2446 else:
2447 if destrevlog._lazydelta:
2441 dp = self.deltaparent(rev)
2448 dp = self.deltaparent(rev)
2442 if dp != nullrev:
2449 if dp != nullrev:
2443 cachedelta = (dp, bytes(self._chunk(rev)))
2450 cachedelta = (dp, bytes(self._chunk(rev)))
@@ -2445,13 +2452,6 class revlog(object):
2445 if not cachedelta:
2452 if not cachedelta:
2446 rawtext = self.rawdata(rev)
2453 rawtext = self.rawdata(rev)
2447
2454
2448
2449 if deltareuse == self.DELTAREUSEFULLADD:
2450 destrevlog.addrevision(rawtext, tr, linkrev, p1, p2,
2451 cachedelta=cachedelta,
2452 node=node, flags=flags,
2453 deltacomputer=deltacomputer)
2454 else:
2455 ifh = destrevlog.opener(destrevlog.indexfile, 'a+',
2455 ifh = destrevlog.opener(destrevlog.indexfile, 'a+',
2456 checkambig=False)
2456 checkambig=False)
2457 dfh = None
2457 dfh = None
General Comments 0
You need to be logged in to leave comments. Login now