This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6797

flagutil: use the new mixin use in remotefilelog
ClosedPublic

Authored by marmoute on Sep 7 2019, 5:26 AM.

Details

Reviewers
yuja
durin42
indygreg
Group Reviewers
hg-reviewers
Commits
rHGa5c088966d6c: flagutil: use the new mixin use in remotefilelog
Summary

This remove one of the code duplication. Hooray \o/.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

marmoute created this revision.Sep 7 2019, 5:26 AM
indygreg accepted this revision.Sep 7 2019, 12:57 PM
This revision is now accepted and ready to land.Sep 7 2019, 12:57 PM
marmoute added a commit: rHGa5c088966d6c: flagutil: use the new mixin use in remotefilelog.Sep 7 2019, 1:00 PM
Closed by commit rHGa5c088966d6c: flagutil: use the new mixin use in remotefilelog (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/remotefilelog/remotefilelog.py (27 lines)

Diff 16435

hgext/remotefilelog/remotefilelog.py

from mercurial.i18n import _ from mercurial.i18n import _
from mercurial import ( from mercurial import (
ancestor, ancestor,
error, error,
mdiff, mdiff,
revlog, revlog,
) )
from mercurial.utils import storageutil from mercurial.utils import storageutil
from mercurial.revlogutils import flagutil
from . import ( from . import (
constants, constants,
fileserverclient, fileserverclient,
shallowutil, shallowutil,
) )
class remotefilelognodemap(object): class remotefilelognodemap(object):
def __init__(self, filename, store): def __init__(self, filename, store):
self._filename = filename self._filename = filename
self._store = store self._store = store
def __contains__(self, node): def __contains__(self, node):
missing = self._store.getmissing([(self._filename, node)]) missing = self._store.getmissing([(self._filename, node)])
return not bool(missing) return not bool(missing)
def __get__(self, node): def __get__(self, node):
if node not in self: if node not in self:
raise KeyError(node) raise KeyError(node)
return node return node
class remotefilelog(object): class remotefilelog(flagutil.flagprocessorsmixin):
_generaldelta = True _generaldelta = True
def __init__(self, opener, path, repo): def __init__(self, opener, path, repo):
self.opener = opener self.opener = opener
self.filename = path self.filename = path
self.repo = repo self.repo = repo
self.nodemap = remotefilelognodemap(self.filename, repo.contentstore) self.nodemap = remotefilelognodemap(self.filename, repo.contentstore)
self.version = 1 self.version = 1
self._flagprocessors = dict(flagutil.flagprocessors)
def read(self, node): def read(self, node):
"""returns the file contents at this node""" """returns the file contents at this node"""
t = self.revision(node) t = self.revision(node)
if not t.startswith('\1\n'): if not t.startswith('\1\n'):
return t return t
s = t.index('\1\n', 2) s = t.index('\1\n', 2)
return t[s + 2:] return t[s + 2:]
if flags == 0: if flags == 0:
return rawtext return rawtext
text, verifyhash = self._processflags(rawtext, flags, 'read') text, verifyhash = self._processflags(rawtext, flags, 'read')
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 _processflags(self, text, flags, operation, raw=False):
# mostly copied from hg/mercurial/revlog.py
validatehash = True
orderedflags = revlog.REVIDX_FLAGS_ORDER
if operation == 'write':
orderedflags = reversed(orderedflags)
for flag in orderedflags:
if flag & flags:
vhash = True
if flag not in revlog._flagprocessors:
message = _("missing processor for flag '%#x'") % (flag)
raise revlog.RevlogError(message)
readfunc, writefunc, rawfunc = revlog._flagprocessors[flag]
if raw:
vhash = rawfunc(self, text)
elif operation == 'read':
text, vhash = readfunc(self, text)
elif operation == 'write':
text, vhash = writefunc(self, text)
validatehash = validatehash and vhash
return text, validatehash
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
localcache = fileservice.localcache localcache = fileservice.localcache
cachekey = fileserverclient.getcachekey(self.repo.name, self.filename, cachekey = fileserverclient.getcachekey(self.repo.name, self.filename,
id) id)
try: try:
return localcache.read(cachekey) return localcache.read(cachekey)