This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5253

remotefilelog: avoid accessing repo instance after dispatch
ClosedPublic

Authored by martinvonz on Nov 9 2018, 2:28 PM.

Download Raw Diff

Details

Reviewers

None

Group Reviewers

hg-reviewers

Commits

rHG157f0e29eaa3: remotefilelog: avoid accessing repo instance after dispatch

Summary

Upstream commit c5e6c1ba1c79 (hg: don't reuse repo instance after
unshare(), 2018-09-12) poisoned the repo instance after
unshare(). That made hg unshare fail with remotefilelog because we
tried to close the fileserverclient after dispatch by accessing it via
the repo. This patch fixes that by storing the reference to the
fileserverclient at the beginning of dispatch.

An analogous patch was sent for remotefilelog version in FB's
hg-experimental as D5246.

Diff Detail

Repository

rHG Mercurial

Lint

Lint Skipped

Unit

Unit Tests Skipped

Event Timeline

martinvonz created this revision.Nov 9 2018, 2:28 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptNov 9 2018, 2:28 PM

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

martinvonz updated this revision to Diff 12496.Nov 9 2018, 3:31 PM

Closed by commit rHG157f0e29eaa3: remotefilelog: avoid accessing repo instance after dispatch (authored by martinvonz). · Explain WhyNov 9 2018, 9:17 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			hgext/remotefilelog/__init__.py (13 lines)
M			tests/test-remotefilelog-share.t (1 line)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	12491		Nov 9 2018, 2:28 PM	★	★
Diff 2	12496		Nov 9 2018, 3:31 PM	★	★
Diff 3	12500	rHG157f0e29eaa35adc2488709f5c00f2865a4d5361	Nov 9 2018, 1:47 PM	★	★

Commit	Parents	Author	Summary	Date
		Martin von Zweigbergk		Nov 9 2018, 1:47 PM

Status	Author	Revision
Closed	martinvonz	D5253 remotefilelog: avoid accessing repo instance after dispatch
Closed	martinvonz	D5252 share: avoid a now-unnecessary reload of the repo
Closed	martinvonz	D5251 share: reload repo after adjusting it in postshare()
Closed	martinvonz	D5250 tests: don't load strip extension via mq extension for remotefilelog tests
Closed	martinvonz	D5249 remotefilelog: remove unused configs for {data,history}pack version
Closed	martinvonz	D5248 tests: remove obsolete PYTHONPATH override from remotefilelog tests
Closed	martinvonz	D5247 tests: drop obsolete "hginit" alias in remotefilelog tests

Diff 12496

hgext/remotefilelog/init.py

	# batch fetch the needed files from the server			# batch fetch the needed files from the server
	repo.fileservice.prefetch(files)			repo.fileservice.prefetch(files)
	return missing			return missing
	extensions.wrapfunction(copies, '_computeforwardmissing',			extensions.wrapfunction(copies, '_computeforwardmissing',
	computeforwardmissing)			computeforwardmissing)

	# close cache miss server connection after the command has finished			# close cache miss server connection after the command has finished
	def runcommand(orig, lui, repo, args, *kwargs):			def runcommand(orig, lui, repo, args, *kwargs):
	try:			fileservice = None
	return orig(lui, repo, args, *kwargs)
	finally:
	# repo can be None when running in chg:			# repo can be None when running in chg:
	# - at startup, reposetup was called because serve is not norepo			# - at startup, reposetup was called because serve is not norepo
	# - a norepo command like "help" is called			# - a norepo command like "help" is called
	if repo and isenabled(repo):			if repo and isenabled(repo):
	repo.fileservice.close()			fileservice = repo.fileservice
				try:
				return orig(lui, repo, args, *kwargs)
				finally:
				if fileservice:
				fileservice.close()
	extensions.wrapfunction(dispatch, 'runcommand', runcommand)			extensions.wrapfunction(dispatch, 'runcommand', runcommand)

	# disappointing hacks below			# disappointing hacks below
	templatekw.getrenamedfn = getrenamedfn			templatekw.getrenamedfn = getrenamedfn
	extensions.wrapfunction(revset, 'filelog', filelogrevset)			extensions.wrapfunction(revset, 'filelog', filelogrevset)
	revset.symbols['filelog'] = revset.filelog			revset.symbols['filelog'] = revset.filelog
	extensions.wrapfunction(cmdutil, 'walkfilerevs', walkfilerevs)			extensions.wrapfunction(cmdutil, 'walkfilerevs', walkfilerevs)

tests/test-remotefilelog-share.t


	$ cd ..			$ cd ..


	$ hgcloneshallow ssh://user@dummy/master source --noupdate -q			$ hgcloneshallow ssh://user@dummy/master source --noupdate -q
	$ hg share source dest			$ hg share source dest
	updating working directory			updating working directory
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg -R dest unshare