This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1762

update: support updating to hidden cset if directaccess config is set
ClosedPublic

Authored by pulkit on Dec 26 2017, 2:16 PM.

Download Raw Diff

Details

Reviewers

yuja

Group Reviewers

hg-reviewers

Commits

rHG02fdb8c018aa: update: support updating to hidden cset if directaccess config is set

Summary

This patch adds support for updating to a hidden changeset without using
--hidden if experimental.directacces=True is set. The update command will
print out a warning when updating to a hidden changeset saying:

`updating to a hidden changeset <hash>`

The warning is also printed when directaccess is not used and --hidden is
passed which I think is good behaviour. Tests are added for the directaccess
part and updated output of tests which have case of updating to hidden cset
using --hidden.

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

pulkit created this revision.Dec 26 2017, 2:16 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptDec 26 2017, 2:16 PM

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

pulkit added a child revision: D1763: revert: support reverting to hidden cset if directaccess config is set.Dec 26 2017, 2:16 PM

yuja requested changes to this revision.Dec 27 2017, 7:28 AM

yuja added a subscriber: yuja.

yuja added inline comments.

mercurial/commands.py
5534	`filtername == "visible-hidden"` doesn't mean `ctx` is obsolete. Maybe we can check `ctx.hidden()`? It's probably okay to warn hidden working parent no matter if directaccess is enabled or not.

This revision now requires changes to proceed.Dec 27 2017, 7:28 AM

pulkit edited the summary of this revision. (Show Details)Dec 28 2017, 2:40 PM

pulkit updated this revision to Diff 4660.

yuja accepted this revision.Jan 4 2018, 3:49 AM

This revision is now accepted and ready to land.Jan 4 2018, 3:49 AM

Closed by commit rHG02fdb8c018aa: update: support updating to hidden cset if directaccess config is set (authored by pulkit). · Explain WhyJan 4 2018, 4:06 AM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/commands.py (6 lines)
M			tests/test-directaccess.t (9 lines)
M			tests/test-log.t (1 line)
M			tests/test-obsmarker-template.t (16 lines)
M			tests/test-obsolete.t (1 line)
M			tests/test-rebase-obsolete.t (6 lines)
M			tests/test-update-branches.t (2 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	4623		Dec 26 2017, 2:16 PM	★	★
Diff 2	4660		Dec 28 2017, 2:40 PM	★	★
Diff 3	4685	rHG02fdb8c018aacc43904c61fd078e3bcbb099eac9	Dec 26 2017, 1:44 PM	★	★

Status	Author	Revision
Closed	pulkit	D1763 revert: support reverting to hidden cset if directaccess config is set
Closed	pulkit	D1762 update: support updating to hidden cset if directaccess config is set
Closed	pulkit	D1761 scmutil: use a tuple of possible values instead of using startswith()
Closed	pulkit	D1760 commands: check for empty rev before passing to scmutil.unhidehashlikerevs

Diff 4685

mercurial/commands.py

	with repo.wlock():			with repo.wlock():
	cmdutil.clearunfinished(repo)			cmdutil.clearunfinished(repo)

	if date:			if date:
	rev = cmdutil.finddate(ui, repo, date)			rev = cmdutil.finddate(ui, repo, date)

	# if we defined a bookmark, we have to remember the original name			# if we defined a bookmark, we have to remember the original name
	brev = rev			brev = rev
	rev = scmutil.revsingle(repo, rev, rev).rev()			repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
				ctx = scmutil.revsingle(repo, rev, rev)
				rev = ctx.rev()
				if ctx.hidden():
				yujaUnsubmitted Not Done `filtername == "visible-hidden"` doesn't mean `ctx` is obsolete. Maybe we can check `ctx.hidden()`? It's probably okay to warn hidden working parent no matter if directaccess is enabled or not. yuja: `filtername == "visible-hidden"` doesn't mean `ctx` is obsolete. Maybe we can check `ctx.
				ui.warn(_("updating to a hidden changeset %s\n") % ctx.hex()[:12])

	repo.ui.setconfig('ui', 'forcemerge', tool, 'update')			repo.ui.setconfig('ui', 'forcemerge', tool, 'update')

	return hg.updatetotally(ui, repo, rev, brev, clean=clean,			return hg.updatetotally(ui, repo, rev, brev, clean=clean,
	updatecheck=updatecheck)			updatecheck=updatecheck)

	@command('verify', [])			@command('verify', [])
	def verify(ui, repo):			def verify(ui, repo):

tests/test-directaccess.t

	$ hg identify -r 28ad74			$ hg identify -r 28ad74
	28ad74487de9			28ad74487de9

	`hg status`			`hg status`

	$ hg status --change 28ad74			$ hg status --change 28ad74
	A c			A c

				`hg update`

				$ hg up 28ad74
				updating to a hidden changeset 28ad74487de9
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved

				$ hg up 3
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved

	Commands with undefined cmdtype should not work right now			Commands with undefined cmdtype should not work right now

	$ hg phase -r 28ad74			$ hg phase -r 28ad74
	abort: hidden revision '28ad74'!			abort: hidden revision '28ad74'!
	(use --hidden to access hidden revisions)			(use --hidden to access hidden revisions)
	[255]			[255]

	$ hg phase -r 2			$ hg phase -r 2
	abort: hidden revision '2'!			abort: hidden revision '2'!
	(use --hidden to access hidden revisions)			(use --hidden to access hidden revisions)
	[255]			[255]

tests/test-log.t

	$ hg log -r a			$ hg log -r a
	abort: hidden revision 'a'!			abort: hidden revision 'a'!
	(use --hidden to access hidden revisions)			(use --hidden to access hidden revisions)
	[255]			[255]

	test that parent prevent a changeset to be hidden			test that parent prevent a changeset to be hidden

	$ hg up 1 -q --hidden			$ hg up 1 -q --hidden
				updating to a hidden changeset a765632148dc
	$ hg log --template='{rev}:{node}\n'			$ hg log --template='{rev}:{node}\n'
	1:a765632148dc55d38c35c4f247c618701886cb2f			1:a765632148dc55d38c35c4f247c618701886cb2f
	0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05			0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05

	test that second parent prevent a changeset to be hidden too			test that second parent prevent a changeset to be hidden too

	$ hg debugsetparents 0 1 # nothing suitable to merge here			$ hg debugsetparents 0 1 # nothing suitable to merge here
	$ hg log --template='{rev}:{node}\n'			$ hg log --template='{rev}:{node}\n'

tests/test-obsmarker-template.t

	o changeset: 0:ea207398892e			o changeset: 0:ea207398892e
	user: test			user: test
	date: Thu Jan 01 00:00:00 1970 +0000			date: Thu Jan 01 00:00:00 1970 +0000
	summary: ROOT			summary: ROOT

	Check templates			Check templates
	---------------			---------------
	$ hg up 'desc(A0)' --hidden			$ hg up 'desc(A0)' --hidden
				updating to a hidden changeset 471f378eab4c
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved

	Predecessors template should show current revision as it is the working copy			Predecessors template should show current revision as it is the working copy
	$ hg tlog			$ hg tlog
	o d004c8f274b9			o d004c8f274b9
	\| Predecessors: 1:471f378eab4c			\| Predecessors: 1:471f378eab4c
	\| semi-colon: 1:471f378eab4c			\| semi-colon: 1:471f378eab4c
	\| json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]			\| json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
	\| summary: A0			\| summary: A0
	\|			\|
	o changeset: 0:ea207398892e			o changeset: 0:ea207398892e
	user: test			user: test
	date: Thu Jan 01 00:00:00 1970 +0000			date: Thu Jan 01 00:00:00 1970 +0000
	summary: ROOT			summary: ROOT

	$ hg up 'desc(A1)' --hidden			$ hg up 'desc(A1)' --hidden
				updating to a hidden changeset a468dc9b3633
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved

	Predecessors template should show current revision as it is the working copy			Predecessors template should show current revision as it is the working copy
	$ hg tlog			$ hg tlog
	o d004c8f274b9			o d004c8f274b9
	\| Predecessors: 2:a468dc9b3633			\| Predecessors: 2:a468dc9b3633
	\| semi-colon: 2:a468dc9b3633			\| semi-colon: 2:a468dc9b3633
	\| json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]			\| json: ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]
	user: test			user: test
	date: Thu Jan 01 00:00:00 1970 +0000			date: Thu Jan 01 00:00:00 1970 +0000
	summary: ROOT			summary: ROOT

	Check templates			Check templates
	---------------			---------------

	$ hg up 'obsolete()' --hidden			$ hg up 'obsolete()' --hidden
				updating to a hidden changeset 471597cad322
	0 files updated, 0 files merged, 0 files removed, 0 files unresolved			0 files updated, 0 files merged, 0 files removed, 0 files unresolved

	Predecessors template should show current revision as it is the working copy			Predecessors template should show current revision as it is the working copy
	$ hg tlog			$ hg tlog
	o f257fde29c7a			o f257fde29c7a
	\| Predecessors: 1:471597cad322			\| Predecessors: 1:471597cad322
	\| semi-colon: 1:471597cad322			\| semi-colon: 1:471597cad322
	\| json: ["471597cad322d1f659bb169751be9133dad92ef3"]			\| json: ["471597cad322d1f659bb169751be9133dad92ef3"]
	user: test			user: test
	date: Thu Jan 01 00:00:00 1970 +0000			date: Thu Jan 01 00:00:00 1970 +0000
	summary: ROOT			summary: ROOT

	Check templates			Check templates
	---------------			---------------

	$ hg up 'desc(A0)' --hidden			$ hg up 'desc(A0)' --hidden
				updating to a hidden changeset 471f378eab4c
	0 files updated, 0 files merged, 1 files removed, 0 files unresolved			0 files updated, 0 files merged, 1 files removed, 0 files unresolved

	Predecessors template should show current revision as it is the working copy			Predecessors template should show current revision as it is the working copy
	$ hg tlog			$ hg tlog
	o eb5a0daa2192			o eb5a0daa2192
	\| Predecessors: 1:471f378eab4c			\| Predecessors: 1:471f378eab4c
	\| semi-colon: 1:471f378eab4c			\| semi-colon: 1:471f378eab4c
	\| json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]			\| json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
	\| map: 1:471f378eab4c5e25f6c77f785b27c936efb22874			\| map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
	\| @ 471f378eab4c			\| @ 471f378eab4c
	\|/ Successors: 3:eb5a0daa2192			\|/ Successors: 3:eb5a0daa2192
	\| multi-line: 3:eb5a0daa2192			\| multi-line: 3:eb5a0daa2192
	\| json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]			\| json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
	o ea207398892e			o ea207398892e


	$ hg fatelog			$ hg fatelog
	o eb5a0daa2192			o eb5a0daa2192
	\|			\|
	\| @ 471f378eab4c			\| @ 471f378eab4c
	\|/ Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);			\|/ Obsfate: rewritten as 3:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
	o ea207398892e			o ea207398892e

	$ hg up 'desc(B0)' --hidden			$ hg up 'desc(B0)' --hidden
				updating to a hidden changeset 0dec01379d3b
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved

	Predecessors template should show both predecessors as they should be both			Predecessors template should show both predecessors as they should be both
	displayed			displayed
	$ hg tlog			$ hg tlog
	o eb5a0daa2192			o eb5a0daa2192
	\| Predecessors: 2:0dec01379d3b 1:471f378eab4c			\| Predecessors: 2:0dec01379d3b 1:471f378eab4c
	\| semi-colon: 2:0dec01379d3b; 1:471f378eab4c			\| semi-colon: 2:0dec01379d3b; 1:471f378eab4c
	\| summary: A0			\| summary: A0
	\|			\|
	o changeset: 0:ea207398892e			o changeset: 0:ea207398892e
	user: test			user: test
	date: Thu Jan 01 00:00:00 1970 +0000			date: Thu Jan 01 00:00:00 1970 +0000
	summary: ROOT			summary: ROOT

	$ hg update --hidden 'desc(A0)'			$ hg update --hidden 'desc(A0)'
				updating to a hidden changeset 471f378eab4c
	0 files updated, 0 files merged, 0 files removed, 0 files unresolved			0 files updated, 0 files merged, 0 files removed, 0 files unresolved
	$ hg commit --amend -m "A2"			$ hg commit --amend -m "A2"
	$ hg log --hidden -G			$ hg log --hidden -G
	@ changeset: 3:65b757b745b9			@ changeset: 3:65b757b745b9
	\| tag: tip			\| tag: tip
	\| parent: 0:ea207398892e			\| parent: 0:ea207398892e
	\| user: test			\| user: test
	\| date: Thu Jan 01 00:00:00 1970 +0000			\| date: Thu Jan 01 00:00:00 1970 +0000
	date: Thu Jan 01 00:00:00 1970 +0000			date: Thu Jan 01 00:00:00 1970 +0000
	summary: ROOT			summary: ROOT


	Check templates			Check templates
	---------------			---------------

	$ hg up 'desc(A0)' --hidden			$ hg up 'desc(A0)' --hidden
				updating to a hidden changeset 471f378eab4c
	0 files updated, 0 files merged, 0 files removed, 0 files unresolved			0 files updated, 0 files merged, 0 files removed, 0 files unresolved

	Predecessors template should show current revision as it is the working copy			Predecessors template should show current revision as it is the working copy
	$ hg tlog			$ hg tlog
	* 019fadeab383			* 019fadeab383
	\| Predecessors: 1:471f378eab4c			\| Predecessors: 1:471f378eab4c
	\| semi-colon: 1:471f378eab4c			\| semi-colon: 1:471f378eab4c
	\| json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]			\| json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
	user: test			user: test
	date: Thu Jan 01 00:00:00 1970 +0000			date: Thu Jan 01 00:00:00 1970 +0000
	summary: ROOT			summary: ROOT

	Check templates			Check templates
	---------------			---------------

	$ hg up 'desc(A0)' --hidden			$ hg up 'desc(A0)' --hidden
				updating to a hidden changeset 471f378eab4c
	0 files updated, 0 files merged, 1 files removed, 0 files unresolved			0 files updated, 0 files merged, 1 files removed, 0 files unresolved

	Predecessors template should show current revision as it is the working copy			Predecessors template should show current revision as it is the working copy
	$ hg tlog			$ hg tlog
	o eb5a0daa2192			o eb5a0daa2192
	\| Predecessors: 1:471f378eab4c			\| Predecessors: 1:471f378eab4c
	\| semi-colon: 1:471f378eab4c			\| semi-colon: 1:471f378eab4c
	\| json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]			\| json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
	\| map: 1:471f378eab4c5e25f6c77f785b27c936efb22874			\| map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
	\| @ 471f378eab4c			\| @ 471f378eab4c
	\|/ Successors: 4:eb5a0daa2192			\|/ Successors: 4:eb5a0daa2192
	\| multi-line: 4:eb5a0daa2192			\| multi-line: 4:eb5a0daa2192
	\| json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]			\| json: [["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"]]
	o ea207398892e			o ea207398892e


	$ hg fatelog			$ hg fatelog
	o eb5a0daa2192			o eb5a0daa2192
	\|			\|
	\| @ 471f378eab4c			\| @ 471f378eab4c
	\|/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);			\|/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
	o ea207398892e			o ea207398892e

	$ hg up 'desc(B0)' --hidden			$ hg up 'desc(B0)' --hidden
				updating to a hidden changeset 0dec01379d3b
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved

	Predecessors template should both predecessors as they are visible			Predecessors template should both predecessors as they are visible
	$ hg tlog			$ hg tlog
	o eb5a0daa2192			o eb5a0daa2192
	\| Predecessors: 2:0dec01379d3b 1:471f378eab4c			\| Predecessors: 2:0dec01379d3b 1:471f378eab4c
	\| semi-colon: 2:0dec01379d3b; 1:471f378eab4c			\| semi-colon: 2:0dec01379d3b; 1:471f378eab4c
	\| json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"]			\| json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", "471f378eab4c5e25f6c77f785b27c936efb22874"]
	\|			\|
	\| @ 0dec01379d3b			\| @ 0dec01379d3b
	\| \| Obsfate: rewritten using amend as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);			\| \| Obsfate: rewritten using amend as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
	\| x 471f378eab4c			\| x 471f378eab4c
	\|/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);			\|/ Obsfate: rewritten as 4:eb5a0daa2192 by test (at 1970-01-01 00:00 +0000);
	o ea207398892e			o ea207398892e

	$ hg up 'desc(B1)' --hidden			$ hg up 'desc(B1)' --hidden
				updating to a hidden changeset b7ea6d14e664
	0 files updated, 0 files merged, 0 files removed, 0 files unresolved			0 files updated, 0 files merged, 0 files removed, 0 files unresolved

	Predecessors template should both predecessors as they are visible			Predecessors template should both predecessors as they are visible
	$ hg tlog			$ hg tlog
	o eb5a0daa2192			o eb5a0daa2192
	\| Predecessors: 1:471f378eab4c 3:b7ea6d14e664			\| Predecessors: 1:471f378eab4c 3:b7ea6d14e664
	\| semi-colon: 1:471f378eab4c; 3:b7ea6d14e664			\| semi-colon: 1:471f378eab4c; 3:b7ea6d14e664
	\| json: ["471f378eab4c5e25f6c77f785b27c936efb22874", "b7ea6d14e664bdc8922221f7992631b50da3fb07"]			\| json: ["471f378eab4c5e25f6c77f785b27c936efb22874", "b7ea6d14e664bdc8922221f7992631b50da3fb07"]

	$ hg fatelog			$ hg fatelog
	@ f897c6137566			@ f897c6137566
	\|			\|
	o ea207398892e			o ea207398892e


	$ hg up -r "desc(B0)" --hidden			$ hg up -r "desc(B0)" --hidden
				updating to a hidden changeset 0dec01379d3b
	2 files updated, 0 files merged, 1 files removed, 0 files unresolved			2 files updated, 0 files merged, 1 files removed, 0 files unresolved
	$ hg tlog			$ hg tlog
	o f897c6137566			o f897c6137566
	\| Predecessors: 2:0dec01379d3b			\| Predecessors: 2:0dec01379d3b
	\| semi-colon: 2:0dec01379d3b			\| semi-colon: 2:0dec01379d3b
	\| json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]			\| json: ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]
	\| map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5			\| map: 2:0dec01379d3be6318c470ead31b1fe7ae7cb53d5
	\| @ 0dec01379d3b			\| @ 0dec01379d3b
	\|			\|
	\| x 0dec01379d3b			\| x 0dec01379d3b
	\| \| Obsfate: [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["f897c6137566320b081514b4c7227ecc3d384b39"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["f897c6137566320b081514b4c7227ecc3d384b39"]}, {"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["471f378eab4c5e25f6c77f785b27c936efb22874"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["471f378eab4c5e25f6c77f785b27c936efb22874"]}]			\| \| Obsfate: [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["f897c6137566320b081514b4c7227ecc3d384b39"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["f897c6137566320b081514b4c7227ecc3d384b39"]}, {"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["471f378eab4c5e25f6c77f785b27c936efb22874"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["471f378eab4c5e25f6c77f785b27c936efb22874"]}]
	\| x 471f378eab4c			\| x 471f378eab4c
	\|/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]}]			\|/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["0dec01379d3be6318c470ead31b1fe7ae7cb53d5"]}]
	o ea207398892e			o ea207398892e

	$ hg up --hidden 4			$ hg up --hidden 4
				updating to a hidden changeset 9bd10a0775e4
	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 rebase -r 7 -d 8 --config extensions.rebase=			$ hg rebase -r 7 -d 8 --config extensions.rebase=
	rebasing 7:ba2ed02b0c9a "Add A,B,C"			rebasing 7:ba2ed02b0c9a "Add A,B,C"
	$ hg tlog			$ hg tlog
	* eceed8f98ffc			* eceed8f98ffc
	\| Predecessors: 4:9bd10a0775e4			\| Predecessors: 4:9bd10a0775e4
	\| semi-colon: 4:9bd10a0775e4			\| semi-colon: 4:9bd10a0775e4
	\| json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]			\| json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
	$ cd $TESTTMP/multiple-local-prune			$ cd $TESTTMP/multiple-local-prune
	$ mkcommit ROOT			$ mkcommit ROOT
	$ mkcommit A0			$ mkcommit A0
	$ hg commit --amend -m "A1"			$ hg commit --amend -m "A1"
	$ hg debugobsolete --record-parent `getid "."`			$ hg debugobsolete --record-parent `getid "."`
	obsoleted 1 changesets			obsoleted 1 changesets

	$ hg up -r "desc(A0)" --hidden			$ hg up -r "desc(A0)" --hidden
				updating to a hidden changeset 471f378eab4c
	0 files updated, 0 files merged, 0 files removed, 0 files unresolved			0 files updated, 0 files merged, 0 files removed, 0 files unresolved
	$ hg commit --amend -m "A2"			$ hg commit --amend -m "A2"
	$ hg debugobsolete --record-parent `getid "."`			$ hg debugobsolete --record-parent `getid "."`
	obsoleted 1 changesets			obsoleted 1 changesets

	Check output			Check output
	------------			------------

	$ hg up "desc(A0)" --hidden			$ hg up "desc(A0)" --hidden
				updating to a hidden changeset 471f378eab4c
	0 files updated, 0 files merged, 0 files removed, 0 files unresolved			0 files updated, 0 files merged, 0 files removed, 0 files unresolved
	$ hg tlog			$ hg tlog
	@ 471f378eab4c			@ 471f378eab4c
	\|			\|
	o ea207398892e			o ea207398892e

	# todo: the obsfate output is not ideal			# todo: the obsfate output is not ideal
	$ hg fatelog			$ hg fatelog
	user: test			user: test
	date: Thu Jan 01 00:00:00 1970 +0000			date: Thu Jan 01 00:00:00 1970 +0000
	summary: ROOT			summary: ROOT

	Check templates			Check templates
	---------------			---------------

	$ hg up 'desc("A0")' --hidden			$ hg up 'desc("A0")' --hidden
				updating to a hidden changeset 471597cad322
	0 files updated, 0 files merged, 0 files removed, 0 files unresolved			0 files updated, 0 files merged, 0 files removed, 0 files unresolved

	# todo: the obsfate output is not ideal			# todo: the obsfate output is not ideal
	$ hg fatelog			$ hg fatelog
	o 617adc3a144c			o 617adc3a144c
	\|			\|
	\| @ 471597cad322			\| @ 471597cad322
	\|/ Obsfate: pruned;			\|/ Obsfate: pruned;
	o ea207398892e			o ea207398892e

	$ hg up -r 'desc("A2")' --hidden			$ hg up -r 'desc("A2")' --hidden
				updating to a hidden changeset 0d0ef4bdf70e
	0 files updated, 0 files merged, 0 files removed, 0 files unresolved			0 files updated, 0 files merged, 0 files removed, 0 files unresolved

	$ hg fatelog --hidden			$ hg fatelog --hidden
	@ 0d0ef4bdf70e			@ 0d0ef4bdf70e
	\| Obsfate: pruned by test (at 1970-01-01 00:00 +0000);			\| Obsfate: pruned by test (at 1970-01-01 00:00 +0000);
	o 617adc3a144c			o 617adc3a144c
	\|			\|
	\| x 471597cad322			\| x 471597cad322

tests/test-obsolete.t

	97b7c2d76b1845ed3eb988cd612611e72406cef0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'babar'}			97b7c2d76b1845ed3eb988cd612611e72406cef0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'babar'}

	(test that mercurial is not confused)			(test that mercurial is not confused)

	$ hg up null --quiet # having 0 as parent prevents it to be hidden			$ hg up null --quiet # having 0 as parent prevents it to be hidden
	$ hg tip			$ hg tip
	-1:000000000000 (public) [tip ]			-1:000000000000 (public) [tip ]
	$ hg up --hidden tip --quiet			$ hg up --hidden tip --quiet
				updating to a hidden changeset 97b7c2d76b18

	Killing a single changeset with itself should fail			Killing a single changeset with itself should fail
	(simple local safeguard)			(simple local safeguard)

	$ hg debugobsolete `getid kill_me` `getid kill_me`			$ hg debugobsolete `getid kill_me` `getid kill_me`
	abort: bad obsmarker input: in-marker cycle with 97b7c2d76b1845ed3eb988cd612611e72406cef0			abort: bad obsmarker input: in-marker cycle with 97b7c2d76b1845ed3eb988cd612611e72406cef0
	[255]			[255]

tests/test-rebase-obsolete.t

	D			D


	Start rebase from a commit that is obsolete but not hidden only because it's			Start rebase from a commit that is obsolete but not hidden only because it's
	a working copy parent. We should be moved back to the starting commit as usual			a working copy parent. We should be moved back to the starting commit as usual
	even though it is hidden (until we're moved there).			even though it is hidden (until we're moved there).

	$ hg --hidden up -qr 'first(hidden())'			$ hg --hidden up -qr 'first(hidden())'
				updating to a hidden changeset 42ccdea3bb16
	$ hg rebase --rev 13 --dest 15			$ hg rebase --rev 13 --dest 15
	rebasing 13:98f6af4ee953 "C"			rebasing 13:98f6af4ee953 "C"
	$ hg log -G			$ hg log -G
	o 16:294a2b93eb4d C			o 16:294a2b93eb4d C
	\|			\|
	o 15:627d46148090 D			o 15:627d46148090 D
	\|			\|
	\| o 12:462a34d07e59 B			\| o 12:462a34d07e59 B
	o \| 1:42ccdea3bb16 B			o \| 1:42ccdea3bb16 B
	\|/			\|/
	o 0:cd010b8cd998 A			o 0:cd010b8cd998 A


	Test hidden changesets in the rebase set (issue4504)			Test hidden changesets in the rebase set (issue4504)

	$ hg up --hidden 9			$ hg up --hidden 9
				updating to a hidden changeset 4bde274eefcf
	3 files updated, 0 files merged, 1 files removed, 0 files unresolved			3 files updated, 0 files merged, 1 files removed, 0 files unresolved
	$ echo J > J			$ echo J > J
	$ hg add J			$ hg add J
	$ hg commit -m J			$ hg commit -m J
	$ hg debugobsolete `hg log --rev . -T '{node}'`			$ hg debugobsolete `hg log --rev . -T '{node}'`
	obsoleted 1 changesets			obsoleted 1 changesets

	$ hg rebase --rev .~1::. --dest 'max(desc(D))' --traceback --config experimental.rebaseskipobsolete=off			$ hg rebase --rev .~1::. --dest 'max(desc(D))' --traceback --config experimental.rebaseskipobsolete=off
	$ hg add A			$ hg add A
	$ hg commit -m A			$ hg commit -m A
	$ echo B > B			$ echo B > B
	$ hg add B			$ hg add B
	$ hg commit -m B0			$ hg commit -m B0
	$ hg commit --amend -m B1			$ hg commit --amend -m B1
	$ hg commit --amend -m B2			$ hg commit --amend -m B2
	$ hg up --hidden 'desc(B0)'			$ hg up --hidden 'desc(B0)'
				updating to a hidden changeset a8b11f55fb19
	0 files updated, 0 files merged, 0 files removed, 0 files unresolved			0 files updated, 0 files merged, 0 files removed, 0 files unresolved
	$ echo C > C			$ echo C > C
	$ hg add C			$ hg add C
	$ hg commit -m C			$ hg commit -m C
	$ hg log -G			$ hg log -G
	@ 4:212cb178bcbb C			@ 4:212cb178bcbb C
	\|			\|
	\| o 3:261e70097290 B2			\| o 3:261e70097290 B2
	\| \|			\| \|
	x \| 1:a8b11f55fb19 B0 (rewritten using amend as 3:261e70097290)			x \| 1:a8b11f55fb19 B0 (rewritten using amend as 3:261e70097290)
	\|/			\|/
	o 0:4a2df7238c3b A			o 0:4a2df7238c3b A


	Rebase finds its way in a chain of marker			Rebase finds its way in a chain of marker

	$ hg rebase -d 'desc(B2)'			$ hg rebase -d 'desc(B2)'
	note: not rebasing 1:a8b11f55fb19 "B0", already in destination as 3:261e70097290 "B2"			note: not rebasing 1:a8b11f55fb19 "B0", already in destination as 3:261e70097290 "B2"
	rebasing 4:212cb178bcbb "C" (tip)			rebasing 4:212cb178bcbb "C" (tip)

	Even when the chain include missing node			Even when the chain include missing node

	$ hg up --hidden 'desc(B0)'			$ hg up --hidden 'desc(B0)'
				updating to a hidden changeset a8b11f55fb19
	0 files updated, 0 files merged, 1 files removed, 0 files unresolved			0 files updated, 0 files merged, 1 files removed, 0 files unresolved
	$ echo D > D			$ echo D > D
	$ hg add D			$ hg add D
	$ hg commit -m D			$ hg commit -m D
	$ hg --hidden strip -r 'desc(B1)'			$ hg --hidden strip -r 'desc(B1)'
	saved backup bundle to $TESTTMP/obsskip/.hg/strip-backup/86f6414ccda7-b1c452ee-backup.hg			saved backup bundle to $TESTTMP/obsskip/.hg/strip-backup/86f6414ccda7-b1c452ee-backup.hg
	$ hg log -G			$ hg log -G
	@ 5:1a79b7535141 D			@ 5:1a79b7535141 D
	$ hg commit -m "john doe"			$ hg commit -m "john doe"
	created new head			created new head
	$ hg up 10			$ hg up 10
	1 files updated, 0 files merged, 1 files removed, 0 files unresolved			1 files updated, 0 files merged, 1 files removed, 0 files unresolved
	$ echo "foo" > bar			$ echo "foo" > bar
	$ hg add bar			$ hg add bar
	$ hg commit --amend -m "10'"			$ hg commit --amend -m "10'"
	$ hg up 10 --hidden			$ hg up 10 --hidden
				updating to a hidden changeset 121d9e3bc4c6
	0 files updated, 0 files merged, 1 files removed, 0 files unresolved			0 files updated, 0 files merged, 1 files removed, 0 files unresolved
	$ echo "bar" > foo			$ echo "bar" > foo
	$ hg add foo			$ hg add foo
	$ hg commit -m "bar foo"			$ hg commit -m "bar foo"
	$ hg log -G			$ hg log -G
	@ 14:73568ab6879d bar foo			@ 14:73568ab6879d bar foo
	\|			\|
	\| o 13:77d874d096a2 10'			\| o 13:77d874d096a2 10'
	> \|/ # B/D=B			> \|/ # B/D=B
	> A			> A
	> EOS			> EOS

	$ eval `hg tags -T '{tag}={node}\n'`			$ eval `hg tags -T '{tag}={node}\n'`
	$ rm .hg/localtags			$ rm .hg/localtags

	$ hg update -q $C --hidden			$ hg update -q $C --hidden
				updating to a hidden changeset 7829726be4dc
	$ hg rebase -s $B -d $D			$ hg rebase -s $B -d $D
	rebasing 1:2ec65233581b "B"			rebasing 1:2ec65233581b "B"
	merging D			merging D
	warning: conflicts while merging D! (edit, then use 'hg resolve --mark')			warning: conflicts while merging D! (edit, then use 'hg resolve --mark')
	unresolved conflicts (see hg resolve, then hg rebase --continue)			unresolved conflicts (see hg resolve, then hg rebase --continue)
	[1]			[1]

	$ cp -R . $TESTTMP/hidden-state2			$ cp -R . $TESTTMP/hidden-state2

tests/test-update-branches.t

	moving bookmark 'bm' forward from 6efa171f091b			moving bookmark 'bm' forward from 6efa171f091b
	$ hg bookmarks			$ hg bookmarks
	* bm 5:ff252e8273df			* bm 5:ff252e8273df

	Test that 4 is detected as the no-argument destination from 3 and also moves			Test that 4 is detected as the no-argument destination from 3 and also moves
	the bookmark with it			the bookmark with it
	$ hg up --quiet 0 # we should be able to update to 3 directly			$ hg up --quiet 0 # we should be able to update to 3 directly
	$ hg up --quiet --hidden 3 # but not implemented yet.			$ hg up --quiet --hidden 3 # but not implemented yet.
				updating to a hidden changeset 6efa171f091b
	$ hg book -f bm			$ hg book -f bm
	$ hg up			$ hg up
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved
	updating bookmark bm			updating bookmark bm
	$ hg book			$ hg book
	* bm 4:d047485b3896			* bm 4:d047485b3896

	Test that 5 is detected as a valid destination from 1			Test that 5 is detected as a valid destination from 1
	$ hg up --quiet 0 # we should be able to update to 3 directly			$ hg up --quiet 0 # we should be able to update to 3 directly
	$ hg up --quiet --hidden 3 # but not implemented yet.			$ hg up --quiet --hidden 3 # but not implemented yet.
				updating to a hidden changeset 6efa171f091b
	$ hg up 5			$ hg up 5
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved

	Test that 5 is not detected as a valid destination from 2			Test that 5 is not detected as a valid destination from 2
	$ hg up --quiet 0			$ hg up --quiet 0
	$ hg up --quiet 2			$ hg up --quiet 2
	$ hg up 5			$ hg up 5
	abort: uncommitted changes			abort: uncommitted changes