This is an archive of the discontinued Mercurial Phabricator instance.

We prefix output with "remote:" so I think describing the repo as "remote" is fine. We can change this text any time. If others want to change to "destination," send a patch.

This revision is now accepted and ready to land.Oct 11 2018, 7:39 AM

Closed by commit rHG10e628a05725: push:Added keyword remote to 'repository changed while pushing' error… (authored by taapas1128). · Explain WhyOct 11 2018, 7:41 AM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/bundle2.py (12 lines)
M			tests/test-bundle2-exchange.t (6 lines)
M			tests/test-bundle2-format.t (2 lines)
M			tests/test-push-race.t (22 lines)

Diff 11800

mercurial/bundle2.py

	"""check location of bookmarks			"""check location of bookmarks

	This part is to be used to detect push race regarding bookmark, it			This part is to be used to detect push race regarding bookmark, it
	contains binary encoded (bookmark, node) tuple. If the local state does			contains binary encoded (bookmark, node) tuple. If the local state does
	not marks the one in the part, a PushRaced exception is raised			not marks the one in the part, a PushRaced exception is raised
	"""			"""
	bookdata = bookmarks.binarydecode(inpart)			bookdata = bookmarks.binarydecode(inpart)

	msgstandard = ('repository changed while pushing - please try again '			msgstandard = ('remote repository changed while pushing - please try again '
	'(bookmark "%s" move from %s to %s)')			'(bookmark "%s" move from %s to %s)')
	msgmissing = ('repository changed while pushing - please try again '			msgmissing = ('remote repository changed while pushing - please try again '
	'(bookmark "%s" is missing, expected %s)')			'(bookmark "%s" is missing, expected %s)')
	msgexist = ('repository changed while pushing - please try again '			msgexist = ('remote repository changed while pushing - please try again '
	'(bookmark "%s" set on %s, expected missing)')			'(bookmark "%s" set on %s, expected missing)')
	for book, node in bookdata:			for book, node in bookdata:
	currentnode = op.repo._bookmarks.get(book)			currentnode = op.repo._bookmarks.get(book)
	if currentnode != node:			if currentnode != node:
	if node is None:			if node is None:
	finalmsg = msgexist % (book, nodemod.short(currentnode))			finalmsg = msgexist % (book, nodemod.short(currentnode))
	elif currentnode is None:			elif currentnode is None:
	finalmsg = msgmissing % (book, nodemod.short(node))			finalmsg = msgmissing % (book, nodemod.short(node))
	while len(h) == 20:			while len(h) == 20:
	heads.append(h)			heads.append(h)
	h = inpart.read(20)			h = inpart.read(20)
	assert not h			assert not h
	# Trigger a transaction so that we are guaranteed to have the lock now.			# Trigger a transaction so that we are guaranteed to have the lock now.
	if op.ui.configbool('experimental', 'bundle2lazylocking'):			if op.ui.configbool('experimental', 'bundle2lazylocking'):
	op.gettransaction()			op.gettransaction()
	if sorted(heads) != sorted(op.repo.heads()):			if sorted(heads) != sorted(op.repo.heads()):
	raise error.PushRaced('repository changed while pushing - '			raise error.PushRaced('remote repository changed while pushing - '
	'please try again')			'please try again')

	@parthandler('check:updated-heads')			@parthandler('check:updated-heads')
	def handlecheckupdatedheads(op, inpart):			def handlecheckupdatedheads(op, inpart):
	"""check for race on the heads touched by a push			"""check for race on the heads touched by a push

	This is similar to 'check:heads' but focus on the heads actually updated			This is similar to 'check:heads' but focus on the heads actually updated
	during the push. If other activities happen on unrelated heads, it is			during the push. If other activities happen on unrelated heads, it is
	op.gettransaction()			op.gettransaction()

	currentheads = set()			currentheads = set()
	for ls in op.repo.branchmap().itervalues():			for ls in op.repo.branchmap().itervalues():
	currentheads.update(ls)			currentheads.update(ls)

	for h in heads:			for h in heads:
	if h not in currentheads:			if h not in currentheads:
	raise error.PushRaced('repository changed while pushing - '			raise error.PushRaced('remote repository changed while pushing - '
	'please try again')			'please try again')

	@parthandler('check:phases')			@parthandler('check:phases')
	def handlecheckphases(op, inpart):			def handlecheckphases(op, inpart):
	"""check that phase boundaries of the repository did not change			"""check that phase boundaries of the repository did not change

	This is used to detect a push race.			This is used to detect a push race.
	"""			"""
	phasetonodes = phases.binarydecode(inpart)			phasetonodes = phases.binarydecode(inpart)
	unfi = op.repo.unfiltered()			unfi = op.repo.unfiltered()
	cl = unfi.changelog			cl = unfi.changelog
	phasecache = unfi._phasecache			phasecache = unfi._phasecache
	msg = ('repository changed while pushing - please try again '			msg = ('remote repository changed while pushing - please try again '
	'(%s is %s expected %s)')			'(%s is %s expected %s)')
	for expectedphase, nodes in enumerate(phasetonodes):			for expectedphase, nodes in enumerate(phasetonodes):
	for n in nodes:			for n in nodes:
	actualphase = phasecache.phase(unfi, cl.rev(n))			actualphase = phasecache.phase(unfi, cl.rev(n))
	if actualphase != expectedphase:			if actualphase != expectedphase:
	finalmsg = msg % (nodemod.short(n),			finalmsg = msg % (nodemod.short(n),
	phases.phasenames[actualphase],			phases.phasenames[actualphase],
	phases.phasenames[expectedphase])			phases.phasenames[expectedphase])

tests/test-bundle2-exchange.t

	> [failpush]			> [failpush]
	> reason = race			> reason = race
	> EOF			> EOF

	$ hg -R main push other -r e7ec4e813ba6			$ hg -R main push other -r e7ec4e813ba6
	pushing to other			pushing to other
	searching for changes			searching for changes
	abort: push failed:			abort: push failed:
	'repository changed while pushing - please try again'			'remote repository changed while pushing - please try again'
	[255]			[255]

	$ hg -R main push ssh://user@dummy/other -r e7ec4e813ba6			$ hg -R main push ssh://user@dummy/other -r e7ec4e813ba6
	pushing to ssh://user@dummy/other			pushing to ssh://user@dummy/other
	searching for changes			searching for changes
	abort: push failed:			abort: push failed:
	'repository changed while pushing - please try again'			'remote repository changed while pushing - please try again'
	[255]			[255]

	$ hg -R main push http://localhost:$HGPORT2/ -r e7ec4e813ba6			$ hg -R main push http://localhost:$HGPORT2/ -r e7ec4e813ba6
	pushing to http://localhost:$HGPORT2/			pushing to http://localhost:$HGPORT2/
	searching for changes			searching for changes
	abort: push failed:			abort: push failed:
	'repository changed while pushing - please try again'			'remote repository changed while pushing - please try again'
	[255]			[255]

	Doing the actual push: hook abort			Doing the actual push: hook abort

	$ cat << EOF >> $HGRCPATH			$ cat << EOF >> $HGRCPATH
	> [failpush]			> [failpush]
	> reason =			> reason =
	> [hooks]			> [hooks]

tests/test-bundle2-format.t

	0 unread bytes			0 unread bytes

	Test push race detection			Test push race detection

	$ hg bundle2 --pushrace ../part-race.hg2			$ hg bundle2 --pushrace ../part-race.hg2

	$ hg unbundle2 < ../part-race.hg2			$ hg unbundle2 < ../part-race.hg2
	0 unread bytes			0 unread bytes
	abort: push race: repository changed while pushing - please try again			abort: push race: remote repository changed while pushing - please try again
	[255]			[255]

	Support for changegroup			Support for changegroup
	===================================			===================================

	$ hg unbundle $TESTDIR/bundles/rebase.hg			$ hg unbundle $TESTDIR/bundles/rebase.hg
	adding changesets			adding changesets
	adding manifests			adding manifests

tests/test-push-race.t

	Check the result of the push			Check the result of the push

	$ cat ./push-log			$ cat ./push-log
	pushing to ssh://user@dummy/server			pushing to ssh://user@dummy/server
	searching for changes			searching for changes
	wrote ready: $TESTTMP/readyfile			wrote ready: $TESTTMP/readyfile
	waiting on: $TESTTMP/watchfile			waiting on: $TESTTMP/watchfile
	abort: push failed:			abort: push failed:
	'repository changed while pushing - please try again'			'remote repository changed while pushing - please try again'

	$ hg -R server graph			$ hg -R server graph
	o 98217d5a1659 C-A (default)			o 98217d5a1659 C-A (default)
	\|			\|
	@ 842e2fac6304 C-ROOT (default)			@ 842e2fac6304 C-ROOT (default)


	Pushing on two different heads			Pushing on two different heads

	#if strict			#if strict
	$ cat ./push-log			$ cat ./push-log
	pushing to ssh://user@dummy/server			pushing to ssh://user@dummy/server
	searching for changes			searching for changes
	wrote ready: $TESTTMP/readyfile			wrote ready: $TESTTMP/readyfile
	waiting on: $TESTTMP/watchfile			waiting on: $TESTTMP/watchfile
	abort: push failed:			abort: push failed:
	'repository changed while pushing - please try again'			'remote repository changed while pushing - please try again'

	$ hg -R server graph			$ hg -R server graph
	o 51c544a58128 C-C (default)			o 51c544a58128 C-C (default)
	\|			\|
	o 98217d5a1659 C-A (default)			o 98217d5a1659 C-A (default)
	\|			\|
	\| o a9149a1428e2 C-B (default)			\| o a9149a1428e2 C-B (default)
	\|/			\|/
	#if strict			#if strict

	$ cat ./push-log			$ cat ./push-log
	pushing to ssh://user@dummy/server			pushing to ssh://user@dummy/server
	searching for changes			searching for changes
	wrote ready: $TESTTMP/readyfile			wrote ready: $TESTTMP/readyfile
	waiting on: $TESTTMP/watchfile			waiting on: $TESTTMP/watchfile
	abort: push failed:			abort: push failed:
	'repository changed while pushing - please try again'			'remote repository changed while pushing - please try again'

	$ hg -R server graph			$ hg -R server graph
	o d603e2c0cdd7 C-E (default)			o d603e2c0cdd7 C-E (default)
	\|			\|
	\| o 51c544a58128 C-C (default)			\| o 51c544a58128 C-C (default)
	\|/			\|/
	o 98217d5a1659 C-A (default)			o 98217d5a1659 C-A (default)
	\|			\|

	#if strict			#if strict
	$ cat ./push-log			$ cat ./push-log
	pushing to ssh://user@dummy/server			pushing to ssh://user@dummy/server
	searching for changes			searching for changes
	wrote ready: $TESTTMP/readyfile			wrote ready: $TESTTMP/readyfile
	waiting on: $TESTTMP/watchfile			waiting on: $TESTTMP/watchfile
	abort: push failed:			abort: push failed:
	'repository changed while pushing - please try again'			'remote repository changed while pushing - please try again'

	$ hg -R server graph			$ hg -R server graph
	o 75d69cba5402 C-G (default)			o 75d69cba5402 C-G (default)
	\|			\|
	o d9e379a8c432 C-F (default)			o d9e379a8c432 C-F (default)
	\|			\|
	o 51c544a58128 C-C (default)			o 51c544a58128 C-C (default)
	\|			\|
	#if strict			#if strict

	$ cat ./push-log			$ cat ./push-log
	pushing to ssh://user@dummy/server			pushing to ssh://user@dummy/server
	searching for changes			searching for changes
	wrote ready: $TESTTMP/readyfile			wrote ready: $TESTTMP/readyfile
	waiting on: $TESTTMP/watchfile			waiting on: $TESTTMP/watchfile
	abort: push failed:			abort: push failed:
	'repository changed while pushing - please try again'			'remote repository changed while pushing - please try again'

	$ hg -R server graph			$ hg -R server graph
	o b35ed749f288 C-I (my-second-test-branch)			o b35ed749f288 C-I (my-second-test-branch)
	\|			\|
	o 75d69cba5402 C-G (default)			o 75d69cba5402 C-G (default)
	\|			\|
	\| o 833be552cfe6 C-H (my-first-test-branch)			\| o 833be552cfe6 C-H (my-first-test-branch)
	\|/			\|/
	Check the result of the push			Check the result of the push

	$ cat ./push-log			$ cat ./push-log
	pushing to ssh://user@dummy/server			pushing to ssh://user@dummy/server
	searching for changes			searching for changes
	wrote ready: $TESTTMP/readyfile			wrote ready: $TESTTMP/readyfile
	waiting on: $TESTTMP/watchfile			waiting on: $TESTTMP/watchfile
	abort: push failed:			abort: push failed:
	'repository changed while pushing - please try again'			'remote repository changed while pushing - please try again'

	$ hg -R server graph			$ hg -R server graph
	o be705100c623 C-K (default)			o be705100c623 C-K (default)
	\|\			\|\
	\| o d603e2c0cdd7 C-E (default)			\| o d603e2c0cdd7 C-E (default)
	\| \|			\| \|
	o \| 59e76faf78bd C-D (default)			o \| 59e76faf78bd C-D (default)
	\| \|			\| \|
	Check the result of the push			Check the result of the push

	$ cat ./push-log			$ cat ./push-log
	pushing to ssh://user@dummy/server			pushing to ssh://user@dummy/server
	searching for changes			searching for changes
	wrote ready: $TESTTMP/readyfile			wrote ready: $TESTTMP/readyfile
	waiting on: $TESTTMP/watchfile			waiting on: $TESTTMP/watchfile
	abort: push failed:			abort: push failed:
	'repository changed while pushing - please try again'			'remote repository changed while pushing - please try again'

	$ hg -R server graph			$ hg -R server graph
	o 6fd3090135df C-M (default)			o 6fd3090135df C-M (default)
	\|			\|
	o be705100c623 C-K (default)			o be705100c623 C-K (default)
	\|\			\|\
	\| o d603e2c0cdd7 C-E (default)			\| o d603e2c0cdd7 C-E (default)
	\| \|			\| \|
	Check the result of the push			Check the result of the push

	$ cat ./push-log			$ cat ./push-log
	pushing to ssh://user@dummy/server			pushing to ssh://user@dummy/server
	searching for changes			searching for changes
	wrote ready: $TESTTMP/readyfile			wrote ready: $TESTTMP/readyfile
	waiting on: $TESTTMP/watchfile			waiting on: $TESTTMP/watchfile
	abort: push failed:			abort: push failed:
	'repository changed while pushing - please try again'			'remote repository changed while pushing - please try again'

	$ hg -R server graph			$ hg -R server graph
	o 1b58ee3f79e5 C-P (default)			o 1b58ee3f79e5 C-P (default)
	\|			\|
	o d0a85b2252a9 C-O (other)			o d0a85b2252a9 C-O (other)
	\|			\|
	o 55a6f1c01b48 C-Z (other)			o 55a6f1c01b48 C-Z (other)
	\|			\|
	Check the result of the push			Check the result of the push

	$ cat ./push-log			$ cat ./push-log
	pushing to ssh://user@dummy/server			pushing to ssh://user@dummy/server
	searching for changes			searching for changes
	wrote ready: $TESTTMP/readyfile			wrote ready: $TESTTMP/readyfile
	waiting on: $TESTTMP/watchfile			waiting on: $TESTTMP/watchfile
	abort: push failed:			abort: push failed:
	'repository changed while pushing - please try again'			'remote repository changed while pushing - please try again'

	$ hg -R server graph			$ hg -R server graph
	o de7b9e2ba3f6 C-R (other)			o de7b9e2ba3f6 C-R (other)
	\|			\|
	o 1b58ee3f79e5 C-P (default)			o 1b58ee3f79e5 C-P (default)
	\|			\|
	o d0a85b2252a9 C-O (other)			o d0a85b2252a9 C-O (other)
	\|			\|
	Check the result of the push			Check the result of the push

	$ cat ./push-log			$ cat ./push-log
	pushing to ssh://user@dummy/server			pushing to ssh://user@dummy/server
	searching for changes			searching for changes
	wrote ready: $TESTTMP/readyfile			wrote ready: $TESTTMP/readyfile
	waiting on: $TESTTMP/watchfile			waiting on: $TESTTMP/watchfile
	abort: push failed:			abort: push failed:
	'repository changed while pushing - please try again'			'remote repository changed while pushing - please try again'

	$ hg -R server debugobsolete			$ hg -R server debugobsolete
	$ hg -R server graph			$ hg -R server graph
	o a98a47d8b85b C-U (default)			o a98a47d8b85b C-U (default)
	\|			\|
	o b0ee3d6f51bc C-Q (default)			o b0ee3d6f51bc C-Q (default)
	\|			\|
	\| o 3d57ed3c1091 C-T (other)			\| o 3d57ed3c1091 C-T (other)
	Check the result of the push			Check the result of the push

	$ cat ./push-log			$ cat ./push-log
	pushing to ssh://user@dummy/server			pushing to ssh://user@dummy/server
	searching for changes			searching for changes
	wrote ready: $TESTTMP/readyfile			wrote ready: $TESTTMP/readyfile
	waiting on: $TESTTMP/watchfile			waiting on: $TESTTMP/watchfile
	abort: push failed:			abort: push failed:
	'repository changed while pushing - please try again'			'remote repository changed while pushing - please try again'

	$ hg -R server debugobsolete			$ hg -R server debugobsolete
	b0ee3d6f51bc4c0ca6d4f2907708027a6c376233 720c5163ecf64dcc6216bee2d62bf3edb1882499 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}			b0ee3d6f51bc4c0ca6d4f2907708027a6c376233 720c5163ecf64dcc6216bee2d62bf3edb1882499 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
	720c5163ecf64dcc6216bee2d62bf3edb1882499 39bc0598afe90ab18da460bafecc0fa953b77596 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}			720c5163ecf64dcc6216bee2d62bf3edb1882499 39bc0598afe90ab18da460bafecc0fa953b77596 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
	$ hg -R server graph --hidden			$ hg -R server graph --hidden
	* 39bc0598afe9 C-W (default)			* 39bc0598afe9 C-W (default)
	\|			\|
	\| * a98a47d8b85b C-U (default)			\| * a98a47d8b85b C-U (default)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	11793		Oct 10 2018, 12:37 PM	★	★
Diff 2	11800	rHG10e628a05725fb3a18a34d37043a12f122d99eee	Oct 10 2018, 6:08 PM	★	★

This is an archive of the discontinued Mercurial Phabricator instance.

push:Added keyword remote to 'repository changed while pushing' error(Issue5971)(whitespaces fixed)ClosedPublic

Details

Diff Detail

Event Timeline