##// END OF EJS Templates
histedit: use self.stateobj to check whether interrupted histedit exists...
histedit: use self.stateobj to check whether interrupted histedit exists self.stateobj is an instance of state.cmdstate() class which has an .exists() function which is used to check whether there exists an interrupted statefile or not. Differential Revision: https://phab.mercurial-scm.org/D3865

File last commit:

r38199:3790efb3 stable
r38526:03e7ec81 @63 default
Show More
wrapper.py
421 lines | 14.5 KiB | text/x-python | PythonLexer
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 # wrapper.py - methods wrapping core mercurial logic
#
# Copyright 2017 Facebook, Inc.
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
from __future__ import absolute_import
import hashlib
Matt Harbison
lfs: quiesce check-module-import warnings...
r35098 from mercurial.i18n import _
Augie Fackler
lfs: convert hexdigest to bytes using sysbytes...
r36622 from mercurial.node import bin, hex, nullid, short
Matt Harbison
lfs: quiesce check-module-import warnings...
r35098
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 from mercurial import (
error,
revlog,
util,
)
Yuya Nishihara
stringutil: bulk-replace call sites to point to new module...
r37102 from mercurial.utils import (
stringutil,
)
Matt Harbison
lfs: restore the local blob store after a repo upgrade...
r35364 from ..largefiles import lfutil
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 from . import (
blobstore,
pointer,
)
def allsupportedversions(orig, ui):
versions = orig(ui)
versions.add('03')
return versions
Matt Harbison
lfs: show a friendly message when pushing lfs to a server without lfs enabled...
r35522 def _capabilities(orig, repo, proto):
'''Wrap server command to announce lfs server capability'''
caps = orig(repo, proto)
Matt Harbison
lfs: bypass wrapped functions when reposetup() hasn't been called (issue5902)...
r38199 if util.safehasattr(repo.svfs, 'lfslocalblobstore'):
# XXX: change to 'lfs=serve' when separate git server isn't required?
caps.append('lfs')
Matt Harbison
lfs: show a friendly message when pushing lfs to a server without lfs enabled...
r35522 return caps
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 def bypasscheckhash(self, text):
return False
def readfromstore(self, text):
"""Read filelog content from local blobstore transform for flagprocessor.
Default tranform for flagprocessor, returning contents from blobstore.
Returns a 2-typle (text, validatehash) where validatehash is True as the
contents of the blobstore should be checked using checkhash.
"""
p = pointer.deserialize(text)
oid = p.oid()
store = self.opener.lfslocalblobstore
if not store.has(oid):
Matt Harbison
lfs: improve the error message for a missing remote blob...
r35584 p.filename = self.filename
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 self.opener.lfsremoteblobstore.readbatch([p], store)
Matt Harbison
lfs: verify lfs object content when transferring to and from the remote store...
r35492
# The caller will validate the content
text = store.read(oid, verify=False)
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097
# pack hg filelog metadata
hgmeta = {}
for k in p.keys():
if k.startswith('x-hg-'):
name = k[len('x-hg-'):]
hgmeta[name] = p[k]
if hgmeta or text.startswith('\1\n'):
Gregory Szorc
revlog: move parsemeta() and packmeta() from filelog (API)...
r37460 text = revlog.packmeta(hgmeta, text)
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097
return (text, True)
def writetostore(self, text):
# hg filelog metadata (includes rename, etc)
Gregory Szorc
revlog: move parsemeta() and packmeta() from filelog (API)...
r37460 hgmeta, offset = revlog.parsemeta(text)
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 if offset and offset > 0:
# lfs blob does not contain hg filelog metadata
text = text[offset:]
# git-lfs only supports sha256
Augie Fackler
lfs: convert hexdigest to bytes using sysbytes...
r36622 oid = hex(hashlib.sha256(text).digest())
Matt Harbison
lfs: remove the verification option when writing to the local store...
r35567 self.opener.lfslocalblobstore.write(oid, text)
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097
# replace contents with metadata
longoid = 'sha256:%s' % oid
Augie Fackler
lfs: use %d to encode int, not str()...
r36621 metadata = pointer.gitlfspointer(oid=longoid, size='%d' % len(text))
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097
# by default, we expect the content to be binary. however, LFS could also
# be used for non-binary content. add a special entry for non-binary data.
# this will be used by filectx.isbinary().
Yuya Nishihara
stringutil: bulk-replace call sites to point to new module...
r37102 if not stringutil.binary(text):
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 # not hg filelog metadata (affecting commit hash), no "x-hg-" prefix
metadata['x-is-binary'] = '0'
# translate hg filelog metadata to lfs metadata with "x-hg-" prefix
if hgmeta is not None:
for k, v in hgmeta.iteritems():
metadata['x-hg-%s' % k] = v
rawtext = metadata.serialize()
return (rawtext, False)
def _islfs(rlog, node=None, rev=None):
if rev is None:
if node is None:
# both None - likely working copy content where node is not ready
return False
rev = rlog.rev(node)
else:
node = rlog.node(rev)
if node == nullid:
return False
flags = rlog.flags(rev)
return bool(flags & revlog.REVIDX_EXTSTORED)
def filelogaddrevision(orig, self, text, transaction, link, p1, p2,
cachedelta=None, node=None,
flags=revlog.REVIDX_DEFAULT_FLAGS, **kwds):
Matt Harbison
lfs: bypass wrapped functions when reposetup() hasn't been called (issue5902)...
r38199 # The matcher isn't available if reposetup() wasn't called.
lfstrack = self.opener.options.get('lfstrack')
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097
Matt Harbison
lfs: bypass wrapped functions when reposetup() hasn't been called (issue5902)...
r38199 if lfstrack:
textlen = len(text)
# exclude hg rename meta from file size
meta, offset = revlog.parsemeta(text)
if offset:
textlen -= offset
Matt Harbison
lfs: always exclude '.hg*' text files...
r35666
Matt Harbison
lfs: bypass wrapped functions when reposetup() hasn't been called (issue5902)...
r38199 if lfstrack(self.filename, textlen):
flags |= revlog.REVIDX_EXTSTORED
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097
return orig(self, text, transaction, link, p1, p2, cachedelta=cachedelta,
node=node, flags=flags, **kwds)
def filelogrenamed(orig, self, node):
if _islfs(self, node):
rawtext = self.revision(node, raw=True)
if not rawtext:
return False
metadata = pointer.deserialize(rawtext)
if 'x-hg-copy' in metadata and 'x-hg-copyrev' in metadata:
return metadata['x-hg-copy'], bin(metadata['x-hg-copyrev'])
else:
return False
return orig(self, node)
def filelogsize(orig, self, rev):
if _islfs(self, rev=rev):
# fast path: use lfs metadata to answer size
rawtext = self.revision(rev, raw=True)
metadata = pointer.deserialize(rawtext)
return int(metadata['size'])
return orig(self, rev)
def filectxcmp(orig, self, fctx):
"""returns True if text is different than fctx"""
# some fctx (ex. hg-git) is not based on basefilectx and do not have islfs
if self.islfs() and getattr(fctx, 'islfs', lambda: False)():
# fast path: check LFS oid
p1 = pointer.deserialize(self.rawdata())
p2 = pointer.deserialize(fctx.rawdata())
return p1.oid() != p2.oid()
return orig(self, fctx)
def filectxisbinary(orig, self):
if self.islfs():
# fast path: use lfs metadata to answer isbinary
metadata = pointer.deserialize(self.rawdata())
# if lfs metadata says nothing, assume it's binary by default
return bool(int(metadata.get('x-is-binary', 1)))
return orig(self)
def filectxislfs(self):
return _islfs(self.filelog(), self.filenode())
Matt Harbison
lfs: allow the pointer file to be viewed with `hg cat -T '{rawdata}'`...
r35681 def _updatecatformatter(orig, fm, ctx, matcher, path, decode):
orig(fm, ctx, matcher, path, decode)
fm.data(rawdata=ctx[path].rawdata())
Matt Harbison
lfs: add a repo requirement for this extension when converting to lfs...
r35170 def convertsink(orig, sink):
sink = orig(sink)
if sink.repotype == 'hg':
class lfssink(sink.__class__):
def putcommit(self, files, copies, parents, commit, source, revmap,
full, cleanp2):
pc = super(lfssink, self).putcommit
node = pc(files, copies, parents, commit, source, revmap, full,
cleanp2)
if 'lfs' not in self.repo.requirements:
ctx = self.repo[node]
# The file list may contain removed files, so check for
# membership before assuming it is in the context.
if any(f in ctx and ctx[f].islfs() for f, n in files):
self.repo.requirements.add('lfs')
self.repo._writerequirements()
Matt Harbison
lfs: enable the extension locally after converting to an 'lfs' repo...
r35216 # Permanently enable lfs locally
Yuya Nishihara
lfs: convert EOL of hgrc before appending to bytes IO...
r35642 self.repo.vfs.append(
'hgrc', util.tonativeeol('\n[extensions]\nlfs=\n'))
Matt Harbison
lfs: enable the extension locally after converting to an 'lfs' repo...
r35216
Matt Harbison
lfs: add a repo requirement for this extension when converting to lfs...
r35170 return node
sink.__class__ = lfssink
return sink
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 def vfsinit(orig, self, othervfs):
orig(self, othervfs)
# copy lfs related options
for k, v in othervfs.options.items():
if k.startswith('lfs'):
self.options[k] = v
# also copy lfs blobstores. note: this can run before reposetup, so lfs
# blobstore attributes are not always ready at this time.
for name in ['lfslocalblobstore', 'lfsremoteblobstore']:
if util.safehasattr(othervfs, name):
setattr(self, name, getattr(othervfs, name))
Matt Harbison
lfs: enable the extension locally after cloning a repo with 'lfs' requirement...
r35214 def hgclone(orig, ui, opts, *args, **kwargs):
result = orig(ui, opts, *args, **kwargs)
if result is not None:
sourcerepo, destrepo = result
repo = destrepo.local()
# When cloning to a remote repo (like through SSH), no repo is available
# from the peer. Therefore the hgrc can't be updated.
if not repo:
return result
# If lfs is required for this repo, permanently enable it locally
if 'lfs' in repo.requirements:
Yuya Nishihara
lfs: convert EOL of hgrc before appending to bytes IO...
r35642 repo.vfs.append('hgrc',
util.tonativeeol('\n[extensions]\nlfs=\n'))
Matt Harbison
lfs: enable the extension locally after cloning a repo with 'lfs' requirement...
r35214
return result
Matt Harbison
lfs: enable the extension locally after sharing a repo with 'lfs' requirement...
r35215 def hgpostshare(orig, sourcerepo, destrepo, bookmarks=True, defaultpath=None):
orig(sourcerepo, destrepo, bookmarks, defaultpath)
# If lfs is required for this repo, permanently enable it locally
if 'lfs' in destrepo.requirements:
Yuya Nishihara
lfs: convert EOL of hgrc before appending to bytes IO...
r35642 destrepo.vfs.append('hgrc', util.tonativeeol('\n[extensions]\nlfs=\n'))
Matt Harbison
lfs: enable the extension locally after sharing a repo with 'lfs' requirement...
r35215
Matt Harbison
scmutil: teach the file prefetch hook to handle multiple commits...
r37780 def _prefetchfiles(repo, revs, match):
Matt Harbison
lfs: prefetch lfs blobs when applying merge updates...
r35940 """Ensure that required LFS blobs are present, fetching them as a group if
Matt Harbison
merge: invoke scmutil.fileprefetchhooks() prior to applying updates...
r36159 needed."""
Matt Harbison
lfs: bypass wrapped functions when reposetup() hasn't been called (issue5902)...
r38199 if not util.safehasattr(repo.svfs, 'lfslocalblobstore'):
return
Matt Harbison
lfs: prefetch lfs blobs when applying merge updates...
r35940 pointers = []
Matt Harbison
scmutil: teach the file prefetch hook to handle multiple commits...
r37780 oids = set()
Matt Harbison
lfs: prefetch lfs blobs when applying merge updates...
r35940 localstore = repo.svfs.lfslocalblobstore
Matt Harbison
scmutil: teach the file prefetch hook to handle multiple commits...
r37780 for rev in revs:
ctx = repo[rev]
for f in ctx.walk(match):
p = pointerfromctx(ctx, f)
if p and p.oid() not in oids and not localstore.has(p.oid()):
p.filename = f
pointers.append(p)
oids.add(p.oid())
Matt Harbison
lfs: prefetch lfs blobs when applying merge updates...
r35940
if pointers:
Matt Harbison
lfs: infer the blob store URL from paths.default...
r37536 # Recalculating the repo store here allows 'paths.default' that is set
# on the repo by a clone command to be used for the update.
blobstore.remote(repo).readbatch(pointers, localstore)
Matt Harbison
lfs: prefetch lfs blobs when applying merge updates...
r35940
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 def _canskipupload(repo):
Matt Harbison
lfs: bypass wrapped functions when reposetup() hasn't been called (issue5902)...
r38199 # Skip if this hasn't been passed to reposetup()
if not util.safehasattr(repo.svfs, 'lfsremoteblobstore'):
return True
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 # if remotestore is a null store, upload is a no-op and can be skipped
return isinstance(repo.svfs.lfsremoteblobstore, blobstore._nullremote)
def candownload(repo):
Matt Harbison
lfs: bypass wrapped functions when reposetup() hasn't been called (issue5902)...
r38199 # Skip if this hasn't been passed to reposetup()
if not util.safehasattr(repo.svfs, 'lfsremoteblobstore'):
return False
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 # if remotestore is a null store, downloads will lead to nothing
return not isinstance(repo.svfs.lfsremoteblobstore, blobstore._nullremote)
def uploadblobsfromrevs(repo, revs):
'''upload lfs blobs introduced by revs
Note: also used by other extensions e. g. infinitepush. avoid renaming.
'''
if _canskipupload(repo):
return
pointers = extractpointers(repo, revs)
uploadblobs(repo, pointers)
def prepush(pushop):
"""Prepush hook.
Read through the revisions to push, looking for filelog entries that can be
deserialized into metadata so that we can block the push on their upload to
the remote blobstore.
"""
return uploadblobsfromrevs(pushop.repo, pushop.outgoing.missing)
Matt Harbison
lfs: show a friendly message when pushing lfs to a server without lfs enabled...
r35522 def push(orig, repo, remote, *args, **kwargs):
Matt Harbison
lfs: infer the blob store URL from an explicit push dest or default-push...
r37582 """bail on push if the extension isn't enabled on remote when needed, and
update the remote store based on the destination path."""
Matt Harbison
lfs: show a friendly message when pushing lfs to a server without lfs enabled...
r35522 if 'lfs' in repo.requirements:
# If the remote peer is for a local repo, the requirement tests in the
# base class method enforce lfs support. Otherwise, some revisions in
# this repo use lfs, and the remote repo needs the extension loaded.
if not remote.local() and not remote.capable('lfs'):
# This is a copy of the message in exchange.push() when requirements
# are missing between local repos.
m = _("required features are not supported in the destination: %s")
raise error.Abort(m % 'lfs',
hint=_('enable the lfs extension on the server'))
Matt Harbison
lfs: infer the blob store URL from an explicit push dest or default-push...
r37582
# Repositories where this extension is disabled won't have the field.
# But if there's a requirement, then the extension must be loaded AND
# there may be blobs to push.
remotestore = repo.svfs.lfsremoteblobstore
try:
repo.svfs.lfsremoteblobstore = blobstore.remote(repo, remote.url())
return orig(repo, remote, *args, **kwargs)
finally:
repo.svfs.lfsremoteblobstore = remotestore
else:
return orig(repo, remote, *args, **kwargs)
Matt Harbison
lfs: show a friendly message when pushing lfs to a server without lfs enabled...
r35522
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 def writenewbundle(orig, ui, repo, source, filename, bundletype, outgoing,
*args, **kwargs):
"""upload LFS blobs added by outgoing revisions on 'hg bundle'"""
uploadblobsfromrevs(repo, outgoing.missing)
return orig(ui, repo, source, filename, bundletype, outgoing, *args,
**kwargs)
def extractpointers(repo, revs):
"""return a list of lfs pointers added by given revs"""
Matt Harbison
lfs: use ui.note() and ui.debug() instead of ui.write() and their flags...
r35494 repo.ui.debug('lfs: computing set of blobs to upload\n')
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 pointers = {}
for r in revs:
ctx = repo[r]
for p in pointersfromctx(ctx).values():
pointers[p.oid()] = p
Matt Harbison
lfs: add note messages indicating what store holds the lfs blob...
r35489 return sorted(pointers.values())
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097
Matt Harbison
lfs: allow a pointer to be extracted from a context that removes the file...
r36016 def pointerfromctx(ctx, f, removed=False):
Matt Harbison
lfs: factor out a method for extracting the pointer of a single file...
r35939 """return a pointer for the named file from the given changectx, or None if
Matt Harbison
lfs: allow a pointer to be extracted from a context that removes the file...
r36016 the file isn't LFS.
Optionally, the pointer for a file deleted from the context can be returned.
Since no such pointer is actually stored, and to distinguish from a non LFS
file, this pointer is represented by an empty dict.
"""
_ctx = ctx
Matt Harbison
lfs: factor out a method for extracting the pointer of a single file...
r35939 if f not in ctx:
Matt Harbison
lfs: allow a pointer to be extracted from a context that removes the file...
r36016 if not removed:
return None
if f in ctx.p1():
_ctx = ctx.p1()
elif f in ctx.p2():
_ctx = ctx.p2()
else:
return None
fctx = _ctx[f]
Matt Harbison
lfs: factor out a method for extracting the pointer of a single file...
r35939 if not _islfs(fctx.filelog(), fctx.filenode()):
return None
try:
Matt Harbison
lfs: allow a pointer to be extracted from a context that removes the file...
r36016 p = pointer.deserialize(fctx.rawdata())
if ctx == _ctx:
return p
return {}
Matt Harbison
lfs: factor out a method for extracting the pointer of a single file...
r35939 except pointer.InvalidPointer as ex:
raise error.Abort(_('lfs: corrupted pointer (%s@%s): %s\n')
Matt Harbison
lfs: allow a pointer to be extracted from a context that removes the file...
r36016 % (f, short(_ctx.node()), ex))
Matt Harbison
lfs: factor out a method for extracting the pointer of a single file...
r35939
Matt Harbison
lfs: allow a pointer to be extracted from a context that removes the file...
r36016 def pointersfromctx(ctx, removed=False):
"""return a dict {path: pointer} for given single changectx.
If ``removed`` == True and the LFS file was removed from ``ctx``, the value
stored for the path is an empty dict.
"""
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 result = {}
for f in ctx.files():
Matt Harbison
lfs: allow a pointer to be extracted from a context that removes the file...
r36016 p = pointerfromctx(ctx, f, removed=removed)
if p is not None:
Matt Harbison
lfs: factor out a method for extracting the pointer of a single file...
r35939 result[f] = p
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 return result
def uploadblobs(repo, pointers):
"""upload given pointers from local blobstore"""
if not pointers:
return
remoteblob = repo.svfs.lfsremoteblobstore
remoteblob.writebatch(pointers, repo.svfs.lfslocalblobstore)
Boris Feld
lfs: allow to run 'debugupgraderepo' on repo with largefiles...
r35347
Matt Harbison
lfs: restore the local blob store after a repo upgrade...
r35364 def upgradefinishdatamigration(orig, ui, srcrepo, dstrepo, requirements):
orig(ui, srcrepo, dstrepo, requirements)
Matt Harbison
lfs: bypass wrapped functions when reposetup() hasn't been called (issue5902)...
r38199 # Skip if this hasn't been passed to reposetup()
if (util.safehasattr(srcrepo.svfs, 'lfslocalblobstore') and
util.safehasattr(dstrepo.svfs, 'lfslocalblobstore')):
srclfsvfs = srcrepo.svfs.lfslocalblobstore.vfs
dstlfsvfs = dstrepo.svfs.lfslocalblobstore.vfs
Matt Harbison
lfs: restore the local blob store after a repo upgrade...
r35364
Matt Harbison
lfs: bypass wrapped functions when reposetup() hasn't been called (issue5902)...
r38199 for dirpath, dirs, files in srclfsvfs.walk():
for oid in files:
ui.write(_('copying lfs blob %s\n') % oid)
lfutil.link(srclfsvfs.join(oid), dstlfsvfs.join(oid))
Matt Harbison
lfs: restore the local blob store after a repo upgrade...
r35364
Boris Feld
lfs: allow to run 'debugupgraderepo' on repo with largefiles...
r35347 def upgraderequirements(orig, repo):
reqs = orig(repo)
if 'lfs' in repo.requirements:
reqs.add('lfs')
return reqs