| indygreg |
| hg-reviewers |
If we do a full addition, we need to start from the full text.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| p1 = index[entry[5]][7] | p1 = index[entry[5]][7] | ||||
| p2 = index[entry[6]][7] | p2 = index[entry[6]][7] | ||||
| node = entry[7] | node = entry[7] | ||||
| # (Possibly) reuse the delta from the revlog if allowed and | # (Possibly) reuse the delta from the revlog if allowed and | ||||
| # the revlog chunk is a delta. | # the revlog chunk is a delta. | ||||
| cachedelta = None | cachedelta = None | ||||
| rawtext = None | rawtext = None | ||||
| if (deltareuse != self.DELTAREUSEFULLADD and destrevlog._lazydelta): | if deltareuse == self.DELTAREUSEFULLADD: | ||||
| text = self.revision(rev) | |||||
| destrevlog.addrevision(text, tr, linkrev, p1, p2, | |||||
| cachedelta=cachedelta, | |||||
| node=node, flags=flags, | |||||
| deltacomputer=deltacomputer) | |||||
| else: | |||||
| if destrevlog._lazydelta: | |||||
| dp = self.deltaparent(rev) | dp = self.deltaparent(rev) | ||||
| if dp != nullrev: | if dp != nullrev: | ||||
| cachedelta = (dp, bytes(self._chunk(rev))) | cachedelta = (dp, bytes(self._chunk(rev))) | ||||
| if not cachedelta: | if not cachedelta: | ||||
| rawtext = self.rawdata(rev) | rawtext = self.rawdata(rev) | ||||
| if deltareuse == self.DELTAREUSEFULLADD: | |||||
| destrevlog.addrevision(rawtext, tr, linkrev, p1, p2, | |||||
| cachedelta=cachedelta, | |||||
| node=node, flags=flags, | |||||
| deltacomputer=deltacomputer) | |||||
| else: | |||||
| ifh = destrevlog.opener(destrevlog.indexfile, 'a+', | ifh = destrevlog.opener(destrevlog.indexfile, 'a+', | ||||
| checkambig=False) | checkambig=False) | ||||
| dfh = None | dfh = None | ||||
| if not destrevlog._inline: | if not destrevlog._inline: | ||||
| dfh = destrevlog.opener(destrevlog.datafile, 'a+') | dfh = destrevlog.opener(destrevlog.datafile, 'a+') | ||||
| try: | try: | ||||
| destrevlog._addrevision(node, rawtext, tr, linkrev, p1, | destrevlog._addrevision(node, rawtext, tr, linkrev, p1, | ||||
| p2, flags, cachedelta, ifh, dfh, | p2, flags, cachedelta, ifh, dfh, | ||||