This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4710

lfs: add repository feature denoting the use of LFS
ClosedPublic

Authored by indygreg on Sep 24 2018, 12:12 PM.

Details

Reviewers
mharbison72
Group Reviewers
hg-reviewers
Commits
rHG1f7b3b980af8: lfs: add repository feature denoting the use of LFS
Summary

Whether LFS is enabled seems like a useful feature to expose. This
will also facilitate some future work around LFS feature compatibility.

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

indygreg created this revision.Sep 24 2018, 12:12 PM
mharbison72 accepted this revision.Sep 25 2018, 12:04 AM
mharbison72 added a subscriber: mharbison72.

Is it worth doing this with largefiles too? (I can follow up when this settles out- I just wasn't sure what particular future work you had in mind, since the autoload on requires works without it.)

indygreg added a comment.Sep 25 2018, 12:26 AM
In D4710#71752, @mharbison72 wrote:

Is it worth doing this with largefiles too? (I can follow up when this settles out- I just wasn't sure what particular future work you had in mind, since the autoload on requires works without it.)

Probably.

I wasn't planning on touching largefiles too much because to this point, it hasn't gotten in the way of my storage refactorings :)

mharbison72 added a comment.Sep 25 2018, 12:30 AM
In D4710#71757, @indygreg wrote:
In D4710#71752, @mharbison72 wrote:

Is it worth doing this with largefiles too? (I can follow up when this settles out- I just wasn't sure what particular future work you had in mind, since the autoload on requires works without it.)

Probably.
I wasn't planning on touching largefiles too much because to this point, it hasn't gotten in the way of my storage refactorings :)

LOL. Fair enough. I'm not worried about trying to make it as nice as LFS, I'm just testing my understanding of the planned changes.

Closed by commit rHG1f7b3b980af8: lfs: add repository feature denoting the use of LFS (authored by indygreg). · Explain WhySep 26 2018, 1:23 PM
This revision was automatically updated to reflect the committed changes.
yuja added a subscriber: yuja.Sep 28 2018, 9:56 PM

+ wrapfunction(localrepo, 'makefilestorage', wrapper.localrepomakefilestorage)

As I pointed out before, makefilestorage can't be wrapped in this way
because it's captured as REPO_INTERFACES[1][1] earlier. The easiest
workaround I can think of is to wrap the reference in REPO_INTERFACES
with lambda, so the makefilestorage is looked up by name every time.

Revision Contents
Changeset List

PathPackages
Mhgext/lfs/__init__.py (4 lines)
Mhgext/lfs/wrapper.py (7 lines)
Mmercurial/repository.py (2 lines)

Diff 11382

hgext/lfs/__init__.py

filelog, filelog,
filesetlang, filesetlang,
hg, hg,
localrepo, localrepo,
minifileset, minifileset,
node, node,
pycompat, pycompat,
registrar, registrar,
repository,
revlog, revlog,
scmutil, scmutil,
templateutil, templateutil,
upgrade, upgrade,
util, util,
vfs as vfsmod, vfs as vfsmod,
wireprotoserver, wireprotoserver,
wireprotov1server, wireprotov1server,
else: else:
s = repo.set('%n', _bin(kwargs[r'node'])) s = repo.set('%n', _bin(kwargs[r'node']))
match = repo.narrowmatch() match = repo.narrowmatch()
for ctx in s: for ctx in s:
# TODO: is there a way to just walk the files in the commit? # TODO: is there a way to just walk the files in the commit?
if any(ctx[f].islfs() for f in ctx.files() if any(ctx[f].islfs() for f in ctx.files()
if f in ctx and match(f)): if f in ctx and match(f)):
repo.requirements.add('lfs') repo.requirements.add('lfs')
repo.features.add(repository.REPO_FEATURE_LFS)
repo._writerequirements() repo._writerequirements()
repo.prepushoutgoinghooks.add('lfs', wrapper.prepush) repo.prepushoutgoinghooks.add('lfs', wrapper.prepush)
break break
ui.setconfig('hooks', 'commit.lfs', checkrequireslfs, 'lfs') ui.setconfig('hooks', 'commit.lfs', checkrequireslfs, 'lfs')
ui.setconfig('hooks', 'pretxnchangegroup.lfs', checkrequireslfs, 'lfs') ui.setconfig('hooks', 'pretxnchangegroup.lfs', checkrequireslfs, 'lfs')
else: else:
repo.prepushoutgoinghooks.add('lfs', wrapper.prepush) repo.prepushoutgoinghooks.add('lfs', wrapper.prepush)
wrapfunction(filelog, 'renamed', wrapper.filelogrenamed) wrapfunction(filelog, 'renamed', wrapper.filelogrenamed)
wrapfunction(filelog, 'size', wrapper.filelogsize) wrapfunction(filelog, 'size', wrapper.filelogsize)
def extsetup(ui): def extsetup(ui):
wrapfilelog(filelog.filelog) wrapfilelog(filelog.filelog)
wrapfunction = extensions.wrapfunction wrapfunction = extensions.wrapfunction
wrapfunction(localrepo, 'makefilestorage', wrapper.localrepomakefilestorage)
wrapfunction(cmdutil, '_updatecatformatter', wrapper._updatecatformatter) wrapfunction(cmdutil, '_updatecatformatter', wrapper._updatecatformatter)
wrapfunction(scmutil, 'wrapconvertsink', wrapper.convertsink) wrapfunction(scmutil, 'wrapconvertsink', wrapper.convertsink)
wrapfunction(upgrade, '_finishdatamigration', wrapfunction(upgrade, '_finishdatamigration',
wrapper.upgradefinishdatamigration) wrapper.upgradefinishdatamigration)
wrapfunction(upgrade, 'preservedrequirements', wrapfunction(upgrade, 'preservedrequirements',
wrapper.upgraderequirements) wrapper.upgraderequirements)

hgext/lfs/wrapper.py

# wrapper.py - methods wrapping core mercurial logic # wrapper.py - methods wrapping core mercurial logic
# #
# Copyright 2017 Facebook, Inc. # Copyright 2017 Facebook, Inc.
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from __future__ import absolute_import from __future__ import absolute_import
import hashlib import hashlib
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial.node import bin, hex, nullid, short from mercurial.node import bin, hex, nullid, short
from mercurial import ( from mercurial import (
error, error,
repository,
revlog, revlog,
util, util,
) )
from mercurial.utils import ( from mercurial.utils import (
stringutil, stringutil,
) )
from ..largefiles import lfutil from ..largefiles import lfutil
from . import ( from . import (
blobstore, blobstore,
pointer, pointer,
) )
def localrepomakefilestorage(orig, requirements, features, **kwargs):
if b'lfs' in requirements:
features.add(repository.REPO_FEATURE_LFS)
return orig(requirements=requirements, features=features, **kwargs)
def allsupportedversions(orig, ui): def allsupportedversions(orig, ui):
versions = orig(ui) versions = orig(ui)
versions.add('03') versions.add('03')
return versions return versions
def _capabilities(orig, repo, proto): def _capabilities(orig, repo, proto):
'''Wrap server command to announce lfs server capability''' '''Wrap server command to announce lfs server capability'''
caps = orig(repo, proto) caps = orig(repo, proto)

mercurial/repository.py

NARROW_REQUIREMENT = 'narrowhg-experimental' NARROW_REQUIREMENT = 'narrowhg-experimental'
# Local repository feature string. # Local repository feature string.
# Revlogs are being used for file storage. # Revlogs are being used for file storage.
REPO_FEATURE_REVLOG_FILE_STORAGE = b'revlogfilestorage' REPO_FEATURE_REVLOG_FILE_STORAGE = b'revlogfilestorage'
# The storage part of the repository is shared from an external source. # The storage part of the repository is shared from an external source.
REPO_FEATURE_SHARED_STORAGE = b'sharedstore' REPO_FEATURE_SHARED_STORAGE = b'sharedstore'
# LFS supported for backing file storage.
REPO_FEATURE_LFS = b'lfs'
class ipeerconnection(interfaceutil.Interface): class ipeerconnection(interfaceutil.Interface):
"""Represents a "connection" to a repository. """Represents a "connection" to a repository.
This is the base interface for representing a connection to a repository. This is the base interface for representing a connection to a repository.
It holds basic properties and methods applicable to all peer types. It holds basic properties and methods applicable to all peer types.
This is not a complete interface definition and should not be used This is not a complete interface definition and should not be used