This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4764

remotefilelog: adapt to movement of functions into new storageutils module
ClosedPublic

Authored by durin42 on Sep 26 2018, 5:23 PM.
Tags
None
Subscribers
None

Details

Reviewers
indygreg
Group Reviewers
Restricted Project
Commits
rFBHGX318609066f0d: remotefilelog: adapt to movement of functions into new storageutils module
Summary

Diff Detail

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

Event Timeline

durin42 created this revision.Sep 26 2018, 5:23 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptSep 26 2018, 5:23 PM
indygreg accepted this revision.Sep 26 2018, 5:29 PM
This revision is now accepted and ready to land.Sep 26 2018, 5:29 PM
Closed by commit rFBHGX318609066f0d: remotefilelog: adapt to movement of functions into new storageutils module (authored by durin42). · Explain WhySep 28 2018, 1:00 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 11463

remotefilelog/remotefilelog.py

import collections, os import collections, os
from mercurial.node import bin, nullid from mercurial.node import bin, nullid
from mercurial import filelog, revlog, mdiff, ancestor, error, util from mercurial import filelog, revlog, mdiff, ancestor, error, util
from mercurial.i18n import _ from mercurial.i18n import _
if util.safehasattr(revlog, 'parsemeta'): if util.safehasattr(revlog, 'parsemeta'):
# Since 0596d274 # Since 0596d274
_parsemeta = revlog.parsemeta _parsemeta = revlog.parsemeta
else: _hash = revlog.hash
elif util.safehasattr(filelog, 'parsemeta'):
_parsemeta = filelog.parsemeta _parsemeta = filelog.parsemeta
_hash = revlog.hash
else:
# since a6c5
from mercurial.utils import storageutil
_parsemeta = storageutil.parsemeta
_hash = storageutil.hashrevisionsha1
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 t[s + 2:] return t[s + 2:]
def add(self, text, meta, transaction, linknode, p1=None, p2=None): def add(self, text, meta, transaction, linknode, p1=None, p2=None):
hashtext = text hashtext = text
# hash with the metadata, like in vanilla filelogs # hash with the metadata, like in vanilla filelogs
hashtext = shallowutil.createrevlogtext(text, meta.get('copy'), hashtext = shallowutil.createrevlogtext(text, meta.get('copy'),
meta.get('copyrev')) meta.get('copyrev'))
node = revlog.hash(hashtext, p1, p2) node = _hash(hashtext, p1, p2)
return self.addrevision(hashtext, transaction, linknode, p1, p2, return self.addrevision(hashtext, transaction, linknode, p1, p2,
node=node) node=node)
def _createfileblob(self, text, meta, flags, p1, p2, node, linknode): def _createfileblob(self, text, meta, flags, p1, p2, node, linknode):
# text passed to "_createfileblob" does not include filelog metadata # text passed to "_createfileblob" does not include filelog metadata
header = shallowutil.buildfileblobheader(len(text), flags) header = shallowutil.buildfileblobheader(len(text), flags)
data = "%s\0%s" % (header, text) data = "%s\0%s" % (header, text)
data += ancestortext data += ancestortext
return data return data
def addrevision(self, text, transaction, linknode, p1, p2, cachedelta=None, def addrevision(self, text, transaction, linknode, p1, p2, cachedelta=None,
node=None, flags=revlog.REVIDX_DEFAULT_FLAGS): node=None, flags=revlog.REVIDX_DEFAULT_FLAGS):
# text passed to "addrevision" includes hg filelog metadata header # text passed to "addrevision" includes hg filelog metadata header
if node is None: if node is None:
node = revlog.hash(text, p1, p2) node = _hash(text, p1, p2)
meta, metaoffset = _parsemeta(text) meta, metaoffset = _parsemeta(text)
rawtext, validatehash = self._processflags(text, flags, 'write') rawtext, validatehash = self._processflags(text, flags, 'write')
return self.addrawrevision(rawtext, transaction, linknode, p1, p2, return self.addrawrevision(rawtext, transaction, linknode, p1, p2,
node, flags, cachedelta, node, flags, cachedelta,
_metatuple=(meta, metaoffset)) _metatuple=(meta, metaoffset))
def addrawrevision(self, rawtext, transaction, linknode, p1, p2, node, def addrawrevision(self, rawtext, transaction, linknode, p1, p2, node,

remotefilelog/shallowutil.py

from mercurial.i18n import _ from mercurial.i18n import _
from . import constants from . import constants
if util.safehasattr(revlog, 'parsemeta'): if util.safehasattr(revlog, 'parsemeta'):
# Since 0596d274 # Since 0596d274
_parsemeta = revlog.parsemeta _parsemeta = revlog.parsemeta
_packmeta = revlog.packmeta _packmeta = revlog.packmeta
else: elif util.safehasattr(filelog, 'parsemeta'):
_parsemeta = filelog.parsemeta _parsemeta = filelog.parsemeta
_packmeta = filelog.packmeta _packmeta = filelog.packmeta
else:
# since a6c5
from mercurial.utils import storageutil
_parsemeta = storageutil.parsemeta
_packmeta = storageutil.packmeta
if os.name != 'nt': if os.name != 'nt':
import grp import grp
def interposeclass(container, classname): def interposeclass(container, classname):
'''Interpose a class into the hierarchies of all loaded subclasses. This '''Interpose a class into the hierarchies of all loaded subclasses. This
function is intended for use as a decorator. function is intended for use as a decorator.