Mercurial > public > mercurial-scm > hg-stable
diff mercurial/revlog.py @ 46561:7a93b7b3dc2d
revlog: change addgroup callbacks to take revision numbers
Differential Revision: https://phab.mercurial-scm.org/D9883
| author | Joerg Sonnenberger <joerg@bec.de> |
|---|---|
| date | Wed, 27 Jan 2021 02:34:51 +0100 |
| parents | f7b61ad3c64a |
| children | e9901d01d135 |
line wrap: on
line diff
--- a/mercurial/revlog.py Wed Jan 27 01:43:17 2021 +0100 +++ b/mercurial/revlog.py Wed Jan 27 02:34:51 2021 +0100 @@ -2419,11 +2419,12 @@ link = linkmapper(linknode) flags = flags or REVIDX_DEFAULT_FLAGS - if self.index.has_node(node): + rev = self.index.get_rev(node) + if rev is not None: # this can happen if two branches make the same change - self._nodeduplicatecallback(transaction, node) + self._nodeduplicatecallback(transaction, rev) if duplicaterevisioncb: - duplicaterevisioncb(self, node) + duplicaterevisioncb(self, rev) empty = False continue @@ -2461,7 +2462,7 @@ # We're only using addgroup() in the context of changegroup # generation so the revision data can always be handled as raw # by the flagprocessor. - self._addrevision( + rev = self._addrevision( node, None, transaction, @@ -2477,7 +2478,7 @@ ) if addrevisioncb: - addrevisioncb(self, node) + addrevisioncb(self, rev) empty = False if not dfh and not self._inline: