However, this patch does not demonstrate a bug, but fixes one (that I had to check does exist). For the commit message to make sense, either split it in two patches, or update the message. Also, could you base this on stable instead? This is a bugfix and should go in the next minor release.

This revision now requires changes to proceed.Nov 24 2021, 6:07 AM

The patch does consist of two commits. I was under assumption that this is the way to review chains of commits. Should I in the future create a separate phabricator revision for each commit?

Oh. I've never seen this "squashed" presentation before. It does show 2 commits, but is useless in telling me the contents of either or their message. We usually send the stack we're working on with hg phabsend -r a::b, which creates linked diffs, one for each changeset.

Indeed. You can see the diff history on the "History" tab, but I'm guessing it only coincides with the commits because I pushed them one by one.

aalekseyev updated this revision to Diff 31168.Nov 26 2021, 1:57 PM

I rebased to the stable branch. I did hg phabsend --fold again to avoid changing things. Let me know if you'd like me to re-do the phabsend.

Looks like this results in a single commit as well on the import, please re-send unfolded.

This revision now requires changes to proceed.Nov 29 2021, 6:10 AM

aalekseyev updated this revision to Diff 31174.Nov 29 2021, 6:24 AM

Trying to send this, I get:

$ hg update 356d27775359
$ hg phabsend .^ .
D11766 - updated - 48486:e53ef79cd9d5 "sparse: demonstrate a bug when used with safe-share"
abort: Conduit Error (ERR-CONDUIT-CORE): Graph cycle detected (type=5, cycle=PHID-DREV-z7jbc5yf2jun6v2pbnqj, PHID-DREV-z7jbc5yf2jun6v2pbnqj).
EXIT STATUS 255

@Alphare, I re-created the commit and was able to make a phabricator revision https://phab.mercurial-scm.org/D11817.

I took the liberty of assigning this as the parent of D11817 as if you did the phabsend of the range, this way it's more obvious for other reviewers/archival reasons. You can see the stack tab appeared

This revision is now accepted and ready to land.Nov 29 2021, 7:46 AM

Thanks!

aalekseyev added a commit: rHG50330d481640: sparse: demonstrate a bug when used with safe-share.Dec 17 2021, 8:10 AM

Closed by commit rHG50330d481640: sparse: demonstrate a bug when used with safe-share (authored by aalekseyev). · Explain Why

This revision was automatically updated to reflect the committed changes.

			Path	Packages
M			mercurial/sparse.py (2 lines)
A	M		tests/test-sparse-with-safe-share.t (23 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	31083		Nov 16 2021, 12:36 PM	★	★
Diff 2	31086		Nov 18 2021, 9:27 AM	★	★
Diff 3	31168		Nov 26 2021, 1:57 PM	★	★
Diff 4	31174		Nov 29 2021, 6:24 AM	★	★
Diff 5	31527	rHG50330d4816407db7e4ab5a853806de170470ef1a	Nov 16 2021, 12:35 PM	★	★

	Status	Author	Revision
	Closed	aalekseyev	D11817 sparse: lock the store when updating requirements config
	Closed	aalekseyev	D11766 sparse: demonstrate a bug when used with safe-share

	usereporootpaths=False,			usereporootpaths=False,
	):			):
	"""Perform a sparse config update.			"""Perform a sparse config update.

	Only one of the actions may be performed.			Only one of the actions may be performed.

	The new config is written out and a working directory refresh is performed.			The new config is written out and a working directory refresh is performed.
	"""			"""
	with repo.wlock(), repo.dirstate.parentchange():			with repo.wlock(), repo.lock(), repo.dirstate.parentchange():
	raw = repo.vfs.tryread(b'sparse')			raw = repo.vfs.tryread(b'sparse')
	oldinclude, oldexclude, oldprofiles = parseconfig(			oldinclude, oldexclude, oldprofiles = parseconfig(
	repo.ui, raw, b'sparse'			repo.ui, raw, b'sparse'
	)			)

	if reset:			if reset:
	newinclude = set()			newinclude = set()
	newexclude = set()			newexclude = set()

				Same with share-safe

				$ echo "[format]" >> $HGRCPATH
				$ echo "use-share-safe = True" >> $HGRCPATH

				$ cd $TESTTMP

				$ hg init myrepo
				$ cd myrepo
				$ cat > .hg/hgrc <<EOF
				> [extensions]
				> sparse=
				> EOF

				$ echo a > show
				$ echo x > hide
				$ hg ci -Aqm 'initial'

				Regression test: checks that this command correctly locks the store
				before updating the store [requirements] config.

				$ hg up -q 0
				$ hg debugsparse --include 'hide'

This is an archive of the discontinued Mercurial Phabricator instance.

sparse: demonstrate a bug when used with safe-share
ClosedPublic

Details

Diff Detail

Event Timeline

Revision Contents
Changeset List

Diff 31168

mercurial/sparse.py

tests/test-sparse-with-safe-share.t