| yuja | |
| durin42 | |
| indygreg |
| hg-reviewers |
Right now, flag processors does not return sidedata, by they will. So, we
prepare the caller to receive it.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/remotefilelog/remotefilelog.py (2 lines) | |||
| M | mercurial/revlog.py (3 lines) | |||
| M | mercurial/revlogutils/flagutil.py (3 lines) | |||
| M | tests/simplestorerepo.py (3 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute |
| store = self.repo.contentstore | store = self.repo.contentstore | ||||
| rawtext = store.get(self.filename, node) | rawtext = store.get(self.filename, node) | ||||
| if raw: | if raw: | ||||
| return rawtext | return rawtext | ||||
| flags = store.getmeta(self.filename, node).get(constants.METAKEYFLAG, 0) | flags = store.getmeta(self.filename, node).get(constants.METAKEYFLAG, 0) | ||||
| if flags == 0: | if flags == 0: | ||||
| return rawtext | return rawtext | ||||
| text, verifyhash = self._processflagsread(rawtext, flags) | text, verifyhash, sidedata = self._processflagsread(rawtext, flags) | ||||
| return text | return text | ||||
| def rawdata(self, node): | def rawdata(self, node): | ||||
| return self.revision(node, raw=False) | return self.revision(node, raw=False) | ||||
| def _read(self, id): | def _read(self, id): | ||||
| """reads the raw file blob from disk, cache, or server""" | """reads the raw file blob from disk, cache, or server""" | ||||
| fileservice = self.repo.fileservice | fileservice = self.repo.fileservice | ||||
| # no extra flags set, no flag processor runs, text = rawtext | # no extra flags set, no flag processor runs, text = rawtext | ||||
| return rawtext, {} | return rawtext, {} | ||||
| sidedata = {} | sidedata = {} | ||||
| if raw: | if raw: | ||||
| validatehash = self._processflagsraw(rawtext, flags) | validatehash = self._processflagsraw(rawtext, flags) | ||||
| text = rawtext | text = rawtext | ||||
| else: | else: | ||||
| text, validatehash = self._processflagsread(rawtext, flags) | r = self._processflagsread(rawtext, flags) | ||||
| text, validatehash, sidedata = r | |||||
| if validatehash: | if validatehash: | ||||
| self.checkhash(text, node, rev=rev) | self.checkhash(text, node, rev=rev) | ||||
| if not validated: | if not validated: | ||||
| self._revisioncache = (node, rev, rawtext) | self._revisioncache = (node, rev, rawtext) | ||||
| return text, sidedata | return text, sidedata | ||||
| def _rawtext(self, node, rev, _df=None): | def _rawtext(self, node, rev, _df=None): | ||||
| ``operation`` is 'write') defined by REVIDX_FLAGS_ORDER, applying the | ``operation`` is 'write') defined by REVIDX_FLAGS_ORDER, applying the | ||||
| flag processors registered for present flags. The order of flags defined | flag processors registered for present flags. The order of flags defined | ||||
| in REVIDX_FLAGS_ORDER needs to be stable to allow non-commutativity. | in REVIDX_FLAGS_ORDER needs to be stable to allow non-commutativity. | ||||
| Returns a 2-tuple of ``(text, validatehash)`` where ``text`` is the | Returns a 2-tuple of ``(text, validatehash)`` where ``text`` is the | ||||
| processed text and ``validatehash`` is a bool indicating whether the | processed text and ``validatehash`` is a bool indicating whether the | ||||
| returned text should be checked for hash integrity. | returned text should be checked for hash integrity. | ||||
| """ | """ | ||||
| return self._processflagsfunc(text, flags, 'read') | text, vhash = self._processflagsfunc(text, flags, 'read') | ||||
| return text, vhash, {} | |||||
| def _processflagswrite(self, text, flags): | def _processflagswrite(self, text, flags): | ||||
| """Inspect revision data flags and applies write transformations defined | """Inspect revision data flags and applies write transformations defined | ||||
| by registered flag processors. | by registered flag processors. | ||||
| ``text`` - the revision data to process | ``text`` - the revision data to process | ||||
| ``flags`` - the revision flags | ``flags`` - the revision flags | ||||
| path = b'/'.join([self._storepath, hex(node)]) | path = b'/'.join([self._storepath, hex(node)]) | ||||
| rawtext = self._svfs.read(path) | rawtext = self._svfs.read(path) | ||||
| if raw: | if raw: | ||||
| validatehash = self._processflagsraw(rawtext, flags) | validatehash = self._processflagsraw(rawtext, flags) | ||||
| text = rawtext | text = rawtext | ||||
| else: | else: | ||||
| text, validatehash = self._processflagsread(rawtext, flags) | r = self._processflagsread(rawtext, flags) | ||||
| text, validatehash, sidedata = r | |||||
| if validatehash: | if validatehash: | ||||
| self.checkhash(text, node, rev=rev) | self.checkhash(text, node, rev=rev) | ||||
| return text | return text | ||||
| def rawdata(self, nodeorrev): | def rawdata(self, nodeorrev): | ||||
| return self.revision(raw=True) | return self.revision(raw=True) | ||||