| indygreg |
| hg-reviewers |
Previously the addgroup loop would set chain to be the result of
self._addrevision(node,...). Since _addrevision now always returns the passed in
node, we can drop that behavior and just always set chain = node in the loop.
This will be useful in a future patch where we refactor the cg.deltachunk logic
to another function and therefore chain disappears entirely from this function.
| Lint Skipped |
| Unit Tests Skipped |
| p1 = chunkdata['p1'] | p1 = chunkdata['p1'] | ||||
| p2 = chunkdata['p2'] | p2 = chunkdata['p2'] | ||||
| cs = chunkdata['cs'] | cs = chunkdata['cs'] | ||||
| deltabase = chunkdata['deltabase'] | deltabase = chunkdata['deltabase'] | ||||
| delta = chunkdata['delta'] | delta = chunkdata['delta'] | ||||
| flags = chunkdata['flags'] or REVIDX_DEFAULT_FLAGS | flags = chunkdata['flags'] or REVIDX_DEFAULT_FLAGS | ||||
| nodes.append(node) | nodes.append(node) | ||||
| chain = node | |||||
| link = linkmapper(cs) | link = linkmapper(cs) | ||||
| if node in self.nodemap: | if node in self.nodemap: | ||||
| # this can happen if two branches make the same change | # this can happen if two branches make the same change | ||||
| chain = node | |||||
| continue | continue | ||||
| for p in (p1, p2): | for p in (p1, p2): | ||||
| if p not in self.nodemap: | if p not in self.nodemap: | ||||
| raise LookupError(p, self.indexfile, | raise LookupError(p, self.indexfile, | ||||
| _('unknown parent')) | _('unknown parent')) | ||||
| if deltabase not in self.nodemap: | if deltabase not in self.nodemap: | ||||
| # 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. | ||||
| chain = self._addrevision(node, None, transaction, link, | self._addrevision(node, None, transaction, link, | ||||
| p1, p2, flags, (baserev, delta), | p1, p2, flags, (baserev, delta), | ||||
| ifh, dfh, | ifh, dfh, | ||||
| alwayscache=bool(addrevisioncb)) | alwayscache=bool(addrevisioncb)) | ||||
| if addrevisioncb: | if addrevisioncb: | ||||
| addrevisioncb(self, chain) | addrevisioncb(self, node) | ||||
| 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.opener(self.datafile, "a+") | dfh = self.opener(self.datafile, "a+") | ||||
| ifh = self.opener(self.indexfile, "a+", | ifh = self.opener(self.indexfile, "a+", | ||||
| checkambig=self._checkambig) | checkambig=self._checkambig) | ||||