| indygreg |
| hg-reviewers |
This is the only use of thirdparty.cbor outside of a test-* file, so it felt
worthwhile to clean it up.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| from mercurial.node import ( | from mercurial.node import ( | ||||
| bin, | bin, | ||||
| hex, | hex, | ||||
| nullid, | nullid, | ||||
| nullrev, | nullrev, | ||||
| ) | ) | ||||
| from mercurial.thirdparty import ( | from mercurial.thirdparty import ( | ||||
| attr, | attr, | ||||
| cbor, | |||||
| ) | ) | ||||
| from mercurial import ( | from mercurial import ( | ||||
| ancestor, | ancestor, | ||||
| bundlerepo, | bundlerepo, | ||||
| error, | error, | ||||
| extensions, | extensions, | ||||
| localrepo, | localrepo, | ||||
| mdiff, | mdiff, | ||||
| pycompat, | pycompat, | ||||
| repository, | repository, | ||||
| revlog, | revlog, | ||||
| store, | store, | ||||
| verify, | verify, | ||||
| ) | ) | ||||
| from mercurial.utils import ( | from mercurial.utils import ( | ||||
| cborutil, | |||||
| interfaceutil, | interfaceutil, | ||||
| storageutil, | storageutil, | ||||
| ) | ) | ||||
| # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for | # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for | ||||
| # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should | # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should | ||||
| # be specifying the version(s) of Mercurial they are tested with, or | # be specifying the version(s) of Mercurial they are tested with, or | ||||
| # leave the attribute unspecified. | # leave the attribute unspecified. | ||||
| self._svfs = svfs | self._svfs = svfs | ||||
| self._path = path | self._path = path | ||||
| self._storepath = b'/'.join([b'data', path]) | self._storepath = b'/'.join([b'data', path]) | ||||
| self._indexpath = b'/'.join([self._storepath, b'index']) | self._indexpath = b'/'.join([self._storepath, b'index']) | ||||
| indexdata = self._svfs.tryread(self._indexpath) | indexdata = self._svfs.tryread(self._indexpath) | ||||
| if indexdata: | if indexdata: | ||||
| indexdata = cbor.loads(indexdata) | indexdata = cborutil.decodeall(indexdata) | ||||
| self._indexdata = indexdata or [] | self._indexdata = indexdata or [] | ||||
| self._indexbynode = {} | self._indexbynode = {} | ||||
| self._indexbyrev = {} | self._indexbyrev = {} | ||||
| self._index = [] | self._index = [] | ||||
| self._refreshindex() | self._refreshindex() | ||||
| def _refreshindex(self): | def _refreshindex(self): | ||||
| }) | }) | ||||
| self._reflectindexupdate() | self._reflectindexupdate() | ||||
| return node | return node | ||||
| def _reflectindexupdate(self): | def _reflectindexupdate(self): | ||||
| self._refreshindex() | self._refreshindex() | ||||
| self._svfs.write(self._indexpath, cbor.dumps(self._indexdata)) | self._svfs.write(self._indexpath, | ||||
| ''.join(cborutil.streamencode(self._indexdata))) | |||||
| def addgroup(self, deltas, linkmapper, transaction, addrevisioncb=None, | def addgroup(self, deltas, linkmapper, transaction, addrevisioncb=None, | ||||
| maybemissingparents=False): | maybemissingparents=False): | ||||
| if maybemissingparents: | if maybemissingparents: | ||||
| raise error.Abort(_('simple store does not support missing parents ' | raise error.Abort(_('simple store does not support missing parents ' | ||||
| 'write mode')) | 'write mode')) | ||||
| nodes = [] | nodes = [] | ||||