comparison 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
comparison
equal deleted inserted replaced
46507:9ee4e988e2be 46508:f7b61ad3c64a
2104 ) 2104 )
2105 % (self.indexfile, len(rawtext)) 2105 % (self.indexfile, len(rawtext))
2106 ) 2106 )
2107 2107
2108 node = node or self.hash(rawtext, p1, p2) 2108 node = node or self.hash(rawtext, p1, p2)
2109 if self.index.has_node(node): 2109 rev = self.index.get_rev(node)
2110 return node 2110 if rev is not None:
2111 return rev
2111 2112
2112 if validatehash: 2113 if validatehash:
2113 self.checkhash(rawtext, node, p1=p1, p2=p2) 2114 self.checkhash(rawtext, node, p1=p1, p2=p2)
2114 2115
2115 rev = self.addrawrevision( 2116 return self.addrawrevision(
2116 rawtext, 2117 rawtext,
2117 transaction, 2118 transaction,
2118 link, 2119 link,
2119 p1, 2120 p1,
2120 p2, 2121 p2,
2121 node, 2122 node,
2122 flags, 2123 flags,
2123 cachedelta=cachedelta, 2124 cachedelta=cachedelta,
2124 deltacomputer=deltacomputer, 2125 deltacomputer=deltacomputer,
2125 ) 2126 )
2126 return node
2127 2127
2128 def addrawrevision( 2128 def addrawrevision(
2129 self, 2129 self,
2130 rawtext, 2130 rawtext,
2131 transaction, 2131 transaction,