This is an archive of the discontinued Mercurial Phabricator instance.

mercurial/localrepo.py
3340	Same comment/question as on the previous patch: Unless the user is supposed to know what "'store' requirement" is, we should instead point to the config (or any other way of enabling the requirement we may have).

pulkit marked an inline comment as done.Aug 1 2020, 10:31 AM

pulkit added inline comments.

mercurial/localrepo.py
3340	Agreed. Fixed in updated version.

pulkit marked an inline comment as done.Aug 1 2020, 10:35 AM

pulkit updated this revision to Diff 22170.

This revision is now accepted and ready to land.Aug 2 2020, 3:53 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/localrepo.py (8 lines)
M			tests/test-share.t (6 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	21998		Jul 21 2020, 9:41 AM	★	★
Diff 2	22067		Jul 23 2020, 10:51 AM	★	★
Diff 3	22170		Aug 1 2020, 10:35 AM	★	★
Diff 4	22222	rHGdc283bc7e033927dec4ebbd7969168f1336d50db	Jul 21 2020, 8:51 AM	★	★

	Status	Author	Revision
	Closed	pulkit	D8772 localrepo: abort creating a shared repo if the source does not have store
	Closed	pulkit	D8771 localrepo: only use 'bookmarksinstore' requirement if we have 'store'

	_(			_(
	b'ignoring enabled \'format.bookmarks-in-store\' config '			b'ignoring enabled \'format.bookmarks-in-store\' config '
	b'beacuse it is incompatible with disabled '			b'beacuse it is incompatible with disabled '
	b'\'format.usestore\' config\n'			b'\'format.usestore\' config\n'
	)			)
	)			)
	dropped.add(bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT)			dropped.add(bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT)

				if b'shared' in requirements or b'relshared' in requirements:
				raise error.Abort(
				_(
				b"cannot create shared repository as source was created"
				martinvonzUnsubmitted Done Same comment/question as on the previous patch: Unless the user is supposed to know what "'store' requirement" is, we should instead point to the config (or any other way of enabling the requirement we may have). martinvonz: Same comment/question as on the previous patch: Unless the user is supposed to know what…
				pulkitAuthorUnsubmitted Done Agreed. Fixed in updated version. pulkit: Agreed. Fixed in updated version.
				b" with 'format.usestore' config disabled"
				)
				)

	return dropped			return dropped


	def filterknowncreateopts(ui, createopts):			def filterknowncreateopts(ui, createopts):
	"""Filters a dict of repo creation options against options that are known.			"""Filters a dict of repo creation options against options that are known.

	Receives a dict of repo creation options and returns a dict of those			Receives a dict of repo creation options and returns a dict of those
	options that we don't know how to handle.			options that we don't know how to handle.

	BUG: we don't get the same error when opening the shared repo pointing to it			BUG: we don't get the same error when opening the shared repo pointing to it

	$ hg -R shareoldrequires status			$ hg -R shareoldrequires status

	Explicitly kill daemons to let the test exit on Windows			Explicitly kill daemons to let the test exit on Windows

	$ killdaemons.py			$ killdaemons.py

				Test sharing a repository which was created with store requirement disable

				$ hg init nostore --config format.usestore=false
				$ hg share nostore sharednostore
				abort: cannot create shared repository as source was created with 'format.usestore' config disabled
				[255]