This is an archive of the discontinued Mercurial Phabricator instance.

clone: use "official" API to create local clone destination
ClosedPublic

Authored by marmoute on Jun 9 2021, 10:37 AM.

Download Raw Diff

Details

Reviewers

pulkit
Alphare

Group Reviewers

hg-reviewers

Commits

rHGd1c1fd7ac46d: clone: use "official" API to create local clone destination

Summary

This make sure we have a properly created, fully functional repository early.
This will be useful to simply the hardlink/copy phases of the local clone to
make it share more of its logic with the similar "stream" cloning.

This has a minor impact of the test and the resulting repository has is better initialized (eg: the wcache directory is pre-created.)

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

marmoute created this revision.Jun 9 2021, 10:37 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptJun 9 2021, 10:37 AM

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

marmoute added a child revision: D10851: vfs: add a `register_file` method on the vfs class.Jun 9 2021, 10:37 AM

pulkit accepted this revision.Jun 14 2021, 4:42 PM

This revision is now accepted and ready to land.Jun 14 2021, 4:42 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

Alphare accepted this revision.Jun 16 2021, 3:56 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

marmoute added a commit: rHGd1c1fd7ac46d: clone: use "official" API to create local clone destination.Jun 21 2021, 11:13 AM

Closed by commit rHGd1c1fd7ac46d: clone: use "official" API to create local clone destination (authored by marmoute). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/hg.py (23 lines)
M			tests/test-empty.t (1 line)
M			tests/test-extension.t (1 line)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	28527		Jun 9 2021, 10:37 AM	★	★
Diff 2	28572		Jun 15 2021, 10:23 AM	★	★
Diff 3	28620		Jun 21 2021, 1:09 AM	★	★
Diff 4	28650	rHGd1c1fd7ac46dbf46f8467486f55c13bc7ba097ad	Jun 8 2021, 7:10 PM	★	★

Status	Author	Revision
Closed	marmoute	D10869 censor: implement censoring for revlogv2
Closed	marmoute	D10887 deltas: at a `target_rev` parameter to finddeltainfo
Closed	marmoute	D10868 revlog: list older-but-still-around file in `files`
Closed	marmoute	D10867 revlog: add docket method to request new content files
Closed	marmoute	D10866 revlog: add a way to keep track of older uids in the docket
Closed	marmoute	D10889 revlog: factor the logic to determine the delta compression out
Closed	marmoute	D10865 nodemap: fix some comment formatting
Closed	marmoute	D10858 revlogv2: fix `hg verify` with revlog v2
Closed	marmoute	D10857 revlogv2: also test that local clone works
Closed	marmoute	D10856 clone: also report the bookmark file as copied
Closed	marmoute	D10855 clone: reuse the stream clone logic for local clone
Closed	marmoute	D10854 copyfiles: add a way to relax the file system checking for hardlink
Closed	marmoute	D10853 copyfile: add a option callback for failed hardlinking
Closed	marmoute	D10852 streamingclone: extract the scanning part from the generation part
Closed	marmoute	D10851 vfs: add a `register_file` method on the vfs class
Closed	marmoute	D10850 clone: use "official" API to create local clone destination
Closed	marmoute	D10849 localrepo: introduce a clone_requirements function
Closed	marmoute	D10848 createrepository: allow to directly pass the target requirements
Abandoned	marmoute	D10847 copyfile: add overlay in the whitelist for hardlink
Closed	marmoute	D10846 transaction: simplify `undo.backupfiles` file creation with a variable
Closed	marmoute	D10845 transaction: narrow the error filtering when failing to rename undo file
Closed	marmoute	D10844 transaction: clarify a conditionnal about version check
Closed	marmoute	D10843 transaction: extract message about different version in a constants
Closed	marmoute	D10842 transaction: explain why some recovery failed
Closed	marmoute	D10841 copyfiles: deal with existing file when hardlinking
Closed	marmoute	D10840 clone: cleanup the "cleanup dir" logic used during local clone

Diff 28650

mercurial/hg.py

	# not pointed to by changesets, thus causing verify to			# not pointed to by changesets, thus causing verify to
	# fail			# fail
	srclock = srcrepo.lock(wait=False)			srclock = srcrepo.lock(wait=False)
	except error.LockError:			except error.LockError:
	copy = False			copy = False

	if copy:			if copy:
	srcrepo.hook(b'preoutgoing', throw=True, source=b'clone')			srcrepo.hook(b'preoutgoing', throw=True, source=b'clone')
	hgdir = os.path.realpath(os.path.join(dest, b".hg"))
	if not os.path.exists(dest):			destrootpath = urlutil.urllocalpath(dest)
	util.makedirs(dest)			dest_reqs = localrepo.clone_requirements(ui, createopts, srcrepo)
	try:			localrepo.createrepository(
	destpath = hgdir			ui,
	util.makedir(destpath, notindexed=True)			destrootpath,
	except OSError as inst:			requirements=dest_reqs,
	if inst.errno == errno.EEXIST:
	cleandir = None
	raise error.Abort(
	_(b"destination '%s' already exists") % dest
	)			)
	raise			destrepo = localrepo.makelocalrepository(ui, destrootpath)

				destpath = destrepo.vfs.base
	destlock = copystore(ui, srcrepo, destpath)			destlock = copystore(ui, srcrepo, destpath)
	# copy bookmarks over			# copy bookmarks over
	srcbookmarks = srcrepo.vfs.join(b'bookmarks')			srcbookmarks = srcrepo.vfs.join(b'bookmarks')
	dstbookmarks = os.path.join(destpath, b'bookmarks')			dstbookmarks = os.path.join(destpath, b'bookmarks')
	if os.path.exists(srcbookmarks):			if os.path.exists(srcbookmarks):
	util.copyfile(srcbookmarks, dstbookmarks)			util.copyfile(srcbookmarks, dstbookmarks)

	dstcachedir = os.path.join(destpath, b'cache')			dstcachedir = os.path.join(destpath, b'cache')

tests/test-empty.t

	checking files			checking files
	checked 0 changesets with 0 changes to 0 files			checked 0 changesets with 0 changes to 0 files
	$ ls .hg			$ ls .hg
	00changelog.i			00changelog.i
	cache			cache
	hgrc			hgrc
	requires			requires
	store			store
				wcache

	Should be empty:			Should be empty:

	$ ls .hg/store			$ ls .hg/store

	$ cd ..			$ cd ..

tests/test-extension.t

	uisetup called (no-chg !)			uisetup called (no-chg !)
	uisetup called [status] (no-chg !)			uisetup called [status] (no-chg !)
	uipopulate called (1 times)			uipopulate called (1 times)
	uipopulate called (1 times) (chg !)			uipopulate called (1 times) (chg !)
	uipopulate called (1 times)			uipopulate called (1 times)
	reposetup called for a			reposetup called for a
	ui == repo.ui			ui == repo.ui
	uipopulate called (1 times)			uipopulate called (1 times)
				uipopulate called (1 times)
	reposetup called for b			reposetup called for b
	ui == repo.ui			ui == repo.ui
	updating to branch default			updating to branch default
	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 bar			$ hg bar
	uisetup called (no-chg !)			uisetup called (no-chg !)
	uisetup called [status] (no-chg !)			uisetup called [status] (no-chg !)