( )⚙ D4716 lfs: don't add extension to hgrc after clone or share (BC)

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4716

lfs: don't add extension to hgrc after clone or share (BC)
Needs RevisionPublic

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

Details

Reviewers
baymax
Group Reviewers
hg-reviewers
Summary

Now that repository loading in core supports automatically loading
the lfs extension when the "lfs" requirement is present, we no
longer need to update the .hg/hgrc of newly-created repos to load
the lfs extension!

I'm marking this as BC because it is a change in behavior. But users
should not notice unless they create an LFS repo with new Mercurial
and then attempt to use it with an old versions that doesn't support
automatic extension loading.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

indygreg created this revision.Sep 24 2018, 12:13 PM
baymax requested changes to this revision.Jan 24 2020, 12:32 PM

There seems to have been no activities on this Diff for the past 3 Months.

By policy, we are automatically moving it out of the need-review state.

Please, move it back to need-review without hesitation if this diff should still be discussed.

:baymax:need-review-idle:

This revision now requires changes to proceed.Jan 24 2020, 12:32 PM

Revision Contents
Changeset List

PathPackages
Mhgext/lfs/__init__.py (4 lines)
Mhgext/lfs/wrapper.py (26 lines)
Mtests/test-lfs.t (6 lines)

Diff 11324

hgext/lfs/__init__.py

cmdutil, cmdutil,
config, config,
context, context,
error, error,
exchange, exchange,
extensions, extensions,
filelog, filelog,
filesetlang, filesetlang,
hg,
localrepo, localrepo,
minifileset, minifileset,
node, node,
pycompat, pycompat,
registrar, registrar,
repository, repository,
revlog, revlog,
scmutil, scmutil,
revlog.REVIDX_EXTSTORED, revlog.REVIDX_EXTSTORED,
( (
wrapper.readfromstore, wrapper.readfromstore,
wrapper.writetostore, wrapper.writetostore,
wrapper.bypasscheckhash, wrapper.bypasscheckhash,
), ),
) )
wrapfunction(hg, 'clone', wrapper.hgclone)
wrapfunction(hg, 'postshare', wrapper.hgpostshare)
scmutil.fileprefetchhooks.add('lfs', wrapper._prefetchfiles) scmutil.fileprefetchhooks.add('lfs', wrapper._prefetchfiles)
# Make bundle choose changegroup3 instead of changegroup2. This affects # Make bundle choose changegroup3 instead of changegroup2. This affects
# "hg bundle" command. Note: it does not cover all bundle formats like # "hg bundle" command. Note: it does not cover all bundle formats like
# "packed1". Using "packed1" with lfs will likely cause trouble. # "packed1". Using "packed1" with lfs will likely cause trouble.
exchange._bundlespeccontentopts["v2"]["cg.version"] = "03" exchange._bundlespeccontentopts["v2"]["cg.version"] = "03"
# bundlerepo uses "vfsmod.readonlyvfs(othervfs)", we need to make sure lfs # bundlerepo uses "vfsmod.readonlyvfs(othervfs)", we need to make sure lfs

hgext/lfs/wrapper.py

if k.startswith('lfs'): if k.startswith('lfs'):
self.options[k] = v self.options[k] = v
# also copy lfs blobstores. note: this can run before reposetup, so lfs # also copy lfs blobstores. note: this can run before reposetup, so lfs
# blobstore attributes are not always ready at this time. # blobstore attributes are not always ready at this time.
for name in ['lfslocalblobstore', 'lfsremoteblobstore']: for name in ['lfslocalblobstore', 'lfsremoteblobstore']:
if util.safehasattr(othervfs, name): if util.safehasattr(othervfs, name):
setattr(self, name, getattr(othervfs, name)) setattr(self, name, getattr(othervfs, name))
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:
repo.vfs.append('hgrc',
util.tonativeeol('\n[extensions]\nlfs=\n'))
return result
def hgpostshare(orig, sourcerepo, destrepo, defaultpath=None):
orig(sourcerepo, destrepo, defaultpath=defaultpath)
# If lfs is required for this repo, permanently enable it locally
if 'lfs' in destrepo.requirements:
destrepo.vfs.append('hgrc', util.tonativeeol('\n[extensions]\nlfs=\n'))
def _prefetchfiles(repo, revs, match): def _prefetchfiles(repo, revs, match):
"""Ensure that required LFS blobs are present, fetching them as a group if """Ensure that required LFS blobs are present, fetching them as a group if
needed.""" needed."""
if not util.safehasattr(repo.svfs, 'lfslocalblobstore'): if not util.safehasattr(repo.svfs, 'lfslocalblobstore'):
return return
pointers = [] pointers = []
oids = set() oids = set()

tests/test-lfs.t

lfs: found 8e92251415339ae9b148c8da89ed5ec665905166a1ab11b09dca8fad83344738 in the local lfs store lfs: found 8e92251415339ae9b148c8da89ed5ec665905166a1ab11b09dca8fad83344738 in the local lfs store
$ cd .. $ cd ..
$ hg clone repo6 repo7 $ hg clone repo6 repo7
updating to branch default updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd repo7 $ cd repo7
$ hg config extensions --debug | grep lfs
$TESTTMP/repo7/.hg/hgrc:*: extensions.lfs= (glob)
$ cat large $ cat large
LARGE-BECAUSE-IT-IS-MORE-THAN-30-BYTES LARGE-BECAUSE-IT-IS-MORE-THAN-30-BYTES
$ cat small $ cat small
SMALL SMALL
$ cd .. $ cd ..
$ hg --config extensions.share= share repo7 sharedrepo $ hg --config extensions.share= share repo7 sharedrepo
updating working directory updating working directory
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg -R sharedrepo config extensions --debug | grep lfs $ grep lfs sharedrepo/.hg/requires
$TESTTMP/sharedrepo/.hg/hgrc:*: extensions.lfs= (glob) lfs
# Test rename and status # Test rename and status
$ hg init repo8 $ hg init repo8
$ cd repo8 $ cd repo8
$ cat >> .hg/hgrc << EOF $ cat >> .hg/hgrc << EOF
> [lfs] > [lfs]
> track=size(">10B") > track=size(">10B")