diff mercurial/revlog.py @ 46508:f7b61ad3c64a

revlog: change addrevision to return the new revision, not node Differential Revision: https://phab.mercurial-scm.org/D9882
author Joerg Sonnenberger <joerg@bec.de>
date Wed, 27 Jan 2021 01:43:17 +0100
parents 9ee4e988e2be
children 7a93b7b3dc2d
line wrap: on
line diff
--- a/mercurial/revlog.py	Wed Jan 27 00:55:20 2021 +0100
+++ b/mercurial/revlog.py	Wed Jan 27 01:43:17 2021 +0100
@@ -2106,13 +2106,14 @@
             )
 
         node = node or self.hash(rawtext, p1, p2)
-        if self.index.has_node(node):
-            return node
+        rev = self.index.get_rev(node)
+        if rev is not None:
+            return rev
 
         if validatehash:
             self.checkhash(rawtext, node, p1=p1, p2=p2)
 
-        rev = self.addrawrevision(
+        return self.addrawrevision(
             rawtext,
             transaction,
             link,
@@ -2123,7 +2124,6 @@
             cachedelta=cachedelta,
             deltacomputer=deltacomputer,
         )
-        return node
 
     def addrawrevision(
         self,