Mercurial > public > mercurial-scm > hg-stable
diff hgext/sqlitestore.py @ 46560: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 | a5206e71c536 |
| children | 7a93b7b3dc2d |
line wrap: on
line diff
--- a/hgext/sqlitestore.py Wed Jan 27 00:55:20 2021 +0100 +++ b/hgext/sqlitestore.py Wed Jan 27 01:43:17 2021 +0100 @@ -636,7 +636,8 @@ if meta or filedata.startswith(b'\x01\n'): filedata = storageutil.packmeta(meta, filedata) - return self.addrevision(filedata, transaction, linkrev, p1, p2) + rev = self.addrevision(filedata, transaction, linkrev, p1, p2) + return self.node(rev) def addrevision( self, @@ -658,15 +659,16 @@ if validatehash: self._checkhash(revisiondata, node, p1, p2) - if node in self._nodetorev: - return node + rev = self._nodetorev.get(node) + if rev is not None: + return rev - node = self._addrawrevision( + rev = self._addrawrevision( node, revisiondata, transaction, linkrev, p1, p2 ) self._revisioncache[node] = revisiondata - return node + return rev def addgroup( self, @@ -1079,7 +1081,7 @@ self._revtonode[rev] = node self._revisions[node] = entry - return node + return rev class sqliterepository(localrepo.localrepository):