Mercurial > hg
comparison hgext/sqlitestore.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 | a5206e71c536 |
| children | 7a93b7b3dc2d |
comparison
equal
deleted
inserted
replaced
| 46507:9ee4e988e2be | 46508:f7b61ad3c64a |
|---|---|
| 634 | 634 |
| 635 def add(self, filedata, meta, transaction, linkrev, p1, p2): | 635 def add(self, filedata, meta, transaction, linkrev, p1, p2): |
| 636 if meta or filedata.startswith(b'\x01\n'): | 636 if meta or filedata.startswith(b'\x01\n'): |
| 637 filedata = storageutil.packmeta(meta, filedata) | 637 filedata = storageutil.packmeta(meta, filedata) |
| 638 | 638 |
| 639 return self.addrevision(filedata, transaction, linkrev, p1, p2) | 639 rev = self.addrevision(filedata, transaction, linkrev, p1, p2) |
| 640 return self.node(rev) | |
| 640 | 641 |
| 641 def addrevision( | 642 def addrevision( |
| 642 self, | 643 self, |
| 643 revisiondata, | 644 revisiondata, |
| 644 transaction, | 645 transaction, |
| 656 node = node or storageutil.hashrevisionsha1(revisiondata, p1, p2) | 657 node = node or storageutil.hashrevisionsha1(revisiondata, p1, p2) |
| 657 | 658 |
| 658 if validatehash: | 659 if validatehash: |
| 659 self._checkhash(revisiondata, node, p1, p2) | 660 self._checkhash(revisiondata, node, p1, p2) |
| 660 | 661 |
| 661 if node in self._nodetorev: | 662 rev = self._nodetorev.get(node) |
| 662 return node | 663 if rev is not None: |
| 663 | 664 return rev |
| 664 node = self._addrawrevision( | 665 |
| 666 rev = self._addrawrevision( | |
| 665 node, revisiondata, transaction, linkrev, p1, p2 | 667 node, revisiondata, transaction, linkrev, p1, p2 |
| 666 ) | 668 ) |
| 667 | 669 |
| 668 self._revisioncache[node] = revisiondata | 670 self._revisioncache[node] = revisiondata |
| 669 return node | 671 return rev |
| 670 | 672 |
| 671 def addgroup( | 673 def addgroup( |
| 672 self, | 674 self, |
| 673 deltas, | 675 deltas, |
| 674 linkmapper, | 676 linkmapper, |
| 1077 | 1079 |
| 1078 self._nodetorev[node] = rev | 1080 self._nodetorev[node] = rev |
| 1079 self._revtonode[rev] = node | 1081 self._revtonode[rev] = node |
| 1080 self._revisions[node] = entry | 1082 self._revisions[node] = entry |
| 1081 | 1083 |
| 1082 return node | 1084 return rev |
| 1083 | 1085 |
| 1084 | 1086 |
| 1085 class sqliterepository(localrepo.localrepository): | 1087 class sqliterepository(localrepo.localrepository): |
| 1086 def cancopy(self): | 1088 def cancopy(self): |
| 1087 return False | 1089 return False |