| indygreg | |
| pulkit |
| hg-reviewers |
Indenting this beforehand will make a future changeset much simpler.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/revlog.py (160 lines) |
| transaction.add(self._indexfile, isize) | transaction.add(self._indexfile, isize) | ||||
| transaction.add(self._datafile, end) | transaction.add(self._datafile, end) | ||||
| dfh = self._datafp(b"a+") | dfh = self._datafp(b"a+") | ||||
| self._writinghandles = (ifh, dfh) | self._writinghandles = (ifh, dfh) | ||||
| empty = True | empty = True | ||||
| try: | try: | ||||
| if True: | |||||
| deltacomputer = deltautil.deltacomputer(self) | deltacomputer = deltautil.deltacomputer(self) | ||||
| # loop through our set of deltas | # loop through our set of deltas | ||||
| for data in deltas: | for data in deltas: | ||||
| node, p1, p2, linknode, deltabase, delta, flags, sidedata = data | ( | ||||
| node, | |||||
| p1, | |||||
| p2, | |||||
| linknode, | |||||
| deltabase, | |||||
| delta, | |||||
| flags, | |||||
| sidedata, | |||||
| ) = data | |||||
| link = linkmapper(linknode) | link = linkmapper(linknode) | ||||
| flags = flags or REVIDX_DEFAULT_FLAGS | flags = flags or REVIDX_DEFAULT_FLAGS | ||||
| rev = self.index.get_rev(node) | rev = self.index.get_rev(node) | ||||
| if rev is not None: | if rev is not None: | ||||
| # this can happen if two branches make the same change | # this can happen if two branches make the same change | ||||
| self._nodeduplicatecallback(transaction, rev) | self._nodeduplicatecallback(transaction, rev) | ||||
| if duplicaterevisioncb: | if duplicaterevisioncb: | ||||
| duplicaterevisioncb(self, rev) | duplicaterevisioncb(self, rev) | ||||
| empty = False | empty = False | ||||
| continue | continue | ||||
| for p in (p1, p2): | for p in (p1, p2): | ||||
| if not self.index.has_node(p): | if not self.index.has_node(p): | ||||
| raise error.LookupError( | raise error.LookupError( | ||||
| p, self.radix, _(b'unknown parent') | p, self.radix, _(b'unknown parent') | ||||
| ) | ) | ||||
| if not self.index.has_node(deltabase): | if not self.index.has_node(deltabase): | ||||
| raise error.LookupError( | raise error.LookupError( | ||||
| deltabase, self.display_id, _(b'unknown delta base') | deltabase, self.display_id, _(b'unknown delta base') | ||||
| ) | ) | ||||
| baserev = self.rev(deltabase) | baserev = self.rev(deltabase) | ||||
| if baserev != nullrev and self.iscensored(baserev): | if baserev != nullrev and self.iscensored(baserev): | ||||
| # if base is censored, delta must be full replacement in a | # if base is censored, delta must be full replacement in a | ||||
| # single patch operation | # single patch operation | ||||
| hlen = struct.calcsize(b">lll") | hlen = struct.calcsize(b">lll") | ||||
| oldlen = self.rawsize(baserev) | oldlen = self.rawsize(baserev) | ||||
| newlen = len(delta) - hlen | newlen = len(delta) - hlen | ||||
| if delta[:hlen] != mdiff.replacediffheader(oldlen, newlen): | if delta[:hlen] != mdiff.replacediffheader( | ||||
| oldlen, newlen | |||||
| ): | |||||
| raise error.CensoredBaseError( | raise error.CensoredBaseError( | ||||
| self.display_id, self.node(baserev) | self.display_id, self.node(baserev) | ||||
| ) | ) | ||||
| if not flags and self._peek_iscensored(baserev, delta): | if not flags and self._peek_iscensored(baserev, delta): | ||||
| flags |= REVIDX_ISCENSORED | flags |= REVIDX_ISCENSORED | ||||
| # We assume consumers of addrevisioncb will want to retrieve | # We assume consumers of addrevisioncb will want to retrieve | ||||
| # the added revision, which will require a call to | # the added revision, which will require a call to | ||||
| # revision(). revision() will fast path if there is a cache | # revision(). revision() will fast path if there is a cache | ||||
| # hit. So, we tell _addrevision() to always cache in this case. | # hit. So, we tell _addrevision() to always cache in this case. | ||||
| # We're only using addgroup() in the context of changegroup | # We're only using addgroup() in the context of changegroup | ||||
| # generation so the revision data can always be handled as raw | # generation so the revision data can always be handled as raw | ||||
| # by the flagprocessor. | # by the flagprocessor. | ||||
| rev = self._addrevision( | rev = self._addrevision( | ||||
| node, | node, | ||||
| None, | None, | ||||
| transaction, | transaction, | ||||
| link, | link, | ||||
| p1, | p1, | ||||
| p2, | p2, | ||||
| flags, | flags, | ||||
| (baserev, delta), | (baserev, delta), | ||||
| ifh, | ifh, | ||||
| dfh, | dfh, | ||||
| alwayscache=alwayscache, | alwayscache=alwayscache, | ||||
| deltacomputer=deltacomputer, | deltacomputer=deltacomputer, | ||||
| sidedata=sidedata, | sidedata=sidedata, | ||||
| ) | ) | ||||
| if addrevisioncb: | if addrevisioncb: | ||||
| addrevisioncb(self, rev) | addrevisioncb(self, rev) | ||||
| empty = False | empty = False | ||||
| if not dfh and not self._inline: | if not dfh and not self._inline: | ||||
| # addrevision switched from inline to conventional | # addrevision switched from inline to conventional | ||||
| # reopen the index | # reopen the index | ||||
| ifh.close() | ifh.close() | ||||
| dfh = self._datafp(b"a+") | dfh = self._datafp(b"a+") | ||||
| ifh = self._indexfp(b"a+") | ifh = self._indexfp(b"a+") | ||||
| self._writinghandles = (ifh, dfh) | self._writinghandles = (ifh, dfh) | ||||
| finally: | finally: | ||||
| self._writinghandles = None | self._writinghandles = None | ||||
| if dfh: | if dfh: | ||||
| dfh.close() | dfh.close() | ||||
| ifh.close() | ifh.close() | ||||
| return not empty | return not empty | ||||