This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4712

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

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

Download Raw Diff

Details

Reviewers

mharbison72

Group Reviewers

hg-reviewers

Commits

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

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:12 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptSep 24 2018, 12:12 PM

Herald added a subscriber: mercurial-devel. · View Herald Transcript

indygreg added a child revision: D4713: largefiles: automatically load largefiles extension when required (BC).Sep 24 2018, 12:12 PM

LGTM, thanks.

hgext/lfs/wrapper.py
211	The convert wrapper updates .hgrc too.

Closed by commit rHGbcf72d7b1524: lfs: don't add extension to hgrc after clone or share (BC) (authored by indygreg). · Explain WhySep 26 2018, 1:24 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			hgext/lfs/__init__.py (3 lines)
M			hgext/lfs/wrapper.py (26 lines)
M			tests/test-lfs.t (6 lines)

Commit	Parents	Author	Summary	Date
		Gregory Szorc		Sep 20 2018, 6:18 PM

Status	Author	Revision
Closed	indygreg	D4727 filelog: drop _generaldelta attribute (API)
Closed	indygreg	D4726 revlog: drop emitrevisiondeltas() and associated functionality (API)
Closed	indygreg	D4725 changegroup: port to emitrevisions() (issue5976)
Closed	indygreg	D4724 wireprotov2server: port to emitrevisions()
Closed	indygreg	D4723 tests: use more complex file storage test
Closed	indygreg	D4722 revlog: new API to emit revision data
Closed	indygreg	D4721 changegroup: remove reordering control (BC)
Closed	indygreg	D4720 filelog: drop index attribute (API)
Closed	indygreg	D4719 upgrade: use rawsize() instead of revlog index
Closed	indygreg	D4718 manifest: add rawsize() proxy (API)
Closed	indygreg	D4717 upgrade: report size of backing files, not internal storage size
Closed	indygreg	D4715 filelog: store filename directly on revlog instance
Closed	indygreg	D4714 lfs: access revlog directly
Closed	indygreg	D4713 largefiles: automatically load largefiles extension when required (BC)
Closed	indygreg	D4712 lfs: don't add extension to hgrc after clone or share (BC)
Closed	indygreg	D4711 localrepo: automatically load lfs extension when required (BC)
Closed	indygreg	D4710 lfs: add repository feature denoting the use of LFS
Closed	indygreg	D4709 localrepo: define "features" on repository instances (API)
Closed	indygreg	D4708 localrepo: support writing shared file (API)
Closed	indygreg	D4707 localrepo: support shared repo creation
Closed	indygreg	D4706 localrepo: validate directories before creating any
Closed	indygreg	D4705 localrepo: add missing join()
Closed	indygreg	D4704 revlog: use proper version comparison during verify
Closed	indygreg	D4703 filelog: stop proxying checksize() (API)
Closed	indygreg	D4702 filelog: remove version attribute (API)
Closed	indygreg	D4701 verify: start to abstract file verification
Closed	indygreg	D4700 unionrepo: remove _constructmanifest()

Diff 11320

hgext/lfs/init.py

	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

	# The file list may contain removed files, so check for			# The file list may contain removed files, so check for
	# membership before assuming it is in the context.			# membership before assuming it is in the context.
	if any(f in ctx and ctx[f].islfs() for f, n in files):			if any(f in ctx and ctx[f].islfs() for f, n in files):
	self.repo.requirements.add('lfs')			self.repo.requirements.add('lfs')
	self.repo._writerequirements()			self.repo._writerequirements()

	# Permanently enable lfs locally			# Permanently enable lfs locally
	self.repo.vfs.append(			self.repo.vfs.append(
	'hgrc', util.tonativeeol('\n[extensions]\nlfs=\n'))			'hgrc', util.tonativeeol('\n[extensions]\nlfs=\n'))
				mharbison72Unsubmitted Not Done The convert wrapper updates .hgrc too. mharbison72: The convert wrapper updates .hgrc too.

	return node			return node

	sink.__class__ = lfssink			sink.__class__ = lfssink

	return sink			return sink

	def vfsinit(orig, self, othervfs):			def vfsinit(orig, self, othervfs):
	orig(self, othervfs)			orig(self, othervfs)
	# copy lfs related options			# copy lfs related options
	for k, v in othervfs.options.items():			for k, v in othervfs.options.items():
	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")

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	11320		Sep 24 2018, 12:12 PM	★	★
Diff 2	11384	rHGbcf72d7b1524d66aaae64b7d07a439fead348b73	Sep 20 2018, 6:18 PM	★	★