This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6563

patch: use a short, fixed-size message for last line of prompt (issue6158)
ClosedPublic

Authored by spectral on Jun 20 2019, 6:09 PM.

Download Raw Diff

Details

Reviewers

None

Group Reviewers

hg-reviewers

Commits

rHGf802a75da585: patch: use a short, fixed-size message for last line of prompt (issue6158)

Summary

See issue6158 and the previous commit for examples of what might go wrong if we
have some combinations of readline version and terminal and need to wrap the
line.

Briefly: readline may not display the beginning of the last line of the prompt,
or it may print over it with the end of the prompt, making it difficult for
users to know what's going on.

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

spectral created this revision.Jun 20 2019, 6:09 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptJun 20 2019, 6:09 PM

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

spectral added a commit: rHGf802a75da585: patch: use a short, fixed-size message for last line of prompt (issue6158).Jul 8 2019, 1:06 PM

This revision was not accepted when it landed; it landed in state Needs Review.

Closed by commit rHGf802a75da585: patch: use a short, fixed-size message for last line of prompt (issue6158) (authored by spectral). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/patch.py (4 lines)
M			tests/test-absorb.t (6 lines)
M			tests/test-amend.t (6 lines)
M			tests/test-commit-interactive.t (255 lines)
M			tests/test-diff-color.t (9 lines)
M			tests/test-editor-filename.t (9 lines)
M			tests/test-keyword.t (21 lines)
M			tests/test-mq-qrefresh-interactive.t (30 lines)
M			tests/test-mq-subrepo.t (18 lines)
M			tests/test-qrecord.t (30 lines)
M			tests/test-revert-interactive.t (90 lines)
M			tests/test-shelve.t (9 lines)
M			tests/test-split.t (66 lines)

	Status	Author	Revision
	Closed	spectral	D6563 patch: use a short, fixed-size message for last line of prompt (issue6158)
	Closed	spectral	D6562 filemerge: make last line of prompts <40 english chars (issue6158)

Diff 15796

mercurial/patch.py

	"""			"""
	newpatches = None			newpatches = None
	if skipall is not None:			if skipall is not None:
	return skipall, skipfile, skipall, newpatches			return skipall, skipfile, skipall, newpatches
	if skipfile is not None:			if skipfile is not None:
	return skipfile, skipfile, skipall, newpatches			return skipfile, skipfile, skipall, newpatches
	while True:			while True:
	resps = messages['help'][operation]			resps = messages['help'][operation]
	r = ui.promptchoice("%s %s" % (query, resps))			# IMPORTANT: keep the last line of this prompt short (<40 english
				# chars is a good target) because of issue6158.
				r = ui.promptchoice("%s\n(enter ? for help) %s" % (query, resps))
	ui.write("\n")			ui.write("\n")
	if r == 8: # ?			if r == 8: # ?
	for c, t in ui.extractchoices(resps)[1]:			for c, t in ui.extractchoices(resps)[1]:
	ui.write('%s - %s\n' % (c, encoding.lower(t)))			ui.write('%s - %s\n' % (c, encoding.lower(t)))
	continue			continue
	elif r == 0: # yes			elif r == 0: # yes
	ret = True			ret = True
	elif r == 1: # no			elif r == 1: # no

tests/test-absorb.t

	99b4ae7 -			99b4ae7 -
	99b4ae7 +bla			99b4ae7 +bla

	1 changesets affected			1 changesets affected
	99b4ae7 foo			99b4ae7 foo
	$ hg absorb --dry-run --interactive --print-changes			$ hg absorb --dry-run --interactive --print-changes
	diff -r 99b4ae712f84 foo.py			diff -r 99b4ae712f84 foo.py
	1 hunks, 1 lines changed			1 hunks, 1 lines changed
	examine changes to 'foo.py'? [Ynesfdaq?] y			examine changes to 'foo.py'?
				(enter ? for help) [Ynesfdaq?] y

	@@ -1,1 +1,1 @@			@@ -1,1 +1,1 @@
	-			-
	+bla			+bla
	record this change to 'foo.py'? [Ynesfdaq?] y			record this change to 'foo.py'?
				(enter ? for help) [Ynesfdaq?] y

	showing changes for foo.py			showing changes for foo.py
	@@ -0,1 +0,1 @@			@@ -0,1 +0,1 @@
	99b4ae7 -			99b4ae7 -
	99b4ae7 +bla			99b4ae7 +bla

	1 changesets affected			1 changesets affected
	99b4ae7 foo			99b4ae7 foo

tests/test-amend.t

	$ touch F G			$ touch F G
	$ hg add F G			$ hg add F G
	$ cat <<EOS \| hg amend -i --config ui.interactive=1			$ cat <<EOS \| hg amend -i --config ui.interactive=1
	> y			> y
	> n			> n
	> EOS			> EOS
	diff --git a/F b/F			diff --git a/F b/F
	new file mode 100644			new file mode 100644
	examine changes to 'F'? [Ynesfdaq?] y			examine changes to 'F'?
				(enter ? for help) [Ynesfdaq?] y

	diff --git a/G b/G			diff --git a/G b/G
	new file mode 100644			new file mode 100644
	examine changes to 'G'? [Ynesfdaq?] n			examine changes to 'G'?
				(enter ? for help) [Ynesfdaq?] n

	saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/507be9bdac71-c8077452-amend.hg (obsstore-off !)			saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/507be9bdac71-c8077452-amend.hg (obsstore-off !)
	$ hg log -r . -T '{files}\n'			$ hg log -r . -T '{files}\n'
	B D F			B D F

	Amend in the middle of a stack			Amend in the middle of a stack

	$ hg init $TESTTMP/repo2			$ hg init $TESTTMP/repo2

tests/test-commit-interactive.t


	$ hg mv empty-rw empty-rename			$ hg mv empty-rw empty-rename
	$ hg commit -i -d '1 0' -m rename<<EOF			$ hg commit -i -d '1 0' -m rename<<EOF
	> y			> y
	> EOF			> EOF
	diff --git a/empty-rw b/empty-rename			diff --git a/empty-rw b/empty-rename
	rename from empty-rw			rename from empty-rw
	rename to empty-rename			rename to empty-rename
	examine changes to 'empty-rw' and 'empty-rename'? [Ynesfdaq?] y			examine changes to 'empty-rw' and 'empty-rename'?
				(enter ? for help) [Ynesfdaq?] y


	$ hg tip -p			$ hg tip -p
	changeset: 1:d695e8dcb197			changeset: 1:d695e8dcb197
	tag: tip			tag: tip
	user: test			user: test
	date: Thu Jan 01 00:00:01 1970 +0000			date: Thu Jan 01 00:00:01 1970 +0000
	summary: rename			summary: rename



	Copy empty file			Copy empty file

	$ hg cp empty-rename empty-copy			$ hg cp empty-rename empty-copy
	$ hg commit -i -d '2 0' -m copy<<EOF			$ hg commit -i -d '2 0' -m copy<<EOF
	> y			> y
	> EOF			> EOF
	diff --git a/empty-rename b/empty-copy			diff --git a/empty-rename b/empty-copy
	copy from empty-rename			copy from empty-rename
	copy to empty-copy			copy to empty-copy
	examine changes to 'empty-rename' and 'empty-copy'? [Ynesfdaq?] y			examine changes to 'empty-rename' and 'empty-copy'?
				(enter ? for help) [Ynesfdaq?] y


	$ hg tip -p			$ hg tip -p
	changeset: 2:1d4b90bea524			changeset: 2:1d4b90bea524
	tag: tip			tag: tip
	user: test			user: test
	date: Thu Jan 01 00:00:02 1970 +0000			date: Thu Jan 01 00:00:02 1970 +0000
	summary: copy			summary: copy



	Delete empty file			Delete empty file

	$ hg rm empty-copy			$ hg rm empty-copy
	$ hg commit -i -d '3 0' -m delete<<EOF			$ hg commit -i -d '3 0' -m delete<<EOF
	> y			> y
	> EOF			> EOF
	diff --git a/empty-copy b/empty-copy			diff --git a/empty-copy b/empty-copy
	deleted file mode 100644			deleted file mode 100644
	examine changes to 'empty-copy'? [Ynesfdaq?] y			examine changes to 'empty-copy'?
				(enter ? for help) [Ynesfdaq?] y


	$ hg tip -p			$ hg tip -p
	changeset: 3:b39a238f01a1			changeset: 3:b39a238f01a1
	tag: tip			tag: tip
	user: test			user: test
	date: Thu Jan 01 00:00:03 1970 +0000			date: Thu Jan 01 00:00:03 1970 +0000
	summary: delete			summary: delete



	Add binary file			Add binary file

	$ hg bundle --type v1 --base -2 tip.bundle			$ hg bundle --type v1 --base -2 tip.bundle
	1 changesets found			1 changesets found
	$ hg add tip.bundle			$ hg add tip.bundle
	$ hg commit -i -d '4 0' -m binary<<EOF			$ hg commit -i -d '4 0' -m binary<<EOF
	> y			> y
	> EOF			> EOF
	diff --git a/tip.bundle b/tip.bundle			diff --git a/tip.bundle b/tip.bundle
	new file mode 100644			new file mode 100644
	this is a binary file			this is a binary file
	examine changes to 'tip.bundle'? [Ynesfdaq?] y			examine changes to 'tip.bundle'?
				(enter ? for help) [Ynesfdaq?] y


	$ hg tip -p			$ hg tip -p
	changeset: 4:ad816da3711e			changeset: 4:ad816da3711e
	tag: tip			tag: tip
	user: test			user: test
	date: Thu Jan 01 00:00:04 1970 +0000			date: Thu Jan 01 00:00:04 1970 +0000
	summary: binary			summary: binary

	diff -r b39a238f01a1 -r ad816da3711e tip.bundle			diff -r b39a238f01a1 -r ad816da3711e tip.bundle
	Binary file tip.bundle has changed			Binary file tip.bundle has changed


	Change binary file			Change binary file

	$ hg bundle --base -2 --type v1 tip.bundle			$ hg bundle --base -2 --type v1 tip.bundle
	1 changesets found			1 changesets found
	$ hg commit -i -d '5 0' -m binary-change<<EOF			$ hg commit -i -d '5 0' -m binary-change<<EOF
	> y			> y
	> EOF			> EOF
	diff --git a/tip.bundle b/tip.bundle			diff --git a/tip.bundle b/tip.bundle
	this modifies a binary file (all or nothing)			this modifies a binary file (all or nothing)
	examine changes to 'tip.bundle'? [Ynesfdaq?] y			examine changes to 'tip.bundle'?
				(enter ? for help) [Ynesfdaq?] y


	$ hg tip -p			$ hg tip -p
	changeset: 5:dccd6f3eb485			changeset: 5:dccd6f3eb485
	tag: tip			tag: tip
	user: test			user: test
	date: Thu Jan 01 00:00:05 1970 +0000			date: Thu Jan 01 00:00:05 1970 +0000
	summary: binary-change			summary: binary-change
	1 changesets found			1 changesets found
	$ hg commit -i -d '6 0' -m binary-change-rename<<EOF			$ hg commit -i -d '6 0' -m binary-change-rename<<EOF
	> y			> y
	> EOF			> EOF
	diff --git a/tip.bundle b/top.bundle			diff --git a/tip.bundle b/top.bundle
	rename from tip.bundle			rename from tip.bundle
	rename to top.bundle			rename to top.bundle
	this modifies a binary file (all or nothing)			this modifies a binary file (all or nothing)
	examine changes to 'tip.bundle' and 'top.bundle'? [Ynesfdaq?] y			examine changes to 'tip.bundle' and 'top.bundle'?
				(enter ? for help) [Ynesfdaq?] y


	$ hg tip -p			$ hg tip -p
	changeset: 6:7fa44105f5b3			changeset: 6:7fa44105f5b3
	tag: tip			tag: tip
	user: test			user: test
	date: Thu Jan 01 00:00:06 1970 +0000			date: Thu Jan 01 00:00:06 1970 +0000
	summary: binary-change-rename			summary: binary-change-rename
	+3			+3
	+4			+4
	+5			+5
	+6			+6
	+7			+7
	+8			+8
	+9			+9
	+10			+10
	record this change to 'plain'? [Ynesfdaq?] y			record this change to 'plain'?
				(enter ? for help) [Ynesfdaq?] y

	$ hg tip -p			$ hg tip -p
	changeset: 7:11fb457c1be4			changeset: 7:11fb457c1be4
	tag: tip			tag: tip
	user: test			user: test
	date: Thu Jan 01 00:00:07 1970 +0000			date: Thu Jan 01 00:00:07 1970 +0000
	summary: plain			summary: plain

	> EOF			> EOF
	diff --git a/plain b/plain			diff --git a/plain b/plain
	1 hunks, 1 lines changed			1 hunks, 1 lines changed
	@@ -8,3 +8,4 @@ 7			@@ -8,3 +8,4 @@ 7
	8			8
	9			9
	10			10
	+11			+11
	record this change to 'plain'? [Ynesfdaq?] y			record this change to 'plain'?
				(enter ? for help) [Ynesfdaq?] y


	Modify end of plain file, no EOL			Modify end of plain file, no EOL

	$ hg tip --template '{node}' >> plain			$ hg tip --template '{node}' >> plain
	$ hg commit -i -d '9 0' -m noeol plain <<EOF			$ hg commit -i -d '9 0' -m noeol plain <<EOF
	> y			> y
	> y			> y
	> EOF			> EOF
	diff --git a/plain b/plain			diff --git a/plain b/plain
	1 hunks, 1 lines changed			1 hunks, 1 lines changed
	@@ -9,3 +9,4 @@ 8			@@ -9,3 +9,4 @@ 8
	9			9
	10			10
	11			11
	+7264f99c5f5ff3261504828afa4fb4d406c3af54			+7264f99c5f5ff3261504828afa4fb4d406c3af54
	\ No newline at end of file			\ No newline at end of file
	record this change to 'plain'? [Ynesfdaq?] y			record this change to 'plain'?
				(enter ? for help) [Ynesfdaq?] y


	Record showfunc should preserve function across sections			Record showfunc should preserve function across sections

	$ cat > f1.py <<NO_CHECK_EOF			$ cat > f1.py <<NO_CHECK_EOF
	> def annotate(ui, repo, pats, *opts):			> def annotate(ui, repo, pats, *opts):
	> """show changeset information by line for each file			> """show changeset information by line for each file
	>			>
	$ hg commit -i -m interactive <<EOF			$ hg commit -i -m interactive <<EOF
	> y			> y
	> y			> y
	> y			> y
	> y			> y
	> EOF			> EOF
	diff --git a/f1.py b/f1.py			diff --git a/f1.py b/f1.py
	3 hunks, 6 lines changed			3 hunks, 6 lines changed
	examine changes to 'f1.py'? [Ynesfdaq?] y			examine changes to 'f1.py'?
				(enter ? for help) [Ynesfdaq?] y

	@@ -2,8 +2,8 @@ def annotate(ui, repo, pats, *opts):			@@ -2,8 +2,8 @@ def annotate(ui, repo, pats, *opts):
	"""show changeset information by line for each file			"""show changeset information by line for each file

	List changes in files, showing the revision id responsible for			List changes in files, showing the revision id responsible for
	- each line.			- each line.
	+ each line			+ each line

	This command is useful for discovering when a change was made and			This command is useful for discovering when a change was made and
	by whom.			by whom.

	record change 1/3 to 'f1.py'? [Ynesfdaq?] y			record change 1/3 to 'f1.py'?
				(enter ? for help) [Ynesfdaq?] y

	@@ -6,11 +6,7 @@ def annotate(ui, repo, pats, *opts):			@@ -6,11 +6,7 @@ def annotate(ui, repo, pats, *opts):

	This command is useful for discovering when a change was made and			This command is useful for discovering when a change was made and
	by whom.			by whom.

	- If you include -f/-u/-d, the revision number is suppressed unless			- If you include -f/-u/-d, the revision number is suppressed unless
	- you also include -the revision number is suppressed unless			- you also include -the revision number is suppressed unless
	- you also include -n.			- you also include -n.
	-			-
	Without the -a/--text option, annotate will avoid processing files			Without the -a/--text option, annotate will avoid processing files
	it detects as binary. With -a, annotate will annotate the file			it detects as binary. With -a, annotate will annotate the file
	anyway, although the results will probably be neither useful			anyway, although the results will probably be neither useful
	record change 2/3 to 'f1.py'? [Ynesfdaq?] y			record change 2/3 to 'f1.py'?
				(enter ? for help) [Ynesfdaq?] y

	@@ -26,7 +22,7 @@ def archive(ui, repo, dest, **opts):			@@ -26,7 +22,7 @@ def archive(ui, repo, dest, **opts):
	directory; use -r/--rev to specify a different revision.			directory; use -r/--rev to specify a different revision.

	The archive type is automatically detected based on file			The archive type is automatically detected based on file
	- extension (to override, use -t/--type).			- extension (to override, use -t/--type).
	+ extension (or override using -t/--type).			+ extension (or override using -t/--type).

	.. container:: verbose			.. container:: verbose

	record change 3/3 to 'f1.py'? [Ynesfdaq?] y			record change 3/3 to 'f1.py'?
				(enter ? for help) [Ynesfdaq?] y


	Modify end of plain file, add EOL			Modify end of plain file, add EOL

	$ echo >> plain			$ echo >> plain
	$ echo 1 > plain2			$ echo 1 > plain2
	$ hg add plain2			$ hg add plain2
	$ hg commit -i -d '10 0' -m eol plain plain2 <<EOF			$ hg commit -i -d '10 0' -m eol plain plain2 <<EOF
	> y			> y
	> y			> y
	> y			> y
	> y			> y
	> EOF			> EOF
	diff --git a/plain b/plain			diff --git a/plain b/plain
	1 hunks, 1 lines changed			1 hunks, 1 lines changed
	@@ -9,4 +9,4 @@ 8			@@ -9,4 +9,4 @@ 8
	9			9
	10			10
	11			11
	-7264f99c5f5ff3261504828afa4fb4d406c3af54			-7264f99c5f5ff3261504828afa4fb4d406c3af54
	\ No newline at end of file			\ No newline at end of file
	+7264f99c5f5ff3261504828afa4fb4d406c3af54			+7264f99c5f5ff3261504828afa4fb4d406c3af54
	record change 1/2 to 'plain'? [Ynesfdaq?] y			record change 1/2 to 'plain'?
				(enter ? for help) [Ynesfdaq?] y

	diff --git a/plain2 b/plain2			diff --git a/plain2 b/plain2
	new file mode 100644			new file mode 100644
	@@ -0,0 +1,1 @@			@@ -0,0 +1,1 @@
	+1			+1
	record change 2/2 to 'plain2'? [Ynesfdaq?] y			record change 2/2 to 'plain2'?
				(enter ? for help) [Ynesfdaq?] y

	Modify beginning, trim end, record both, add another file to test			Modify beginning, trim end, record both, add another file to test
	changes numbering			changes numbering

	$ rm plain			$ rm plain
	$ for i in 2 2 3 4 5 6 7 8 9 10; do			$ for i in 2 2 3 4 5 6 7 8 9 10; do
	> echo $i >> plain			> echo $i >> plain
	> done			> done
	diff --git a/plain b/plain			diff --git a/plain b/plain
	2 hunks, 3 lines changed			2 hunks, 3 lines changed
	@@ -1,4 +1,4 @@			@@ -1,4 +1,4 @@
	-1			-1
	+2			+2
	2			2
	3			3
	4			4
	record change 1/3 to 'plain'? [Ynesfdaq?] y			record change 1/3 to 'plain'?
				(enter ? for help) [Ynesfdaq?] y

	@@ -8,5 +8,3 @@ 7			@@ -8,5 +8,3 @@ 7
	8			8
	9			9
	10			10
	-11			-11
	-7264f99c5f5ff3261504828afa4fb4d406c3af54			-7264f99c5f5ff3261504828afa4fb4d406c3af54
	record change 2/3 to 'plain'? [Ynesfdaq?] y			record change 2/3 to 'plain'?
				(enter ? for help) [Ynesfdaq?] y

	diff --git a/plain2 b/plain2			diff --git a/plain2 b/plain2
	1 hunks, 1 lines changed			1 hunks, 1 lines changed
	@@ -1,1 +1,2 @@			@@ -1,1 +1,2 @@
	1			1
	+2			+2
	record change 3/3 to 'plain2'? [Ynesfdaq?] y			record change 3/3 to 'plain2'?
				(enter ? for help) [Ynesfdaq?] y


	$ hg tip -p			$ hg tip -p
	changeset: 13:f941910cff62			changeset: 13:f941910cff62
	tag: tip			tag: tip
	user: test			user: test
	date: Thu Jan 01 00:00:10 1970 +0000			date: Thu Jan 01 00:00:10 1970 +0000
	summary: begin-and-end			summary: begin-and-end
	-2			-2
	-3			-3
	4			4
	5			5
	6			6
	7			7
	8			8
	9			9
	record change 1/2 to 'plain'? [Ynesfdaq?] n			record change 1/2 to 'plain'?
				(enter ? for help) [Ynesfdaq?] n

	@@ -4,7 +1,7 @@			@@ -4,7 +1,7 @@
	4			4
	5			5
	6			6
	7			7
	8			8
	9			9
	-10			-10
	+10.new			+10.new
	record change 2/2 to 'plain'? [Ynesfdaq?] y			record change 2/2 to 'plain'?
				(enter ? for help) [Ynesfdaq?] y


	$ hg tip -p			$ hg tip -p
	changeset: 14:4915f538659b			changeset: 14:4915f538659b
	tag: tip			tag: tip
	user: test			user: test
	date: Thu Jan 01 00:00:11 1970 +0000			date: Thu Jan 01 00:00:11 1970 +0000
	summary: end-only			summary: end-only
	1 hunks, 3 lines changed			1 hunks, 3 lines changed
	@@ -1,6 +1,3 @@			@@ -1,6 +1,3 @@
	-2			-2
	-2			-2
	-3			-3
	4			4
	5			5
	6			6
	record this change to 'plain'? [Ynesfdaq?] y			record this change to 'plain'?
				(enter ? for help) [Ynesfdaq?] y


	$ hg tip -p			$ hg tip -p
	changeset: 15:1b1f93d4b94b			changeset: 15:1b1f93d4b94b
	tag: tip			tag: tip
	user: test			user: test
	date: Thu Jan 01 00:00:12 1970 +0000			date: Thu Jan 01 00:00:12 1970 +0000
	summary: begin-only			summary: begin-only
	+2			+2
	+3			+3
	4			4
	5			5
	6			6
	7			7
	8			8
	9			9
	record change 1/2 to 'plain'? [Ynesfdaq?] n			record change 1/2 to 'plain'?
				(enter ? for help) [Ynesfdaq?] n

	@@ -1,7 +4,6 @@			@@ -1,7 +4,6 @@
	4			4
	5			5
	6			6
	7			7
	8			8
	9			9
	-10.new			-10.new
	record change 2/2 to 'plain'? [Ynesfdaq?] y			record change 2/2 to 'plain'?
				(enter ? for help) [Ynesfdaq?] y


	Add to beginning, middle, end			Add to beginning, middle, end

	$ rm plain			$ rm plain
	$ for i in 1 2 3 4 5 5.new 5.reallynew 6 7 8 9 10 11; do			$ for i in 1 2 3 4 5 5.new 5.reallynew 6 7 8 9 10 11; do
	> echo $i >> plain			> echo $i >> plain
	> done			> done

	Record beginning, middle, and test that format-breaking diffopts are ignored			Record beginning, middle, and test that format-breaking diffopts are ignored

	$ hg commit -i --config diff.noprefix=True -d '14 0' -m middle-only plain <<EOF			$ hg commit -i --config diff.noprefix=True -d '14 0' -m middle-only plain <<EOF
	> y			> y
	> y			> y
	> n			> n
	> EOF			> EOF
	diff --git a/plain b/plain			diff --git a/plain b/plain
	3 hunks, 7 lines changed			3 hunks, 7 lines changed
	@@ -1,2 +1,5 @@			@@ -1,2 +1,5 @@
	+1			+1
	+2			+2
	+3			+3
	4			4
	5			5
	record change 1/3 to 'plain'? [Ynesfdaq?] y			record change 1/3 to 'plain'?
				(enter ? for help) [Ynesfdaq?] y

	@@ -1,6 +4,8 @@			@@ -1,6 +4,8 @@
	4			4
	5			5
	+5.new			+5.new
	+5.reallynew			+5.reallynew
	6			6
	7			7
	8			8
	9			9
	record change 2/3 to 'plain'? [Ynesfdaq?] y			record change 2/3 to 'plain'?
				(enter ? for help) [Ynesfdaq?] y

	@@ -3,4 +8,6 @@			@@ -3,4 +8,6 @@
	6			6
	7			7
	8			8
	9			9
	+10			+10
	+11			+11
	record change 3/3 to 'plain'? [Ynesfdaq?] n			record change 3/3 to 'plain'?
				(enter ? for help) [Ynesfdaq?] n


	$ hg tip -p			$ hg tip -p
	changeset: 17:41cf3f5c55ae			changeset: 17:41cf3f5c55ae
	tag: tip			tag: tip
	user: test			user: test
	date: Thu Jan 01 00:00:14 1970 +0000			date: Thu Jan 01 00:00:14 1970 +0000
	summary: middle-only			summary: middle-only
	diff --git a/plain b/plain			diff --git a/plain b/plain
	1 hunks, 2 lines changed			1 hunks, 2 lines changed
	@@ -9,3 +9,5 @@ 6			@@ -9,3 +9,5 @@ 6
	7			7
	8			8
	9			9
	+10			+10
	+11			+11
	record this change to 'plain'? [Ynesfdaq?] y			record this change to 'plain'?
				(enter ? for help) [Ynesfdaq?] y


	$ hg tip -p			$ hg tip -p
	changeset: 18:58a72f46bc24			changeset: 18:58a72f46bc24
	tag: tip			tag: tip
	user: test			user: test
	date: Thu Jan 01 00:00:15 1970 +0000			date: Thu Jan 01 00:00:15 1970 +0000
	summary: end-only			summary: end-only
	$ echo a > subdir/a			$ echo a > subdir/a
	$ hg ci -d '16 0' -i subdir -Amsubdir <<EOF			$ hg ci -d '16 0' -i subdir -Amsubdir <<EOF
	> y			> y
	> y			> y
	> EOF			> EOF
	adding subdir/a			adding subdir/a
	diff --git a/subdir/a b/subdir/a			diff --git a/subdir/a b/subdir/a
	new file mode 100644			new file mode 100644
	examine changes to 'subdir/a'? [Ynesfdaq?] y			examine changes to 'subdir/a'?
				(enter ? for help) [Ynesfdaq?] y

	@@ -0,0 +1,1 @@			@@ -0,0 +1,1 @@
	+a			+a
	record this change to 'subdir/a'? [Ynesfdaq?] y			record this change to 'subdir/a'?
				(enter ? for help) [Ynesfdaq?] y

	$ cd subdir			$ cd subdir

	$ echo a >> a			$ echo a >> a
	$ hg commit -i -d '16 0' -m subdir-change a <<EOF			$ hg commit -i -d '16 0' -m subdir-change a <<EOF
	> y			> y
	> y			> y
	> EOF			> EOF
	diff --git a/subdir/a b/subdir/a			diff --git a/subdir/a b/subdir/a
	1 hunks, 1 lines changed			1 hunks, 1 lines changed
	@@ -1,1 +1,2 @@			@@ -1,1 +1,2 @@
	a			a
	+a			+a
	record this change to 'subdir/a'? [Ynesfdaq?] y			record this change to 'subdir/a'?
				(enter ? for help) [Ynesfdaq?] y


	$ hg tip -p			$ hg tip -p
	changeset: 20:e0f6b99f6c49			changeset: 20:e0f6b99f6c49
	tag: tip			tag: tip
	user: test			user: test
	date: Thu Jan 01 00:00:16 1970 +0000			date: Thu Jan 01 00:00:16 1970 +0000
	summary: subdir-change			summary: subdir-change
	Help, quit			Help, quit

	$ hg commit -i <<EOF			$ hg commit -i <<EOF
	> ?			> ?
	> q			> q
	> EOF			> EOF
	diff --git a/subdir/f1 b/subdir/f1			diff --git a/subdir/f1 b/subdir/f1
	1 hunks, 1 lines changed			1 hunks, 1 lines changed
	examine changes to 'subdir/f1'? [Ynesfdaq?] ?			examine changes to 'subdir/f1'?
				(enter ? for help) [Ynesfdaq?] ?

	y - yes, record this change			y - yes, record this change
	n - no, skip this change			n - no, skip this change
	e - edit this change manually			e - edit this change manually
	s - skip remaining changes to this file			s - skip remaining changes to this file
	f - record remaining changes to this file			f - record remaining changes to this file
	d - done, skip remaining changes and files			d - done, skip remaining changes and files
	a - record all changes to all remaining files			a - record all changes to all remaining files
	q - quit, recording no changes			q - quit, recording no changes
	? - ? (display help)			? - ? (display help)
	examine changes to 'subdir/f1'? [Ynesfdaq?] q			examine changes to 'subdir/f1'?
				(enter ? for help) [Ynesfdaq?] q

	abort: user quit			abort: user quit
	[255]			[255]

	Patterns			Patterns

	$ hg commit -i 'glob:f*' << EOF			$ hg commit -i 'glob:f*' << EOF
	> y			> y
	> n			> n
	> y			> y
	> n			> n
	> EOF			> EOF
	diff --git a/subdir/f1 b/subdir/f1			diff --git a/subdir/f1 b/subdir/f1
	1 hunks, 1 lines changed			1 hunks, 1 lines changed
	examine changes to 'subdir/f1'? [Ynesfdaq?] y			examine changes to 'subdir/f1'?
				(enter ? for help) [Ynesfdaq?] y

	@@ -1,1 +1,2 @@			@@ -1,1 +1,2 @@
	a			a
	+a			+a
	record change 1/2 to 'subdir/f1'? [Ynesfdaq?] n			record change 1/2 to 'subdir/f1'?
				(enter ? for help) [Ynesfdaq?] n

	diff --git a/subdir/f2 b/subdir/f2			diff --git a/subdir/f2 b/subdir/f2
	1 hunks, 1 lines changed			1 hunks, 1 lines changed
	examine changes to 'subdir/f2'? [Ynesfdaq?] y			examine changes to 'subdir/f2'?
				(enter ? for help) [Ynesfdaq?] y

	@@ -1,1 +1,2 @@			@@ -1,1 +1,2 @@
	b			b
	+b			+b
	record change 2/2 to 'subdir/f2'? [Ynesfdaq?] n			record change 2/2 to 'subdir/f2'?
				(enter ? for help) [Ynesfdaq?] n

	no changes to record			no changes to record
	[1]			[1]

	#if gettext			#if gettext

	Test translated help message			Test translated help message


	Skip			Skip

	$ hg commit -i <<EOF			$ hg commit -i <<EOF
	> s			> s
	> EOF			> EOF
	diff --git a/subdir/f1 b/subdir/f1			diff --git a/subdir/f1 b/subdir/f1
	1 hunks, 1 lines changed			1 hunks, 1 lines changed
	examine changes to 'subdir/f1'? [Ynesfdaq?] s			examine changes to 'subdir/f1'?
				(enter ? for help) [Ynesfdaq?] s

	diff --git a/subdir/f2 b/subdir/f2			diff --git a/subdir/f2 b/subdir/f2
	1 hunks, 1 lines changed			1 hunks, 1 lines changed
	examine changes to 'subdir/f2'? [Ynesfdaq?] abort: response expected			examine changes to 'subdir/f2'?
				(enter ? for help) [Ynesfdaq?] abort: response expected
	[255]			[255]

	No			No

	$ hg commit -i <<EOF			$ hg commit -i <<EOF
	> n			> n
	> EOF			> EOF
	diff --git a/subdir/f1 b/subdir/f1			diff --git a/subdir/f1 b/subdir/f1
	1 hunks, 1 lines changed			1 hunks, 1 lines changed
	examine changes to 'subdir/f1'? [Ynesfdaq?] n			examine changes to 'subdir/f1'?
				(enter ? for help) [Ynesfdaq?] n

	diff --git a/subdir/f2 b/subdir/f2			diff --git a/subdir/f2 b/subdir/f2
	1 hunks, 1 lines changed			1 hunks, 1 lines changed
	examine changes to 'subdir/f2'? [Ynesfdaq?] abort: response expected			examine changes to 'subdir/f2'?
				(enter ? for help) [Ynesfdaq?] abort: response expected
	[255]			[255]

	f, quit			f, quit

	$ hg commit -i <<EOF			$ hg commit -i <<EOF
	> f			> f
	> q			> q
	> EOF			> EOF
	diff --git a/subdir/f1 b/subdir/f1			diff --git a/subdir/f1 b/subdir/f1
	1 hunks, 1 lines changed			1 hunks, 1 lines changed
	examine changes to 'subdir/f1'? [Ynesfdaq?] f			examine changes to 'subdir/f1'?
				(enter ? for help) [Ynesfdaq?] f

	diff --git a/subdir/f2 b/subdir/f2			diff --git a/subdir/f2 b/subdir/f2
	1 hunks, 1 lines changed			1 hunks, 1 lines changed
	examine changes to 'subdir/f2'? [Ynesfdaq?] q			examine changes to 'subdir/f2'?
				(enter ? for help) [Ynesfdaq?] q

	abort: user quit			abort: user quit
	[255]			[255]

	s, all			s, all

	$ hg commit -i -d '18 0' -mx <<EOF			$ hg commit -i -d '18 0' -mx <<EOF
	> s			> s
	> a			> a
	> EOF			> EOF
	diff --git a/subdir/f1 b/subdir/f1			diff --git a/subdir/f1 b/subdir/f1
	1 hunks, 1 lines changed			1 hunks, 1 lines changed
	examine changes to 'subdir/f1'? [Ynesfdaq?] s			examine changes to 'subdir/f1'?
				(enter ? for help) [Ynesfdaq?] s

	diff --git a/subdir/f2 b/subdir/f2			diff --git a/subdir/f2 b/subdir/f2
	1 hunks, 1 lines changed			1 hunks, 1 lines changed
	examine changes to 'subdir/f2'? [Ynesfdaq?] a			examine changes to 'subdir/f2'?
				(enter ? for help) [Ynesfdaq?] a


	$ hg tip -p			$ hg tip -p
	changeset: 22:6afbbefacf35			changeset: 22:6afbbefacf35
	tag: tip			tag: tip
	user: test			user: test
	date: Thu Jan 01 00:00:18 1970 +0000			date: Thu Jan 01 00:00:18 1970 +0000
	summary: x			summary: x

	diff -r b73c401c693c -r 6afbbefacf35 subdir/f2			diff -r b73c401c693c -r 6afbbefacf35 subdir/f2
	--- a/subdir/f2 Thu Jan 01 00:00:17 1970 +0000			--- a/subdir/f2 Thu Jan 01 00:00:17 1970 +0000
	+++ b/subdir/f2 Thu Jan 01 00:00:18 1970 +0000			+++ b/subdir/f2 Thu Jan 01 00:00:18 1970 +0000
	@@ -1,1 +1,2 @@			@@ -1,1 +1,2 @@
	b			b
	+b			+b


	f			f

	$ hg commit -i -d '19 0' -my <<EOF			$ hg commit -i -d '19 0' -my <<EOF
	> f			> f
	> EOF			> EOF
	diff --git a/subdir/f1 b/subdir/f1			diff --git a/subdir/f1 b/subdir/f1
	1 hunks, 1 lines changed			1 hunks, 1 lines changed
	examine changes to 'subdir/f1'? [Ynesfdaq?] f			examine changes to 'subdir/f1'?
				(enter ? for help) [Ynesfdaq?] f


	$ hg tip -p			$ hg tip -p
	changeset: 23:715028a33949			changeset: 23:715028a33949
	tag: tip			tag: tip
	user: test			user: test
	date: Thu Jan 01 00:00:19 1970 +0000			date: Thu Jan 01 00:00:19 1970 +0000
	summary: y			summary: y
	> y			> y
	> y			> y
	> y			> y
	> EOF			> EOF
	diff --git a/subdir/f1 b/subdir/f1			diff --git a/subdir/f1 b/subdir/f1
	old mode 100644			old mode 100644
	new mode 100755			new mode 100755
	1 hunks, 1 lines changed			1 hunks, 1 lines changed
	examine changes to 'subdir/f1'? [Ynesfdaq?] y			examine changes to 'subdir/f1'?
				(enter ? for help) [Ynesfdaq?] y

	@@ -1,2 +1,3 @@			@@ -1,2 +1,3 @@
	a			a
	a			a
	+a			+a
	record this change to 'subdir/f1'? [Ynesfdaq?] y			record this change to 'subdir/f1'?
				(enter ? for help) [Ynesfdaq?] y


	$ hg tip --config diff.git=True -p			$ hg tip --config diff.git=True -p
	changeset: 24:db967c1e5884			changeset: 24:db967c1e5884
	tag: tip			tag: tip
	user: test			user: test
	date: Thu Jan 01 00:00:20 1970 +0000			date: Thu Jan 01 00:00:20 1970 +0000
	summary: z			summary: z
	$ echo b >> f1			$ echo b >> f1
	$ hg commit -i -d '21 0' -maa <<EOF			$ hg commit -i -d '21 0' -maa <<EOF
	> y			> y
	> y			> y
	> y			> y
	> EOF			> EOF
	diff --git a/subdir/f1 b/subdir/f1			diff --git a/subdir/f1 b/subdir/f1
	1 hunks, 1 lines changed			1 hunks, 1 lines changed
	examine changes to 'subdir/f1'? [Ynesfdaq?] y			examine changes to 'subdir/f1'?
				(enter ? for help) [Ynesfdaq?] y

	@@ -1,3 +1,4 @@			@@ -1,3 +1,4 @@
	a			a
	a			a
	a			a
	+b			+b
	record this change to 'subdir/f1'? [Ynesfdaq?] y			record this change to 'subdir/f1'?
				(enter ? for help) [Ynesfdaq?] y


	$ hg tip --config diff.git=True -p			$ hg tip --config diff.git=True -p
	changeset: 25:88903aef81c3			changeset: 25:88903aef81c3
	tag: tip			tag: tip
	user: test			user: test
	date: Thu Jan 01 00:00:21 1970 +0000			date: Thu Jan 01 00:00:21 1970 +0000
	summary: aa			summary: aa
	> y			> y
	> y			> y
	> y			> y
	> EOF			> EOF
	diff --git a/subdir/f1 b/subdir/f1			diff --git a/subdir/f1 b/subdir/f1
	old mode 100755			old mode 100755
	new mode 100644			new mode 100644
	1 hunks, 1 lines changed			1 hunks, 1 lines changed
	examine changes to 'subdir/f1'? [Ynesfdaq?] y			examine changes to 'subdir/f1'?
				(enter ? for help) [Ynesfdaq?] y

	@@ -2,3 +2,4 @@ a			@@ -2,3 +2,4 @@ a
	a			a
	a			a
	b			b
	+c			+c
	record this change to 'subdir/f1'? [Ynesfdaq?] y			record this change to 'subdir/f1'?
				(enter ? for help) [Ynesfdaq?] y


	$ hg tip --config diff.git=True -p			$ hg tip --config diff.git=True -p
	changeset: 26:7af84b6cf560			changeset: 26:7af84b6cf560
	tag: tip			tag: tip
	user: test			user: test
	date: Thu Jan 01 00:00:22 1970 +0000			date: Thu Jan 01 00:00:22 1970 +0000
	summary: ab			summary: ab
	> This is the third line			> This is the third line
	> __EOF__			> __EOF__
	$ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit -i -d '23 0' -medit-patch-2 <<EOF			$ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit -i -d '23 0' -medit-patch-2 <<EOF
	> y			> y
	> e			> e
	> EOF			> EOF
	diff --git a/editedfile b/editedfile			diff --git a/editedfile b/editedfile
	1 hunks, 2 lines changed			1 hunks, 2 lines changed
	examine changes to 'editedfile'? [Ynesfdaq?] y			examine changes to 'editedfile'?
				(enter ? for help) [Ynesfdaq?] y

	@@ -1,3 +1,3 @@			@@ -1,3 +1,3 @@
	-This is the first line			-This is the first line
	-This is the second line			-This is the second line
	+This line has changed			+This line has changed
	+This change will be committed			+This change will be committed
	This is the third line			This is the third line
	record this change to 'editedfile'? [Ynesfdaq?] e			record this change to 'editedfile'?
				(enter ? for help) [Ynesfdaq?] e

	$ cat editedfile			$ cat editedfile
	This line has changed			This line has changed
	This change will be committed			This change will be committed
	This is the third line			This is the third line
	$ hg cat -r tip editedfile			$ hg cat -r tip editedfile
	This is the first line			This is the first line
	This change will be committed			This change will be committed
	This is the third line			This is the third line
	$ hg revert editedfile			$ hg revert editedfile

	Trying to edit patch for whole file			Trying to edit patch for whole file

	$ echo "This is the fourth line" >> editedfile			$ echo "This is the fourth line" >> editedfile
	$ hg commit -i <<EOF			$ hg commit -i <<EOF
	> e			> e
	> q			> q
	> EOF			> EOF
	diff --git a/editedfile b/editedfile			diff --git a/editedfile b/editedfile
	1 hunks, 1 lines changed			1 hunks, 1 lines changed
	examine changes to 'editedfile'? [Ynesfdaq?] e			examine changes to 'editedfile'?
				(enter ? for help) [Ynesfdaq?] e

	cannot edit patch for whole file			cannot edit patch for whole file
	examine changes to 'editedfile'? [Ynesfdaq?] q			examine changes to 'editedfile'?
				(enter ? for help) [Ynesfdaq?] q

	abort: user quit			abort: user quit
	[255]			[255]
	$ hg revert editedfile			$ hg revert editedfile

	Removing changes from patch			Removing changes from patch

	$ sed -e '3s/third/second/' -e '2s/will/will not/' -e 1d editedfile > tmp			$ sed -e '3s/third/second/' -e '2s/will/will not/' -e 1d editedfile > tmp
	$ mv tmp editedfile			$ mv tmp editedfile
	$ echo "This line has been added" >> editedfile			$ echo "This line has been added" >> editedfile
	$ cat > editor.sh << '__EOF__'			$ cat > editor.sh << '__EOF__'
	> sed -e 's/^[-+]/ /' "$1" > tmp			> sed -e 's/^[-+]/ /' "$1" > tmp
	> mv tmp "$1"			> mv tmp "$1"
	> __EOF__			> __EOF__
	$ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit -i <<EOF			$ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit -i <<EOF
	> y			> y
	> e			> e
	> EOF			> EOF
	diff --git a/editedfile b/editedfile			diff --git a/editedfile b/editedfile
	1 hunks, 3 lines changed			1 hunks, 3 lines changed
	examine changes to 'editedfile'? [Ynesfdaq?] y			examine changes to 'editedfile'?
				(enter ? for help) [Ynesfdaq?] y

	@@ -1,3 +1,3 @@			@@ -1,3 +1,3 @@
	-This is the first line			-This is the first line
	-This change will be committed			-This change will be committed
	-This is the third line			-This is the third line
	+This change will not be committed			+This change will not be committed
	+This is the second line			+This is the second line
	+This line has been added			+This line has been added
	record this change to 'editedfile'? [Ynesfdaq?] e			record this change to 'editedfile'?
				(enter ? for help) [Ynesfdaq?] e

	no changes to record			no changes to record
	[1]			[1]
	$ cat editedfile			$ cat editedfile
	This change will not be committed			This change will not be committed
	This is the second line			This is the second line
	This line has been added			This line has been added
	$ hg cat -r tip editedfile			$ hg cat -r tip editedfile
	> mv tmp "$1"			> mv tmp "$1"
	> __EOF__			> __EOF__
	$ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit -i <<EOF			$ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit -i <<EOF
	> y			> y
	> e			> e
	> EOF			> EOF
	diff --git a/editedfile b/editedfile			diff --git a/editedfile b/editedfile
	1 hunks, 3 lines changed			1 hunks, 3 lines changed
	examine changes to 'editedfile'? [Ynesfdaq?] y			examine changes to 'editedfile'?
				(enter ? for help) [Ynesfdaq?] y

	@@ -1,3 +1,3 @@			@@ -1,3 +1,3 @@
	-This is the first line			-This is the first line
	-This change will be committed			-This change will be committed
	-This is the third line			-This is the third line
	+This change will not be committed			+This change will not be committed
	+This is the second line			+This is the second line
	+This line has been added			+This line has been added
	record this change to 'editedfile'? [Ynesfdaq?] e			record this change to 'editedfile'?
				(enter ? for help) [Ynesfdaq?] e

	patching file editedfile			patching file editedfile
	Hunk #1 FAILED at 0			Hunk #1 FAILED at 0
	1 out of 1 hunks FAILED -- saving rejects to file editedfile.rej			1 out of 1 hunks FAILED -- saving rejects to file editedfile.rej
	abort: patch failed to apply			abort: patch failed to apply
	[255]			[255]
	$ cat editedfile			$ cat editedfile
	This change will not be committed			This change will not be committed
	> mv tmp "$1"			> mv tmp "$1"
	> __EOF__			> __EOF__
	$ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit -i <<EOF			$ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit -i <<EOF
	> y			> y
	> e			> e
	> EOF			> EOF
	diff --git a/editedfile b/editedfile			diff --git a/editedfile b/editedfile
	1 hunks, 3 lines changed			1 hunks, 3 lines changed
	examine changes to 'editedfile'? [Ynesfdaq?] y			examine changes to 'editedfile'?
				(enter ? for help) [Ynesfdaq?] y

	@@ -1,3 +1,3 @@			@@ -1,3 +1,3 @@
	-This is the first line			-This is the first line
	-This change will be committed			-This change will be committed
	-This is the third line			-This is the third line
	+This change will not be committed			+This change will not be committed
	+This is the second line			+This is the second line
	+This line has been added			+This line has been added
	record this change to 'editedfile'? [Ynesfdaq?] e			record this change to 'editedfile'?
				(enter ? for help) [Ynesfdaq?] e

	abort: error parsing patch: unhandled transition: range -> range			abort: error parsing patch: unhandled transition: range -> range
	[255]			[255]

	Exiting editor with status 1, ignores the edit but does not stop the recording			Exiting editor with status 1, ignores the edit but does not stop the recording
	session			session

	$ HGEDITOR=false hg commit -i <<EOF			$ HGEDITOR=false hg commit -i <<EOF
	> y			> y
	> e			> e
	> n			> n
	> EOF			> EOF
	diff --git a/editedfile b/editedfile			diff --git a/editedfile b/editedfile
	1 hunks, 3 lines changed			1 hunks, 3 lines changed
	examine changes to 'editedfile'? [Ynesfdaq?] y			examine changes to 'editedfile'?
				(enter ? for help) [Ynesfdaq?] y

	@@ -1,3 +1,3 @@			@@ -1,3 +1,3 @@
	-This is the first line			-This is the first line
	-This change will be committed			-This change will be committed
	-This is the third line			-This is the third line
	+This change will not be committed			+This change will not be committed
	+This is the second line			+This is the second line
	+This line has been added			+This line has been added
	record this change to 'editedfile'? [Ynesfdaq?] e			record this change to 'editedfile'?
				(enter ? for help) [Ynesfdaq?] e

	editor exited with exit code 1			editor exited with exit code 1
	record this change to 'editedfile'? [Ynesfdaq?] n			record this change to 'editedfile'?
				(enter ? for help) [Ynesfdaq?] n

	no changes to record			no changes to record
	[1]			[1]


	random text in random positions is still an error			random text in random positions is still an error

	$ cat > editor.sh << '__EOF__'			$ cat > editor.sh << '__EOF__'
	> sed -e '/^@/i\			> sed -e '/^@/i\
	> other' "$1" > tmp			> other' "$1" > tmp
	> mv tmp "$1"			> mv tmp "$1"
	> __EOF__			> __EOF__
	$ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit -i <<EOF			$ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit -i <<EOF
	> y			> y
	> e			> e
	> EOF			> EOF
	diff --git a/editedfile b/editedfile			diff --git a/editedfile b/editedfile
	1 hunks, 3 lines changed			1 hunks, 3 lines changed
	examine changes to 'editedfile'? [Ynesfdaq?] y			examine changes to 'editedfile'?
				(enter ? for help) [Ynesfdaq?] y

	@@ -1,3 +1,3 @@			@@ -1,3 +1,3 @@
	-This is the first line			-This is the first line
	-This change will be committed			-This change will be committed
	-This is the third line			-This is the third line
	+This change will not be committed			+This change will not be committed
	+This is the second line			+This is the second line
	+This line has been added			+This line has been added
	record this change to 'editedfile'? [Ynesfdaq?] e			record this change to 'editedfile'?
				(enter ? for help) [Ynesfdaq?] e

	abort: error parsing patch: unhandled transition: file -> other			abort: error parsing patch: unhandled transition: file -> other
	[255]			[255]

	$ hg up -C			$ hg up -C
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved

	With win32text			With win32text

	$ echo d >> subdir/f1			$ echo d >> subdir/f1
	$ hg commit -i -d '24 0' -mw1 <<EOF			$ hg commit -i -d '24 0' -mw1 <<EOF
	> y			> y
	> y			> y
	> EOF			> EOF
	diff --git a/subdir/f1 b/subdir/f1			diff --git a/subdir/f1 b/subdir/f1
	1 hunks, 1 lines changed			1 hunks, 1 lines changed
	examine changes to 'subdir/f1'? [Ynesfdaq?] y			examine changes to 'subdir/f1'?
				(enter ? for help) [Ynesfdaq?] y

	@@ -3,3 +3,4 @@ a			@@ -3,3 +3,4 @@ a
	a			a
	b			b
	c			c
	+d			+d
	record this change to 'subdir/f1'? [Ynesfdaq?] y			record this change to 'subdir/f1'?
				(enter ? for help) [Ynesfdaq?] y


	$ hg status -A subdir/f1			$ hg status -A subdir/f1
	C subdir/f1			C subdir/f1
	$ hg tip -p			$ hg tip -p
	changeset: 30:* (glob)			changeset: 30:* (glob)
	tag: tip			tag: tip
	user: test			user: test
	$ unset HGUSER			$ unset HGUSER
	$ echo e >> subdir/f1			$ echo e >> subdir/f1
	$ hg commit -i --config ui.username= -d '8 0' --user xyz -m "user flag" <<EOF			$ hg commit -i --config ui.username= -d '8 0' --user xyz -m "user flag" <<EOF
	> y			> y
	> y			> y
	> EOF			> EOF
	diff --git a/subdir/f1 b/subdir/f1			diff --git a/subdir/f1 b/subdir/f1
	1 hunks, 1 lines changed			1 hunks, 1 lines changed
	examine changes to 'subdir/f1'? [Ynesfdaq?] y			examine changes to 'subdir/f1'?
				(enter ? for help) [Ynesfdaq?] y

	@@ -4,3 +4,4 @@ a			@@ -4,3 +4,4 @@ a
	b			b
	c			c
	d			d
	+e			+e
	record this change to 'subdir/f1'? [Ynesfdaq?] y			record this change to 'subdir/f1'?
				(enter ? for help) [Ynesfdaq?] y

	$ hg status -A subdir/f1			$ hg status -A subdir/f1
	C subdir/f1			C subdir/f1
	$ hg log --template '{author}\n' -l 1			$ hg log --template '{author}\n' -l 1
	xyz			xyz
	$ HGUSER="test"			$ HGUSER="test"
	$ export HGUSER			$ export HGUSER


	Moving files			Moving files

	$ hg update -C .			$ hg update -C .
	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 mv plain plain3			$ hg mv plain plain3
	$ echo somechange >> plain3			$ echo somechange >> plain3
	$ hg commit -i -d '23 0' -mmoving_files << EOF			$ hg commit -i -d '23 0' -mmoving_files << EOF
	> y			> y
	> y			> y
	> EOF			> EOF
	diff --git a/plain b/plain3			diff --git a/plain b/plain3
	rename from plain			rename from plain
	rename to plain3			rename to plain3
	1 hunks, 1 lines changed			1 hunks, 1 lines changed
	examine changes to 'plain' and 'plain3'? [Ynesfdaq?] y			examine changes to 'plain' and 'plain3'?
				(enter ? for help) [Ynesfdaq?] y

	@@ -11,3 +11,4 @@ 8			@@ -11,3 +11,4 @@ 8
	9			9
	10			10
	11			11
	+somechange			+somechange
	record this change to 'plain3'? [Ynesfdaq?] y			record this change to 'plain3'?
				(enter ? for help) [Ynesfdaq?] y

	The #if execbit block above changes the hash here on some systems			The #if execbit block above changes the hash here on some systems
	$ hg status -A plain3			$ hg status -A plain3
	C plain3			C plain3
	$ hg tip			$ hg tip
	changeset: 32:* (glob)			changeset: 32:* (glob)
	tag: tip			tag: tip
	user: test			user: test
	> __EOF__			> __EOF__
	$ hg add newfile			$ hg add newfile
	$ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit -i -d '23 0' -medit-patch-new <<EOF			$ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit -i -d '23 0' -medit-patch-new <<EOF
	> y			> y
	> e			> e
	> EOF			> EOF
	diff --git a/newfile b/newfile			diff --git a/newfile b/newfile
	new file mode 100644			new file mode 100644
	examine changes to 'newfile'? [Ynesfdaq?] y			examine changes to 'newfile'?
				(enter ? for help) [Ynesfdaq?] y

	@@ -0,0 +1,3 @@			@@ -0,0 +1,3 @@
	+This is the first line			+This is the first line
	+This is the second line			+This is the second line
	+This is the third line			+This is the third line
	record this change to 'newfile'? [Ynesfdaq?] e			record this change to 'newfile'?
				(enter ? for help) [Ynesfdaq?] e

	$ hg cat -r tip newfile			$ hg cat -r tip newfile
	This is the very line			This is the very line
	This is the second line			This is the second line
	This is the third line			This is the third line

	$ cat newfile			$ cat newfile
	This is the first line			This is the first line
	This is the second line			This is the second line
	This is the third line			This is the third line

	Add new file from within a subdirectory			Add new file from within a subdirectory
	$ hg update -C .			$ hg update -C .
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved
	$ mkdir folder			$ mkdir folder
	$ cd folder			$ cd folder
	$ echo "foo" > bar			$ echo "foo" > bar
	$ hg add bar			$ hg add bar
	$ hg commit -i -d '23 0' -mnewfilesubdir <<EOF			$ hg commit -i -d '23 0' -mnewfilesubdir <<EOF
	> y			> y
	> y			> y
	> EOF			> EOF
	diff --git a/folder/bar b/folder/bar			diff --git a/folder/bar b/folder/bar
	new file mode 100644			new file mode 100644
	examine changes to 'folder/bar'? [Ynesfdaq?] y			examine changes to 'folder/bar'?
				(enter ? for help) [Ynesfdaq?] y

	@@ -0,0 +1,1 @@			@@ -0,0 +1,1 @@
	+foo			+foo
	record this change to 'folder/bar'? [Ynesfdaq?] y			record this change to 'folder/bar'?
				(enter ? for help) [Ynesfdaq?] y

	The #if execbit block above changes the hashes here on some systems			The #if execbit block above changes the hashes here on some systems
	$ hg tip -p			$ hg tip -p
	changeset: 34:* (glob)			changeset: 34:* (glob)
	tag: tip			tag: tip
	user: test			user: test
	date: Thu Jan 01 00:00:23 1970 +0000			date: Thu Jan 01 00:00:23 1970 +0000
	summary: newfilesubdir			summary: newfilesubdir
	> EOF			> EOF
	$ hg commit -i -m 'commit subdir/f1 partially' <<EOF			$ hg commit -i -m 'commit subdir/f1 partially' <<EOF
	> y			> y
	> y			> y
	> n			> n
	> EOF			> EOF
	diff --git a/subdir/f1 b/subdir/f1			diff --git a/subdir/f1 b/subdir/f1
	2 hunks, 2 lines changed			2 hunks, 2 lines changed
	examine changes to 'subdir/f1'? [Ynesfdaq?] y			examine changes to 'subdir/f1'?
				(enter ? for help) [Ynesfdaq?] y

	@@ -1,6 +1,6 @@			@@ -1,6 +1,6 @@
	-a			-a
	+A			+A
	a			a
	a			a
	b			b
	c			c
	d			d
	record change 1/2 to 'subdir/f1'? [Ynesfdaq?] y			record change 1/2 to 'subdir/f1'?
				(enter ? for help) [Ynesfdaq?] y

	@@ -2,6 +2,6 @@			@@ -2,6 +2,6 @@
	a			a
	a			a
	b			b
	c			c
	d			d
	-e			-e
	+E			+E
	record change 2/2 to 'subdir/f1'? [Ynesfdaq?] n			record change 2/2 to 'subdir/f1'?
				(enter ? for help) [Ynesfdaq?] n

	$ cat >> .hg/hgrc <<EOF			$ cat >> .hg/hgrc <<EOF
	> [extensions]			> [extensions]
	> fakepatchtime = !			> fakepatchtime = !
	> EOF			> EOF

	$ hg debugstate \| grep ' subdir/f1$'			$ hg debugstate \| grep ' subdir/f1$'
	n 0 -1 unset subdir/f1			n 0 -1 unset subdir/f1
	> 3			> 3
	> change2			> change2
	> 4			> 4
	> 5			> 5
	> EOF			> EOF
	$ printf 'y\ny\ny\n' \| hg ci -im initial --config commands.commit.interactive.unified=0			$ printf 'y\ny\ny\n' \| hg ci -im initial --config commands.commit.interactive.unified=0
	diff --git a/foo b/foo			diff --git a/foo b/foo
	2 hunks, 2 lines changed			2 hunks, 2 lines changed
	examine changes to 'foo'? [Ynesfdaq?] y			examine changes to 'foo'?
				(enter ? for help) [Ynesfdaq?] y

	@@ -1,0 +2,1 @@ 1			@@ -1,0 +2,1 @@ 1
	+change1			+change1
	record change 1/2 to 'foo'? [Ynesfdaq?] y			record change 1/2 to 'foo'?
				(enter ? for help) [Ynesfdaq?] y

	@@ -3,0 +5,1 @@ 3			@@ -3,0 +5,1 @@ 3
	+change2			+change2
	record change 2/2 to 'foo'? [Ynesfdaq?] y			record change 2/2 to 'foo'?
				(enter ? for help) [Ynesfdaq?] y

	$ cd $TESTTMP			$ cd $TESTTMP

	Test diff.ignoreblanklines=1			Test diff.ignoreblanklines=1

	$ hg init c			$ hg init c
	$ cd c			$ cd c
	$ cat > foo <<EOF			$ cat > foo <<EOF
	> 3			> 3
	> change2			> change2
	> 4			> 4
	> 5			> 5
	> EOF			> EOF
	$ printf 'y\ny\ny\n' \| hg ci -im initial --config diff.ignoreblanklines=1			$ printf 'y\ny\ny\n' \| hg ci -im initial --config diff.ignoreblanklines=1
	diff --git a/foo b/foo			diff --git a/foo b/foo
	2 hunks, 2 lines changed			2 hunks, 2 lines changed
	examine changes to 'foo'? [Ynesfdaq?] y			examine changes to 'foo'?
				(enter ? for help) [Ynesfdaq?] y

	@@ -1,3 +1,4 @@			@@ -1,3 +1,4 @@
	1			1
	+			+
	2			2
	3			3
	record change 1/2 to 'foo'? [Ynesfdaq?] y			record change 1/2 to 'foo'?
				(enter ? for help) [Ynesfdaq?] y

	@@ -2,4 +3,5 @@			@@ -2,4 +3,5 @@
	2			2
	3			3
	+change2			+change2
	4			4
	5			5
	record change 2/2 to 'foo'? [Ynesfdaq?] y			record change 2/2 to 'foo'?
				(enter ? for help) [Ynesfdaq?] y

tests/test-diff-color.t

	c			c
	a			a
	a			a
	\x1b[0;31m-b\x1b[0m (esc)			\x1b[0;31m-b\x1b[0m (esc)
	\x1b[0;32m+dd\x1b[0m (esc)			\x1b[0;32m+dd\x1b[0m (esc)
	a			a
	a			a
	c			c
	\x1b[0;33mrecord this change to 'a'? [Ynesfdaq?]\x1b[0m y (esc)			\x1b[0;33mrecord this change to 'a'?\x1b[0m (esc)
				\x1b[0;33m(enter ? for help) [Ynesfdaq?]\x1b[0m y (esc)


	$ echo "[extensions]" >> $HGRCPATH			$ echo "[extensions]" >> $HGRCPATH
	$ echo "mq=" >> $HGRCPATH			$ echo "mq=" >> $HGRCPATH
	$ hg rollback			$ hg rollback
	repository tip rolled back to revision 0 (undo commit)			repository tip rolled back to revision 0 (undo commit)
	working directory now based on revision 0			working directory now based on revision 0

	qrecord			qrecord

	$ hg qrecord -m moda patch <<EOF			$ hg qrecord -m moda patch <<EOF
	> y			> y
	> y			> y
	> EOF			> EOF
	\x1b[0;1mdiff --git a/a b/a\x1b[0m (esc)			\x1b[0;1mdiff --git a/a b/a\x1b[0m (esc)
	\x1b[0;36;1mold mode 100644\x1b[0m (esc)			\x1b[0;36;1mold mode 100644\x1b[0m (esc)
	\x1b[0;36;1mnew mode 100755\x1b[0m (esc)			\x1b[0;36;1mnew mode 100755\x1b[0m (esc)
	1 hunks, 1 lines changed			1 hunks, 1 lines changed
	\x1b[0;33mexamine changes to 'a'? [Ynesfdaq?]\x1b[0m y (esc)			\x1b[0;33mexamine changes to 'a'?\x1b[0m (esc)
				\x1b[0;33m(enter ? for help) [Ynesfdaq?]\x1b[0m y (esc)

	\x1b[0;35m@@ -2,7 +2,7 @@ c\x1b[0m (esc)			\x1b[0;35m@@ -2,7 +2,7 @@ c\x1b[0m (esc)
	c			c
	a			a
	a			a
	\x1b[0;31m-b\x1b[0m (esc)			\x1b[0;31m-b\x1b[0m (esc)
	\x1b[0;32m+dd\x1b[0m (esc)			\x1b[0;32m+dd\x1b[0m (esc)
	a			a
	a			a
	c			c
	\x1b[0;33mrecord this change to 'a'? [Ynesfdaq?]\x1b[0m y (esc)			\x1b[0;33mrecord this change to 'a'?\x1b[0m (esc)
				\x1b[0;33m(enter ? for help) [Ynesfdaq?]\x1b[0m y (esc)


	$ hg qpop -a			$ hg qpop -a
	popping patch			popping patch
	patch queue now empty			patch queue now empty

	#endif			#endif

tests/test-editor-filename.t

	adding two			adding two
	$ hg commit --interactive --config ui.interactive=true --config ui.interface=text << EOF			$ hg commit --interactive --config ui.interactive=true --config ui.interface=text << EOF
	> y			> y
	> e			> e
	> q			> q
	> EOF			> EOF
	diff --git a/one b/one			diff --git a/one b/one
	new file mode 100644			new file mode 100644
	examine changes to 'one'? [Ynesfdaq?] y			examine changes to 'one'?
				(enter ? for help) [Ynesfdaq?] y

	@@ -0,0 +1,1 @@			@@ -0,0 +1,1 @@
	+1			+1
	record change 1/2 to 'one'? [Ynesfdaq?] e			record change 1/2 to 'one'?
				(enter ? for help) [Ynesfdaq?] e

	*.diff (glob)			*.diff (glob)
	editor exited with exit code 1			editor exited with exit code 1
	record change 1/2 to 'one'? [Ynesfdaq?] q			record change 1/2 to 'one'?
				(enter ? for help) [Ynesfdaq?] q

	abort: user quit			abort: user quit
	[255]			[255]

tests/test-keyword.t

	> EOF			> EOF
	diff --git a/a b/a			diff --git a/a b/a
	2 hunks, 2 lines changed			2 hunks, 2 lines changed
	@@ -1,3 +1,4 @@			@@ -1,3 +1,4 @@
	expand $Id$			expand $Id$
	+foo			+foo
	do not process $Id:			do not process $Id:
	xxx $			xxx $
	record change 1/2 to 'a'? [Ynesfdaq?] y			record change 1/2 to 'a'?
				(enter ? for help) [Ynesfdaq?] y

	@@ -2,2 +3,3 @@			@@ -2,2 +3,3 @@
	do not process $Id:			do not process $Id:
	xxx $			xxx $
	+bar			+bar
	record change 2/2 to 'a'? [Ynesfdaq?] n			record change 2/2 to 'a'?
				(enter ? for help) [Ynesfdaq?] n


	$ hg identify			$ hg identify
	5f5eb23505c3+ tip			5f5eb23505c3+ tip
	$ hg status			$ hg status
	M a			M a
	A r			A r

	> EOF			> EOF
	diff --git a/a b/a			diff --git a/a b/a
	2 hunks, 2 lines changed			2 hunks, 2 lines changed
	@@ -1,3 +1,4 @@			@@ -1,3 +1,4 @@
	expand $Id$			expand $Id$
	+foo			+foo
	do not process $Id:			do not process $Id:
	xxx $			xxx $
	record change 1/2 to 'a'? [Ynesfdaq?] y			record change 1/2 to 'a'?
				(enter ? for help) [Ynesfdaq?] y

	@@ -2,2 +3,3 @@			@@ -2,2 +3,3 @@
	do not process $Id:			do not process $Id:
	xxx $			xxx $
	+bar			+bar
	record change 2/2 to 'a'? [Ynesfdaq?] y			record change 2/2 to 'a'?
				(enter ? for help) [Ynesfdaq?] y


	File a should be clean			File a should be clean

	$ hg status -A a			$ hg status -A a
	C a			C a

	rollback and revert expansion			rollback and revert expansion
	$ hg -v record -l msg -d '12 2' r<<EOF			$ hg -v record -l msg -d '12 2' r<<EOF
	> y			> y
	> y			> y
	> EOF			> EOF
	diff --git a/r b/r			diff --git a/r b/r
	new file mode 100644			new file mode 100644
	@@ -0,0 +1,1 @@			@@ -0,0 +1,1 @@
	+$Id$			+$Id$
	record this change to 'r'? [Ynesfdaq?] y			record this change to 'r'?
				(enter ? for help) [Ynesfdaq?] y

	resolving manifests			resolving manifests
	patching file r			patching file r
	committing files:			committing files:
	r			r
	committing manifest			committing manifest
	committing changelog			committing changelog
	committed changeset 3:82a2f715724d			committed changeset 3:82a2f715724d
	$ echo '$Id$' > i			$ echo '$Id$' > i
	$ hg add i			$ hg add i
	$ hg --verbose record -d '13 1' -m recignored<<EOF			$ hg --verbose record -d '13 1' -m recignored<<EOF
	> y			> y
	> y			> y
	> EOF			> EOF
	diff --git a/i b/i			diff --git a/i b/i
	new file mode 100644			new file mode 100644
	examine changes to 'i'? [Ynesfdaq?] y			examine changes to 'i'?
				(enter ? for help) [Ynesfdaq?] y

	@@ -0,0 +1,1 @@			@@ -0,0 +1,1 @@
	+$Id$			+$Id$
	record this change to 'i'? [Ynesfdaq?] y			record this change to 'i'?
				(enter ? for help) [Ynesfdaq?] y

	resolving manifests			resolving manifests
	patching file i			patching file i
	committing files:			committing files:
	i			i
	committing manifest			committing manifest
	committing changelog			committing changelog
	committed changeset 3:9f40ceb5a072			committed changeset 3:9f40ceb5a072

tests/test-mq-qrefresh-interactive.t

	> y			> y
	> n			> n
	> y			> y
	> y			> y
	> n			> n
	> EOF			> EOF
	diff --git a/1.txt b/1.txt			diff --git a/1.txt b/1.txt
	2 hunks, 2 lines changed			2 hunks, 2 lines changed
	examine changes to '1.txt'? [Ynesfdaq?] y			examine changes to '1.txt'?
				(enter ? for help) [Ynesfdaq?] y

	@@ -1,3 +1,3 @@			@@ -1,3 +1,3 @@
	1			1
	-2			-2
	+2 2			+2 2
	3			3
	record change 1/4 to '1.txt'? [Ynesfdaq?] y			record change 1/4 to '1.txt'?
				(enter ? for help) [Ynesfdaq?] y

	@@ -3,3 +3,3 @@			@@ -3,3 +3,3 @@
	3			3
	-4			-4
	+4 4			+4 4
	5			5
	record change 2/4 to '1.txt'? [Ynesfdaq?] n			record change 2/4 to '1.txt'?
				(enter ? for help) [Ynesfdaq?] n

	diff --git a/2.txt b/2.txt			diff --git a/2.txt b/2.txt
	1 hunks, 1 lines changed			1 hunks, 1 lines changed
	examine changes to '2.txt'? [Ynesfdaq?] y			examine changes to '2.txt'?
				(enter ? for help) [Ynesfdaq?] y

	@@ -1,5 +1,5 @@			@@ -1,5 +1,5 @@
	a			a
	-b			-b
	+b b			+b b
	c			c
	d			d
	e			e
	record change 3/4 to '2.txt'? [Ynesfdaq?] y			record change 3/4 to '2.txt'?
				(enter ? for help) [Ynesfdaq?] y

	diff --git a/dir/a.txt b/dir/a.txt			diff --git a/dir/a.txt b/dir/a.txt
	1 hunks, 1 lines changed			1 hunks, 1 lines changed
	examine changes to 'dir/a.txt'? [Ynesfdaq?] n			examine changes to 'dir/a.txt'?
				(enter ? for help) [Ynesfdaq?] n


	After partial qrefresh 'tip'			After partial qrefresh 'tip'

	$ hg tip -p			$ hg tip -p
	changeset: 1:0738af1a8211			changeset: 1:0738af1a8211
	tag: patch			tag: patch
	tag: qbase			tag: qbase
	$ hg qrefresh -i -d '0 0' <<EOF			$ hg qrefresh -i -d '0 0' <<EOF
	> y			> y
	> y			> y
	> y			> y
	> y			> y
	> EOF			> EOF
	diff --git a/1.txt b/1.txt			diff --git a/1.txt b/1.txt
	1 hunks, 1 lines changed			1 hunks, 1 lines changed
	examine changes to '1.txt'? [Ynesfdaq?] y			examine changes to '1.txt'?
				(enter ? for help) [Ynesfdaq?] y

	@@ -1,5 +1,5 @@			@@ -1,5 +1,5 @@
	1			1
	2 2			2 2
	3			3
	-4			-4
	+4 4			+4 4
	5			5
	record change 1/2 to '1.txt'? [Ynesfdaq?] y			record change 1/2 to '1.txt'?
				(enter ? for help) [Ynesfdaq?] y

	diff --git a/dir/a.txt b/dir/a.txt			diff --git a/dir/a.txt b/dir/a.txt
	1 hunks, 1 lines changed			1 hunks, 1 lines changed
	examine changes to 'dir/a.txt'? [Ynesfdaq?] y			examine changes to 'dir/a.txt'?
				(enter ? for help) [Ynesfdaq?] y

	@@ -1,4 +1,4 @@			@@ -1,4 +1,4 @@
	-hello world			-hello world
	+hello world!			+hello world!

	someone			someone
	up			up
	record change 2/2 to 'dir/a.txt'? [Ynesfdaq?] y			record change 2/2 to 'dir/a.txt'?
				(enter ? for help) [Ynesfdaq?] y


	After final qrefresh 'tip'			After final qrefresh 'tip'

	$ hg tip -p			$ hg tip -p
	changeset: 1:2c3f66afeed9			changeset: 1:2c3f66afeed9
	tag: patch			tag: patch
	tag: qbase			tag: qbase

tests/test-mq-subrepo.t

	abort: uncommitted changes in subrepository "sub"			abort: uncommitted changes in subrepository "sub"
	[255]			[255]
	% update substate when adding .hgsub w/clean updated subrepo			% update substate when adding .hgsub w/clean updated subrepo
	A .hgsub			A .hgsub
	A sub/a			A sub/a
	% qrecord --config ui.interactive=1 -m0 0.diff			% qrecord --config ui.interactive=1 -m0 0.diff
	diff --git a/.hgsub b/.hgsub			diff --git a/.hgsub b/.hgsub
	new file mode 100644			new file mode 100644
	examine changes to '.hgsub'? [Ynesfdaq?] y			examine changes to '.hgsub'?
				(enter ? for help) [Ynesfdaq?] y

	@@ -0,0 +1,1 @@			@@ -0,0 +1,1 @@
	+sub = sub			+sub = sub
	record this change to '.hgsub'? [Ynesfdaq?] y			record this change to '.hgsub'?
				(enter ? for help) [Ynesfdaq?] y

	warning: subrepo spec file '.hgsub' not found			warning: subrepo spec file '.hgsub' not found
	warning: subrepo spec file '.hgsub' not found			warning: subrepo spec file '.hgsub' not found
	path sub			path sub
	source sub			source sub
	revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31			revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31
	$ testmod qrecord --config ui.interactive=1 -m1 1.diff <<EOF			$ testmod qrecord --config ui.interactive=1 -m1 1.diff <<EOF
	> y			> y
	> y			> y
	> EOF			> EOF
	adding a			adding a
	% abort when modifying .hgsub w/dirty subrepo			% abort when modifying .hgsub w/dirty subrepo
	M .hgsub			M .hgsub
	A sub2/a			A sub2/a
	% qrecord --config ui.interactive=1 -m1 1.diff			% qrecord --config ui.interactive=1 -m1 1.diff
	abort: uncommitted changes in subrepository "sub2"			abort: uncommitted changes in subrepository "sub2"
	[255]			[255]
	% update substate when modifying .hgsub w/clean updated subrepo			% update substate when modifying .hgsub w/clean updated subrepo
	M .hgsub			M .hgsub
	A sub2/a			A sub2/a
	% qrecord --config ui.interactive=1 -m1 1.diff			% qrecord --config ui.interactive=1 -m1 1.diff
	diff --git a/.hgsub b/.hgsub			diff --git a/.hgsub b/.hgsub
	1 hunks, 1 lines changed			1 hunks, 1 lines changed
	examine changes to '.hgsub'? [Ynesfdaq?] y			examine changes to '.hgsub'?
				(enter ? for help) [Ynesfdaq?] y

	@@ -1,1 +1,2 @@			@@ -1,1 +1,2 @@
	sub = sub			sub = sub
	+sub2 = sub2			+sub2 = sub2
	record this change to '.hgsub'? [Ynesfdaq?] y			record this change to '.hgsub'?
				(enter ? for help) [Ynesfdaq?] y

	path sub			path sub
	source sub			source sub
	revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31			revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31
	path sub2			path sub2
	source sub2			source sub2
	revision 1f94c7611cc6b74f5a17b16121a1170d44776845			revision 1f94c7611cc6b74f5a17b16121a1170d44776845

	$ hg qpop -qa			$ hg qpop -qa
	patch queue now empty			patch queue now empty
	$ testrm1 qrecord --config ui.interactive=1 -m2 2.diff <<EOF			$ testrm1 qrecord --config ui.interactive=1 -m2 2.diff <<EOF
	> y			> y
	> y			> y
	> EOF			> EOF
	adding a			adding a
	% update substate when removing .hgsub w/dirty subrepo			% update substate when removing .hgsub w/dirty subrepo
	M sub3/a			M sub3/a
	R .hgsub			R .hgsub
	% qrecord --config ui.interactive=1 -m2 2.diff			% qrecord --config ui.interactive=1 -m2 2.diff
	diff --git a/.hgsub b/.hgsub			diff --git a/.hgsub b/.hgsub
	deleted file mode 100644			deleted file mode 100644
	examine changes to '.hgsub'? [Ynesfdaq?] y			examine changes to '.hgsub'?
				(enter ? for help) [Ynesfdaq?] y

	% debugsub should be empty			% debugsub should be empty

	$ hg qpop -qa			$ hg qpop -qa
	patch queue now empty			patch queue now empty
	$ testrm2 qrecord --config ui.interactive=1 -m3 3.diff <<EOF			$ testrm2 qrecord --config ui.interactive=1 -m3 3.diff <<EOF
	> y			> y
	> y			> y
	> EOF			> EOF
	adding a			adding a
	% update substate when removing .hgsub w/clean updated subrepo			% update substate when removing .hgsub w/clean updated subrepo
	R .hgsub			R .hgsub
	% qrecord --config ui.interactive=1 -m3 3.diff			% qrecord --config ui.interactive=1 -m3 3.diff
	diff --git a/.hgsub b/.hgsub			diff --git a/.hgsub b/.hgsub
	deleted file mode 100644			deleted file mode 100644
	examine changes to '.hgsub'? [Ynesfdaq?] y			examine changes to '.hgsub'?
				(enter ? for help) [Ynesfdaq?] y

	% debugsub should be empty			% debugsub should be empty

	$ cd ..			$ cd ..


	correctly handle subrepos with patch queues			correctly handle subrepos with patch queues
	$ mkrepo repo-subrepo-with-queue			$ mkrepo repo-subrepo-with-queue

tests/test-qrecord.t

	> y			> y
	> n			> n
	> y			> y
	> y			> y
	> n			> n
	> EOF			> EOF
	diff --git a/1.txt b/1.txt			diff --git a/1.txt b/1.txt
	2 hunks, 2 lines changed			2 hunks, 2 lines changed
	examine changes to '1.txt'? [Ynesfdaq?] y			examine changes to '1.txt'?
				(enter ? for help) [Ynesfdaq?] y

	@@ -1,3 +1,3 @@			@@ -1,3 +1,3 @@
	1			1
	-2			-2
	+2 2			+2 2
	3			3
	record change 1/4 to '1.txt'? [Ynesfdaq?] y			record change 1/4 to '1.txt'?
				(enter ? for help) [Ynesfdaq?] y

	@@ -3,3 +3,3 @@			@@ -3,3 +3,3 @@
	3			3
	-4			-4
	+4 4			+4 4
	5			5
	record change 2/4 to '1.txt'? [Ynesfdaq?] n			record change 2/4 to '1.txt'?
				(enter ? for help) [Ynesfdaq?] n

	diff --git a/2.txt b/2.txt			diff --git a/2.txt b/2.txt
	1 hunks, 1 lines changed			1 hunks, 1 lines changed
	examine changes to '2.txt'? [Ynesfdaq?] y			examine changes to '2.txt'?
				(enter ? for help) [Ynesfdaq?] y

	@@ -1,5 +1,5 @@			@@ -1,5 +1,5 @@
	a			a
	-b			-b
	+b b			+b b
	c			c
	d			d
	e			e
	record change 3/4 to '2.txt'? [Ynesfdaq?] y			record change 3/4 to '2.txt'?
				(enter ? for help) [Ynesfdaq?] y

	diff --git a/dir/a.txt b/dir/a.txt			diff --git a/dir/a.txt b/dir/a.txt
	1 hunks, 1 lines changed			1 hunks, 1 lines changed
	examine changes to 'dir/a.txt'? [Ynesfdaq?] n			examine changes to 'dir/a.txt'?
				(enter ? for help) [Ynesfdaq?] n


	After qrecord a.patch 'tip'"			After qrecord a.patch 'tip'"

	$ hg tip -p			$ hg tip -p
	changeset: 1:5d1ca63427ee			changeset: 1:5d1ca63427ee
	tag: a.patch			tag: a.patch
	tag: qbase			tag: qbase
	$ hg qrecord -d '0 0' -m bbb b.patch <<EOF			$ hg qrecord -d '0 0' -m bbb b.patch <<EOF
	> y			> y
	> y			> y
	> y			> y
	> y			> y
	> EOF			> EOF
	diff --git a/1.txt b/1.txt			diff --git a/1.txt b/1.txt
	1 hunks, 1 lines changed			1 hunks, 1 lines changed
	examine changes to '1.txt'? [Ynesfdaq?] y			examine changes to '1.txt'?
				(enter ? for help) [Ynesfdaq?] y

	@@ -1,5 +1,5 @@			@@ -1,5 +1,5 @@
	1			1
	2 2			2 2
	3			3
	-4			-4
	+4 4			+4 4
	5			5
	record change 1/2 to '1.txt'? [Ynesfdaq?] y			record change 1/2 to '1.txt'?
				(enter ? for help) [Ynesfdaq?] y

	diff --git a/dir/a.txt b/dir/a.txt			diff --git a/dir/a.txt b/dir/a.txt
	1 hunks, 1 lines changed			1 hunks, 1 lines changed
	examine changes to 'dir/a.txt'? [Ynesfdaq?] y			examine changes to 'dir/a.txt'?
				(enter ? for help) [Ynesfdaq?] y

	@@ -1,4 +1,4 @@			@@ -1,4 +1,4 @@
	-hello world			-hello world
	+hello world!			+hello world!

	someone			someone
	up			up
	record change 2/2 to 'dir/a.txt'? [Ynesfdaq?] y			record change 2/2 to 'dir/a.txt'?
				(enter ? for help) [Ynesfdaq?] y


	After qrecord b.patch 'tip'			After qrecord b.patch 'tip'

	$ hg tip -p			$ hg tip -p
	changeset: 2:b056198bf878			changeset: 2:b056198bf878
	tag: b.patch			tag: b.patch
	tag: qtip			tag: qtip

tests/test-revert-interactive.t

	> y			> y
	> n			> n
	> n			> n
	> EOF			> EOF
	remove added file folder1/i (Yn)? y			remove added file folder1/i (Yn)? y
	removing folder1/i			removing folder1/i
	diff --git a/f b/f			diff --git a/f b/f
	2 hunks, 2 lines changed			2 hunks, 2 lines changed
	examine changes to 'f'? [Ynesfdaq?] y			examine changes to 'f'?
				(enter ? for help) [Ynesfdaq?] y

	@@ -1,6 +1,5 @@			@@ -1,6 +1,5 @@
	-a			-a
	1			1
	2			2
	3			3
	4			4
	5			5
	apply change 1/6 to 'f'? [Ynesfdaq?] y			apply change 1/6 to 'f'?
				(enter ? for help) [Ynesfdaq?] y

	@@ -2,6 +1,5 @@			@@ -2,6 +1,5 @@
	1			1
	2			2
	3			3
	4			4
	5			5
	-b			-b
	apply change 2/6 to 'f'? [Ynesfdaq?] y			apply change 2/6 to 'f'?
				(enter ? for help) [Ynesfdaq?] y

	diff --git a/folder1/g b/folder1/g			diff --git a/folder1/g b/folder1/g
	2 hunks, 2 lines changed			2 hunks, 2 lines changed
	examine changes to 'folder1/g'? [Ynesfdaq?] y			examine changes to 'folder1/g'?
				(enter ? for help) [Ynesfdaq?] y

	@@ -1,6 +1,5 @@			@@ -1,6 +1,5 @@
	-c			-c
	1			1
	2			2
	3			3
	4			4
	5			5
	apply change 3/6 to 'folder1/g'? [Ynesfdaq?] ?			apply change 3/6 to 'folder1/g'?
				(enter ? for help) [Ynesfdaq?] ?

	y - yes, apply this change			y - yes, apply this change
	n - no, skip this change			n - no, skip this change
	e - edit this change manually			e - edit this change manually
	s - skip remaining changes to this file			s - skip remaining changes to this file
	f - apply remaining changes to this file			f - apply remaining changes to this file
	d - done, skip remaining changes and files			d - done, skip remaining changes and files
	a - apply all changes to all remaining files			a - apply all changes to all remaining files
	q - quit, applying no changes			q - quit, applying no changes
	? - ? (display help)			? - ? (display help)
	apply change 3/6 to 'folder1/g'? [Ynesfdaq?] y			apply change 3/6 to 'folder1/g'?
				(enter ? for help) [Ynesfdaq?] y

	@@ -2,6 +1,5 @@			@@ -2,6 +1,5 @@
	1			1
	2			2
	3			3
	4			4
	5			5
	-d			-d
	apply change 4/6 to 'folder1/g'? [Ynesfdaq?] n			apply change 4/6 to 'folder1/g'?
				(enter ? for help) [Ynesfdaq?] n

	diff --git a/folder2/h b/folder2/h			diff --git a/folder2/h b/folder2/h
	2 hunks, 2 lines changed			2 hunks, 2 lines changed
	examine changes to 'folder2/h'? [Ynesfdaq?] n			examine changes to 'folder2/h'?
				(enter ? for help) [Ynesfdaq?] n

	reverting f			reverting f
	reverting folder1/g			reverting folder1/g
	$ cat f			$ cat f
	1			1
	2			2
	3			3
	4			4
	5			5
	f			f

	Test that --interactive lift the need for --all			Test that --interactive lift the need for --all

	$ echo q \| hg revert -i -r 2			$ echo q \| hg revert -i -r 2
	diff --git a/folder1/g b/folder1/g			diff --git a/folder1/g b/folder1/g
	1 hunks, 1 lines changed			1 hunks, 1 lines changed
	examine changes to 'folder1/g'? [Ynesfdaq?] q			examine changes to 'folder1/g'?
				(enter ? for help) [Ynesfdaq?] q

	abort: user quit			abort: user quit
	[255]			[255]
	$ ls folder1/			$ ls folder1/
	g			g

	Test that a noop revert doesn't do an unnecessary backup			Test that a noop revert doesn't do an unnecessary backup
	$ (echo n) \| hg revert -i -r 2 folder1/g			$ (echo n) \| hg revert -i -r 2 folder1/g
	diff --git a/folder1/g b/folder1/g			diff --git a/folder1/g b/folder1/g
	1 hunks, 1 lines changed			1 hunks, 1 lines changed
	@@ -3,4 +3,3 @@			@@ -3,4 +3,3 @@
	3			3
	4			4
	5			5
	-d			-d
	apply this change to 'folder1/g'? [Ynesfdaq?] n			apply this change to 'folder1/g'?
				(enter ? for help) [Ynesfdaq?] n

	$ ls folder1/			$ ls folder1/
	g			g

	Test --no-backup			Test --no-backup
	$ (echo y) \| hg revert -i -C -r 2 folder1/g			$ (echo y) \| hg revert -i -C -r 2 folder1/g
	diff --git a/folder1/g b/folder1/g			diff --git a/folder1/g b/folder1/g
	1 hunks, 1 lines changed			1 hunks, 1 lines changed
	@@ -3,4 +3,3 @@			@@ -3,4 +3,3 @@
	3			3
	4			4
	5			5
	-d			-d
	apply this change to 'folder1/g'? [Ynesfdaq?] y			apply this change to 'folder1/g'?
				(enter ? for help) [Ynesfdaq?] y

	$ ls folder1/			$ ls folder1/
	g			g
	>>> open('folder1/g', 'wb').write(b"1\n2\n3\n4\n5\nd\n") and None			>>> open('folder1/g', 'wb').write(b"1\n2\n3\n4\n5\nd\n") and None


	$ hg update -C 6			$ hg update -C 6
	3 files updated, 0 files merged, 0 files removed, 0 files unresolved			3 files updated, 0 files merged, 0 files removed, 0 files unresolved
	$ hg revert -i -r 2 --all -- << EOF			$ hg revert -i -r 2 --all -- << EOF
	> n			> n
	> y			> y
	> y			> y
	> y			> y
	> y			> y
	> y			> y
	> n			> n
	> n			> n
	> EOF			> EOF
	remove added file folder1/i (Yn)? n			remove added file folder1/i (Yn)? n
	diff --git a/f b/f			diff --git a/f b/f
	2 hunks, 2 lines changed			2 hunks, 2 lines changed
	examine changes to 'f'? [Ynesfdaq?] y			examine changes to 'f'?
				(enter ? for help) [Ynesfdaq?] y

	@@ -1,6 +1,5 @@			@@ -1,6 +1,5 @@
	-a			-a
	1			1
	2			2
	3			3
	4			4
	5			5
	apply change 1/6 to 'f'? [Ynesfdaq?] y			apply change 1/6 to 'f'?
				(enter ? for help) [Ynesfdaq?] y

	@@ -2,6 +1,5 @@			@@ -2,6 +1,5 @@
	1			1
	2			2
	3			3
	4			4
	5			5
	-b			-b
	apply change 2/6 to 'f'? [Ynesfdaq?] y			apply change 2/6 to 'f'?
				(enter ? for help) [Ynesfdaq?] y

	diff --git a/folder1/g b/folder1/g			diff --git a/folder1/g b/folder1/g
	2 hunks, 2 lines changed			2 hunks, 2 lines changed
	examine changes to 'folder1/g'? [Ynesfdaq?] y			examine changes to 'folder1/g'?
				(enter ? for help) [Ynesfdaq?] y

	@@ -1,6 +1,5 @@			@@ -1,6 +1,5 @@
	-c			-c
	1			1
	2			2
	3			3
	4			4
	5			5
	apply change 3/6 to 'folder1/g'? [Ynesfdaq?] y			apply change 3/6 to 'folder1/g'?
				(enter ? for help) [Ynesfdaq?] y

	@@ -2,6 +1,5 @@			@@ -2,6 +1,5 @@
	1			1
	2			2
	3			3
	4			4
	5			5
	-d			-d
	apply change 4/6 to 'folder1/g'? [Ynesfdaq?] n			apply change 4/6 to 'folder1/g'?
				(enter ? for help) [Ynesfdaq?] n

	diff --git a/folder2/h b/folder2/h			diff --git a/folder2/h b/folder2/h
	2 hunks, 2 lines changed			2 hunks, 2 lines changed
	examine changes to 'folder2/h'? [Ynesfdaq?] n			examine changes to 'folder2/h'?
				(enter ? for help) [Ynesfdaq?] n

	reverting f			reverting f
	reverting folder1/g			reverting folder1/g
	$ cat f			$ cat f
	1			1
	2			2
	3			3
	4			4
	2 hunks, 2 lines changed			2 hunks, 2 lines changed
	@@ -1,6 +1,5 @@			@@ -1,6 +1,5 @@
	-a			-a
	1			1
	2			2
	3			3
	4			4
	5			5
	discard change 1/2 to 'f'? [Ynesfdaq?] ?			discard change 1/2 to 'f'?
				(enter ? for help) [Ynesfdaq?] ?

	y - yes, discard this change			y - yes, discard this change
	n - no, skip this change			n - no, skip this change
	e - edit this change manually			e - edit this change manually
	s - skip remaining changes to this file			s - skip remaining changes to this file
	f - discard remaining changes to this file			f - discard remaining changes to this file
	d - done, skip remaining changes and files			d - done, skip remaining changes and files
	a - discard all changes to all remaining files			a - discard all changes to all remaining files
	q - quit, discarding no changes			q - quit, discarding no changes
	? - ? (display help)			? - ? (display help)
	discard change 1/2 to 'f'? [Ynesfdaq?] y			discard change 1/2 to 'f'?
				(enter ? for help) [Ynesfdaq?] y

	@@ -2,6 +1,5 @@			@@ -2,6 +1,5 @@
	1			1
	2			2
	3			3
	4			4
	5			5
	-b			-b
	discard change 2/2 to 'f'? [Ynesfdaq?] n			discard change 2/2 to 'f'?
				(enter ? for help) [Ynesfdaq?] n

	$ hg st			$ hg st
	M f			M f
	M folder1/g			M folder1/g
	? f.orig			? f.orig
	$ cat f			$ cat f
	a			a
	1			1
	Patterns			Patterns

	$ hg revert -i 'glob:f*' << EOF			$ hg revert -i 'glob:f*' << EOF
	> y			> y
	> n			> n
	> EOF			> EOF
	diff --git a/f b/f			diff --git a/f b/f
	1 hunks, 1 lines changed			1 hunks, 1 lines changed
	examine changes to 'f'? [Ynesfdaq?] y			examine changes to 'f'?
				(enter ? for help) [Ynesfdaq?] y

	@@ -4,4 +4,3 @@			@@ -4,4 +4,3 @@
	3			3
	4			4
	5			5
	-b			-b
	discard this change to 'f'? [Ynesfdaq?] n			discard this change to 'f'?
				(enter ? for help) [Ynesfdaq?] n


	$ hg update -C .			$ hg update -C .
	2 files updated, 0 files merged, 0 files removed, 0 files unresolved			2 files updated, 0 files merged, 0 files removed, 0 files unresolved

	Check editing files newly added by a revert			Check editing files newly added by a revert

	1) Create a dummy editor changing 1 to 42			1) Create a dummy editor changing 1 to 42
	3) Use interactive revert with editing (replacing +1 with +42):			3) Use interactive revert with editing (replacing +1 with +42):
	$ printf "0\n2\n" > k			$ printf "0\n2\n" > k
	$ HGEDITOR="\"sh\" \"${TESTTMP}/editor.sh\"" hg revert -i <<EOF			$ HGEDITOR="\"sh\" \"${TESTTMP}/editor.sh\"" hg revert -i <<EOF
	> y			> y
	> e			> e
	> EOF			> EOF
	diff --git a/k b/k			diff --git a/k b/k
	1 hunks, 2 lines changed			1 hunks, 2 lines changed
	examine changes to 'k'? [Ynesfdaq?] y			examine changes to 'k'?
				(enter ? for help) [Ynesfdaq?] y

	@@ -1,1 +1,2 @@			@@ -1,1 +1,2 @@
	-1			-1
	+0			+0
	+2			+2
	discard this change to 'k'? [Ynesfdaq?] e			discard this change to 'k'?
				(enter ? for help) [Ynesfdaq?] e

	reverting k			reverting k
	$ cat k			$ cat k
	42			42

	$ hg update -C .			$ hg update -C .
	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 purge			$ hg purge
	1 (no-eol)			1 (no-eol)

	$ hg revert -ir'.^' <<EOF			$ hg revert -ir'.^' <<EOF
	> y			> y
	> y			> y
	> EOF			> EOF
	diff --git a/a b/a			diff --git a/a b/a
	1 hunks, 1 lines changed			1 hunks, 1 lines changed
	examine changes to 'a'? [Ynesfdaq?] y			examine changes to 'a'?
				(enter ? for help) [Ynesfdaq?] y

	@@ -1,2 +1,1 @@			@@ -1,2 +1,1 @@
	0			0
	-1			-1
	\ No newline at end of file			\ No newline at end of file
	apply this change to 'a'? [Ynesfdaq?] y			apply this change to 'a'?
				(enter ? for help) [Ynesfdaq?] y

	reverting a			reverting a
	$ cat a			$ cat a
	0			0

	When specified pattern does not exist, we should exit early (issue5789).			When specified pattern does not exist, we should exit early (issue5789).

	$ hg files			$ hg files

	$ HGEDITOR="\"sh\" \"${TESTTMP}/editor.sh\"" hg revert -i <<EOF			$ HGEDITOR="\"sh\" \"${TESTTMP}/editor.sh\"" hg revert -i <<EOF
	> y			> y
	> n			> n
	> e			> e
	> EOF			> EOF
	diff --git a/a b/a			diff --git a/a b/a
	2 hunks, 2 lines changed			2 hunks, 2 lines changed
	examine changes to 'a'? [Ynesfdaq?] y			examine changes to 'a'?
				(enter ? for help) [Ynesfdaq?] y

	@@ -1,1 +1,2 @@			@@ -1,1 +1,2 @@
	+x			+x
	a			a
	keep change 1/2 to 'a'? [Ynesfdaq?] n			keep change 1/2 to 'a'?
				(enter ? for help) [Ynesfdaq?] n

	@@ -1,1 +2,2 @@			@@ -1,1 +2,2 @@
	a			a
	+y			+y
	keep change 2/2 to 'a'? [Ynesfdaq?] e			keep change 2/2 to 'a'?
				(enter ? for help) [Ynesfdaq?] e

	reverting a			reverting a
	$ cat a			$ cat a
	a			a
	y			y
	new line			new line

tests/test-shelve.t

	[255]			[255]
	$ hg shelve --interactive << EOF			$ hg shelve --interactive << EOF
	> y			> y
	> y			> y
	> n			> n
	> EOF			> EOF
	diff --git a/a/a b/a/a			diff --git a/a/a b/a/a
	2 hunks, 2 lines changed			2 hunks, 2 lines changed
	examine changes to 'a/a'? [Ynesfdaq?] y			examine changes to 'a/a'?
				(enter ? for help) [Ynesfdaq?] y

	@@ -1,3 +1,4 @@			@@ -1,3 +1,4 @@
	+a			+a
	a			a
	c			c
	x			x
	record change 1/2 to 'a/a'? [Ynesfdaq?] y			record change 1/2 to 'a/a'?
				(enter ? for help) [Ynesfdaq?] y

	@@ -1,3 +2,4 @@			@@ -1,3 +2,4 @@
	a			a
	c			c
	x			x
	+x			+x
	record change 2/2 to 'a/a'? [Ynesfdaq?] n			record change 2/2 to 'a/a'?
				(enter ? for help) [Ynesfdaq?] n

	shelved as test			shelved as test
	merging a/a			merging a/a
	0 files updated, 1 files merged, 0 files removed, 0 files unresolved			0 files updated, 1 files merged, 0 files removed, 0 files unresolved
	$ cat a/a			$ cat a/a
	a			a
	c			c
	x			x

tests/test-split.t

	> y			> y
	> y			> y
	> EOF			> EOF
	> }			> }

	$ HGEDITOR=false runsplit			$ HGEDITOR=false runsplit
	diff --git a/a b/a			diff --git a/a b/a
	3 hunks, 3 lines changed			3 hunks, 3 lines changed
	examine changes to 'a'? [Ynesfdaq?] y			examine changes to 'a'?
				(enter ? for help) [Ynesfdaq?] y

	@@ -1,1 +1,1 @@			@@ -1,1 +1,1 @@
	-1			-1
	+11			+11
	record change 1/3 to 'a'? [Ynesfdaq?] n			record change 1/3 to 'a'?
				(enter ? for help) [Ynesfdaq?] n

	@@ -3,1 +3,1 @@ 2			@@ -3,1 +3,1 @@ 2
	-3			-3
	+33			+33
	record change 2/3 to 'a'? [Ynesfdaq?] n			record change 2/3 to 'a'?
				(enter ? for help) [Ynesfdaq?] n

	@@ -5,1 +5,1 @@ 4			@@ -5,1 +5,1 @@ 4
	-5			-5
	+55			+55
	record change 3/3 to 'a'? [Ynesfdaq?] y			record change 3/3 to 'a'?
				(enter ? for help) [Ynesfdaq?] y

	transaction abort!			transaction abort!
	rollback completed			rollback completed
	abort: edit failed: false exited with status 1			abort: edit failed: false exited with status 1
	[255]			[255]
	$ hg status			$ hg status

	$ HGEDITOR="\"$PYTHON\" $TESTTMP/editor.py"			$ HGEDITOR="\"$PYTHON\" $TESTTMP/editor.py"
	$ runsplit			$ runsplit
	diff --git a/a b/a			diff --git a/a b/a
	3 hunks, 3 lines changed			3 hunks, 3 lines changed
	examine changes to 'a'? [Ynesfdaq?] y			examine changes to 'a'?
				(enter ? for help) [Ynesfdaq?] y

	@@ -1,1 +1,1 @@			@@ -1,1 +1,1 @@
	-1			-1
	+11			+11
	record change 1/3 to 'a'? [Ynesfdaq?] n			record change 1/3 to 'a'?
				(enter ? for help) [Ynesfdaq?] n

	@@ -3,1 +3,1 @@ 2			@@ -3,1 +3,1 @@ 2
	-3			-3
	+33			+33
	record change 2/3 to 'a'? [Ynesfdaq?] n			record change 2/3 to 'a'?
				(enter ? for help) [Ynesfdaq?] n

	@@ -5,1 +5,1 @@ 4			@@ -5,1 +5,1 @@ 4
	-5			-5
	+55			+55
	record change 3/3 to 'a'? [Ynesfdaq?] y			record change 3/3 to 'a'?
				(enter ? for help) [Ynesfdaq?] y

	EDITOR: HG: Splitting 1df0d5c5a3ab. Write commit message for the first split changeset.			EDITOR: HG: Splitting 1df0d5c5a3ab. Write commit message for the first split changeset.
	EDITOR: a2			EDITOR: a2
	EDITOR:			EDITOR:
	EDITOR:			EDITOR:
	EDITOR: HG: Enter commit message. Lines beginning with 'HG:' are removed.			EDITOR: HG: Enter commit message. Lines beginning with 'HG:' are removed.
	EDITOR: HG: Leave message empty to abort commit.			EDITOR: HG: Leave message empty to abort commit.
	EDITOR: HG: --			EDITOR: HG: --
	EDITOR: HG: user: test			EDITOR: HG: user: test
	EDITOR: HG: branch 'default'			EDITOR: HG: branch 'default'
	EDITOR: HG: changed a			EDITOR: HG: changed a
	created new head			created new head
	diff --git a/a b/a			diff --git a/a b/a
	2 hunks, 2 lines changed			2 hunks, 2 lines changed
	examine changes to 'a'? [Ynesfdaq?] y			examine changes to 'a'?
				(enter ? for help) [Ynesfdaq?] y

	@@ -1,1 +1,1 @@			@@ -1,1 +1,1 @@
	-1			-1
	+11			+11
	record change 1/2 to 'a'? [Ynesfdaq?] n			record change 1/2 to 'a'?
				(enter ? for help) [Ynesfdaq?] n

	@@ -3,1 +3,1 @@ 2			@@ -3,1 +3,1 @@ 2
	-3			-3
	+33			+33
	record change 2/2 to 'a'? [Ynesfdaq?] y			record change 2/2 to 'a'?
				(enter ? for help) [Ynesfdaq?] y

	EDITOR: HG: Splitting 1df0d5c5a3ab. So far it has been split into:			EDITOR: HG: Splitting 1df0d5c5a3ab. So far it has been split into:
	EDITOR: HG: - e704349bd21b: split 1			EDITOR: HG: - e704349bd21b: split 1
	EDITOR: HG: Write commit message for the next split changeset.			EDITOR: HG: Write commit message for the next split changeset.
	EDITOR: a2			EDITOR: a2
	EDITOR:			EDITOR:
	EDITOR:			EDITOR:
	EDITOR: HG: Enter commit message. Lines beginning with 'HG:' are removed.			EDITOR: HG: Enter commit message. Lines beginning with 'HG:' are removed.
	EDITOR: HG: Leave message empty to abort commit.			EDITOR: HG: Leave message empty to abort commit.
	EDITOR: HG: --			EDITOR: HG: --
	EDITOR: HG: user: test			EDITOR: HG: user: test
	EDITOR: HG: branch 'default'			EDITOR: HG: branch 'default'
	EDITOR: HG: changed a			EDITOR: HG: changed a
	diff --git a/a b/a			diff --git a/a b/a
	1 hunks, 1 lines changed			1 hunks, 1 lines changed
	examine changes to 'a'? [Ynesfdaq?] y			examine changes to 'a'?
				(enter ? for help) [Ynesfdaq?] y

	@@ -1,1 +1,1 @@			@@ -1,1 +1,1 @@
	-1			-1
	+11			+11
	record this change to 'a'? [Ynesfdaq?] y			record this change to 'a'?
				(enter ? for help) [Ynesfdaq?] y

	EDITOR: HG: Splitting 1df0d5c5a3ab. So far it has been split into:			EDITOR: HG: Splitting 1df0d5c5a3ab. So far it has been split into:
	EDITOR: HG: - e704349bd21b: split 1			EDITOR: HG: - e704349bd21b: split 1
	EDITOR: HG: - a09ad58faae3: split 2			EDITOR: HG: - a09ad58faae3: split 2
	EDITOR: HG: Write commit message for the next split changeset.			EDITOR: HG: Write commit message for the next split changeset.
	EDITOR: a2			EDITOR: a2
	EDITOR:			EDITOR:
	EDITOR:			EDITOR:
	> Split B			> Split B
	> EOF			> EOF
	$ cat <<EOF \| hg split $B			$ cat <<EOF \| hg split $B
	> y			> y
	> y			> y
	> EOF			> EOF
	diff --git a/B b/B			diff --git a/B b/B
	new file mode 100644			new file mode 100644
	examine changes to 'B'? [Ynesfdaq?] y			examine changes to 'B'?
				(enter ? for help) [Ynesfdaq?] y

	@@ -0,0 +1,1 @@			@@ -0,0 +1,1 @@
	+B			+B
	\ No newline at end of file			\ No newline at end of file
	record this change to 'B'? [Ynesfdaq?] y			record this change to 'B'?
				(enter ? for help) [Ynesfdaq?] y

	EDITOR: HG: Splitting 112478962961. Write commit message for the first split changeset.			EDITOR: HG: Splitting 112478962961. Write commit message for the first split changeset.
	EDITOR: B			EDITOR: B
	EDITOR:			EDITOR:
	EDITOR:			EDITOR:
	EDITOR: HG: Enter commit message. Lines beginning with 'HG:' are removed.			EDITOR: HG: Enter commit message. Lines beginning with 'HG:' are removed.
	EDITOR: HG: Leave message empty to abort commit.			EDITOR: HG: Leave message empty to abort commit.
	EDITOR: HG: --			EDITOR: HG: --
	$ cat > $TESTTMP/messages <<EOF			$ cat > $TESTTMP/messages <<EOF
	> split 1			> split 1
	> --			> --
	> split 2			> split 2
	> EOF			> EOF
	$ printf 'f\nn\nf\n' \| hg --config extensions.split= --config diff.ignoreblanklines=1 split			$ printf 'f\nn\nf\n' \| hg --config extensions.split= --config diff.ignoreblanklines=1 split
	diff --git a/bar b/bar			diff --git a/bar b/bar
	2 hunks, 2 lines changed			2 hunks, 2 lines changed
	examine changes to 'bar'? [Ynesfdaq?] f			examine changes to 'bar'?
				(enter ? for help) [Ynesfdaq?] f

	diff --git a/foo b/foo			diff --git a/foo b/foo
	1 hunks, 1 lines changed			1 hunks, 1 lines changed
	examine changes to 'foo'? [Ynesfdaq?] n			examine changes to 'foo'?
				(enter ? for help) [Ynesfdaq?] n

	EDITOR: HG: Splitting dd3c45017cbf. Write commit message for the first split changeset.			EDITOR: HG: Splitting dd3c45017cbf. Write commit message for the first split changeset.
	EDITOR: splitme			EDITOR: splitme
	EDITOR:			EDITOR:
	EDITOR:			EDITOR:
	EDITOR: HG: Enter commit message. Lines beginning with 'HG:' are removed.			EDITOR: HG: Enter commit message. Lines beginning with 'HG:' are removed.
	EDITOR: HG: Leave message empty to abort commit.			EDITOR: HG: Leave message empty to abort commit.
	EDITOR: HG: --			EDITOR: HG: --
	EDITOR: HG: user: test			EDITOR: HG: user: test
	EDITOR: HG: branch 'default'			EDITOR: HG: branch 'default'
	EDITOR: HG: changed bar			EDITOR: HG: changed bar
	created new head			created new head
	diff --git a/foo b/foo			diff --git a/foo b/foo
	1 hunks, 1 lines changed			1 hunks, 1 lines changed
	examine changes to 'foo'? [Ynesfdaq?] f			examine changes to 'foo'?
				(enter ? for help) [Ynesfdaq?] f

	EDITOR: HG: Splitting dd3c45017cbf. So far it has been split into:			EDITOR: HG: Splitting dd3c45017cbf. So far it has been split into:
	EDITOR: HG: - f205aea1c624: split 1			EDITOR: HG: - f205aea1c624: split 1
	EDITOR: HG: Write commit message for the next split changeset.			EDITOR: HG: Write commit message for the next split changeset.
	EDITOR: splitme			EDITOR: splitme
	EDITOR:			EDITOR:
	EDITOR:			EDITOR:
	EDITOR: HG: Enter commit message. Lines beginning with 'HG:' are removed.			EDITOR: HG: Enter commit message. Lines beginning with 'HG:' are removed.
	$ cat > $TESTTMP/messages <<EOF			$ cat > $TESTTMP/messages <<EOF
	> split 1			> split 1
	> --			> --
	> split 2			> split 2
	> EOF			> EOF
	$ printf 'f\nn\nf\n' \| hg --config extensions.split= --config diff.ignoreblanklines=1 split			$ printf 'f\nn\nf\n' \| hg --config extensions.split= --config diff.ignoreblanklines=1 split
	diff --git a/bar b/bar			diff --git a/bar b/bar
	1 hunks, 1 lines changed			1 hunks, 1 lines changed
	examine changes to 'bar'? [Ynesfdaq?] f			examine changes to 'bar'?
				(enter ? for help) [Ynesfdaq?] f

	diff --git a/foo b/foo			diff --git a/foo b/foo
	2 hunks, 2 lines changed			2 hunks, 2 lines changed
	examine changes to 'foo'? [Ynesfdaq?] n			examine changes to 'foo'?
				(enter ? for help) [Ynesfdaq?] n

	EDITOR: HG: Splitting 904c80b40a4a. Write commit message for the first split changeset.			EDITOR: HG: Splitting 904c80b40a4a. Write commit message for the first split changeset.
	EDITOR: splitme			EDITOR: splitme
	EDITOR:			EDITOR:
	EDITOR:			EDITOR:
	EDITOR: HG: Enter commit message. Lines beginning with 'HG:' are removed.			EDITOR: HG: Enter commit message. Lines beginning with 'HG:' are removed.
	EDITOR: HG: Leave message empty to abort commit.			EDITOR: HG: Leave message empty to abort commit.
	EDITOR: HG: --			EDITOR: HG: --
	EDITOR: HG: user: test			EDITOR: HG: user: test
	EDITOR: HG: branch 'default'			EDITOR: HG: branch 'default'
	EDITOR: HG: changed bar			EDITOR: HG: changed bar
	created new head			created new head
	diff --git a/foo b/foo			diff --git a/foo b/foo
	2 hunks, 2 lines changed			2 hunks, 2 lines changed
	examine changes to 'foo'? [Ynesfdaq?] f			examine changes to 'foo'?
				(enter ? for help) [Ynesfdaq?] f

	EDITOR: HG: Splitting 904c80b40a4a. So far it has been split into:			EDITOR: HG: Splitting 904c80b40a4a. So far it has been split into:
	EDITOR: HG: - ffecf40fa954: split 1			EDITOR: HG: - ffecf40fa954: split 1
	EDITOR: HG: Write commit message for the next split changeset.			EDITOR: HG: Write commit message for the next split changeset.
	EDITOR: splitme			EDITOR: splitme
	EDITOR:			EDITOR:
	EDITOR:			EDITOR:
	EDITOR: HG: Enter commit message. Lines beginning with 'HG:' are removed.			EDITOR: HG: Enter commit message. Lines beginning with 'HG:' are removed.
	#if no-windows			#if no-windows
	$ cat > $TESTTMP/messages <<EOF			$ cat > $TESTTMP/messages <<EOF
	> split 1			> split 1
	> EOF			> EOF
	$ printf 'y\n' \| hg split			$ printf 'y\n' \| hg split
	diff --git a/foo b/foo			diff --git a/foo b/foo
	old mode 100644			old mode 100644
	new mode 100755			new mode 100755
	examine changes to 'foo'? [Ynesfdaq?] y			examine changes to 'foo'?
				(enter ? for help) [Ynesfdaq?] y

	EDITOR: HG: Splitting 3a2125f0f4cb. Write commit message for the first split changeset.			EDITOR: HG: Splitting 3a2125f0f4cb. Write commit message for the first split changeset.
	EDITOR: make executable			EDITOR: make executable
	EDITOR:			EDITOR:
	EDITOR:			EDITOR:
	EDITOR: HG: Enter commit message. Lines beginning with 'HG:' are removed.			EDITOR: HG: Enter commit message. Lines beginning with 'HG:' are removed.
	EDITOR: HG: Leave message empty to abort commit.			EDITOR: HG: Leave message empty to abort commit.
	EDITOR: HG: --			EDITOR: HG: --

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	15627		Jun 20 2019, 6:09 PM	★	★
Diff 2	15796	rHGf802a75da585793f4125915a76dd15fc211e28aa	Jun 20 2019, 5:45 PM	★	★