mercurial: tests/test-histedit-edit.t@dd3af304b3c8 (annotated)

17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	1	$ . "$TESTDIR/histedit-helpers.sh"
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	2
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	3	$ cat >> $HGRCPATH <<EOF
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	4	> [extensions]
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	5	> histedit=
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	6	> EOF
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	7
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	8	$ initrepo ()
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	9	> {
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	10	> hg init r
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	11	> cd r
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	12	> for x in a b c d e f ; do
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	13	> echo $x > $x
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	14	> hg add $x
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	15	> hg ci -m $x
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	16	> done
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	17	> }
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	18
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	19	$ initrepo
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	20
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	21	log before edit
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	22	$ hg log --graph
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	23	@ changeset: 5:652413bf663e
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	24	\| tag: tip
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	25	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	26	\| date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	27	\| summary: f
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	28	\|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	29	o changeset: 4:e860deea161a
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	30	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	31	\| date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	32	\| summary: e
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	33	\|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	34	o changeset: 3:055a42cdd887
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	35	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	36	\| date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	37	\| summary: d
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	38	\|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	39	o changeset: 2:177f92b77385
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	40	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	41	\| date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	42	\| summary: c
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	43	\|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	44	o changeset: 1:d2ae7f538514
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	45	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	46	\| date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	47	\| summary: b
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	48	\|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	49	o changeset: 0:cb9a9f314b8b
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	50	user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	51	date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	52	summary: a
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	53
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	54
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	55	edit the history
19019 53060cc1b601 histedit-test: generalise --commands "-" usage Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18942 diff changeset	56	$ hg histedit 177f92b77385 --commands - 2>&1 << EOF\| fixbundle
53060cc1b601 histedit-test: generalise --commands "-" usage Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18942 diff changeset	57	> pick 177f92b77385 c
53060cc1b601 histedit-test: generalise --commands "-" usage Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18942 diff changeset	58	> pick 055a42cdd887 d
53060cc1b601 histedit-test: generalise --commands "-" usage Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18942 diff changeset	59	> edit e860deea161a e
53060cc1b601 histedit-test: generalise --commands "-" usage Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18942 diff changeset	60	> pick 652413bf663e f
53060cc1b601 histedit-test: generalise --commands "-" usage Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18942 diff changeset	61	> EOF
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	62	0 files updated, 0 files merged, 2 files removed, 0 files unresolved
18934 93f3a06b2035 histedit: switch from util.Abort to util.InterventionRequired where appropriate (bc) Augie Fackler <raf@durin42.com> parents: 18913 diff changeset	63	Make changes as needed, you may commit or record as needed now.
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	64	When you are finished, run hg histedit --continue to resume.
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	65
17749 40601f2b7608 histedit: simplify computation of `newchildren` during --continue Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17087 diff changeset	66	Go at a random point and try to continue
40601f2b7608 histedit: simplify computation of `newchildren` during --continue Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17087 diff changeset	67
40601f2b7608 histedit: simplify computation of `newchildren` during --continue Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17087 diff changeset	68	$ hg id -n
40601f2b7608 histedit: simplify computation of `newchildren` during --continue Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17087 diff changeset	69	3+
40601f2b7608 histedit: simplify computation of `newchildren` during --continue Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17087 diff changeset	70	$ hg up 0
19479 11664641fbad histedit: add checkunfinished support (issue3955) Matt Mackall <mpm@selenic.com> parents: 19215 diff changeset	71	abort: histedit in progress
11664641fbad histedit: add checkunfinished support (issue3955) Matt Mackall <mpm@selenic.com> parents: 19215 diff changeset	72	(use 'hg histedit --continue' or 'hg histedit --abort')
17749 40601f2b7608 histedit: simplify computation of `newchildren` during --continue Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17087 diff changeset	73	[255]
40601f2b7608 histedit: simplify computation of `newchildren` during --continue Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17087 diff changeset	74
19496 607191a45f8c checkunfinished: accommodate histedit quirk Matt Mackall <mpm@selenic.com> parents: 19479 diff changeset	75	commit, then edit the revision
607191a45f8c checkunfinished: accommodate histedit quirk Matt Mackall <mpm@selenic.com> parents: 19479 diff changeset	76	$ hg ci -m 'wat'
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	77	created new head
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	78	$ echo a > e
17087 a79776f427b4 tests: make histedit pass on Windows MSYS Mads Kiilerich <mads@kiilerich.com> parents: 17086 diff changeset	79	$ HGEDITOR='echo foobaz > ' hg histedit --continue 2>&1 \| fixbundle
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	80	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	81	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	82
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	83	$ hg log --graph
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17749 diff changeset	84	@ changeset: 6:b5f70786f9b0
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	85	\| tag: tip
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	86	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	87	\| date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	88	\| summary: f
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	89	\|
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17749 diff changeset	90	o changeset: 5:a5e1ba2f7afb
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	91	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	92	\| date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	93	\| summary: foobaz
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	94	\|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	95	o changeset: 4:1a60820cd1f6
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	96	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	97	\| date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	98	\| summary: wat
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	99	\|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	100	o changeset: 3:055a42cdd887
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	101	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	102	\| date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	103	\| summary: d
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	104	\|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	105	o changeset: 2:177f92b77385
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	106	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	107	\| date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	108	\| summary: c
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	109	\|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	110	o changeset: 1:d2ae7f538514
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	111	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	112	\| date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	113	\| summary: b
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	114	\|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	115	o changeset: 0:cb9a9f314b8b
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	116	user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	117	date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	118	summary: a
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	119
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	120
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	121	$ hg cat e
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	122	a
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	123
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17749 diff changeset	124	check histedit_source
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17749 diff changeset	125
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17749 diff changeset	126	$ hg log --debug --rev 5
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17749 diff changeset	127	changeset: 5:a5e1ba2f7afb899ef1581cea528fd885d2fca70d
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17749 diff changeset	128	phase: draft
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17749 diff changeset	129	parent: 4:1a60820cd1f6004a362aa622ebc47d59bc48eb34
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17749 diff changeset	130	parent: -1:0000000000000000000000000000000000000000
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17749 diff changeset	131	manifest: 5:5ad3be8791f39117565557781f5464363b918a45
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17749 diff changeset	132	user: test
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17749 diff changeset	133	date: Thu Jan 01 00:00:00 1970 +0000
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17749 diff changeset	134	files: e
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17749 diff changeset	135	extra: branch=default
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17749 diff changeset	136	extra: histedit_source=e860deea161a2f77de56603b340ebbb4536308ae
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17749 diff changeset	137	description:
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17749 diff changeset	138	foobaz
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17749 diff changeset	139
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17749 diff changeset	140
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17749 diff changeset	141
19019 53060cc1b601 histedit-test: generalise --commands "-" usage Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18942 diff changeset	142	$ hg histedit tip --commands - 2>&1 <<EOF\| fixbundle
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17749 diff changeset	143	> edit b5f70786f9b0 f
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	144	> EOF
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	145	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
18934 93f3a06b2035 histedit: switch from util.Abort to util.InterventionRequired where appropriate (bc) Augie Fackler <raf@durin42.com> parents: 18913 diff changeset	146	Make changes as needed, you may commit or record as needed now.
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	147	When you are finished, run hg histedit --continue to resume.
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	148	$ hg status
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	149	A f
19213 f324a9b8d4bf summary: add tests for some extensions we plan to modify Bryan O'Sullivan <bryano@fb.com> parents: 19019 diff changeset	150
f324a9b8d4bf summary: add tests for some extensions we plan to modify Bryan O'Sullivan <bryano@fb.com> parents: 19019 diff changeset	151	$ hg summary
f324a9b8d4bf summary: add tests for some extensions we plan to modify Bryan O'Sullivan <bryano@fb.com> parents: 19019 diff changeset	152	parent: 5:a5e1ba2f7afb
f324a9b8d4bf summary: add tests for some extensions we plan to modify Bryan O'Sullivan <bryano@fb.com> parents: 19019 diff changeset	153	foobaz
f324a9b8d4bf summary: add tests for some extensions we plan to modify Bryan O'Sullivan <bryano@fb.com> parents: 19019 diff changeset	154	branch: default
f324a9b8d4bf summary: add tests for some extensions we plan to modify Bryan O'Sullivan <bryano@fb.com> parents: 19019 diff changeset	155	commit: 1 added (new branch head)
f324a9b8d4bf summary: add tests for some extensions we plan to modify Bryan O'Sullivan <bryano@fb.com> parents: 19019 diff changeset	156	update: 1 new changesets (update)
19215 f184fe1e2ac5 summary: add a histedit hook Bryan O'Sullivan <bryano@fb.com> parents: 19213 diff changeset	157	hist: 1 remaining (histedit --continue)
19213 f324a9b8d4bf summary: add tests for some extensions we plan to modify Bryan O'Sullivan <bryano@fb.com> parents: 19019 diff changeset	158
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	159	$ HGEDITOR='true' hg histedit --continue
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	160	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17749 diff changeset	161	saved backup bundle to $TESTTMP/r/.hg/strip-backup/b5f70786f9b0-backup.hg (glob)
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17749 diff changeset	162
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	163	$ hg status
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	164
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	165	log after edit
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	166	$ hg log --limit 1
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17749 diff changeset	167	changeset: 6:a107ee126658
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	168	tag: tip
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	169	user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	170	date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	171	summary: f
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	172
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	173
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	174	say we'll change the message, but don't.
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	175	$ cat > ../edit.sh <<EOF
17086 5f2cacb715dc tests: make histedit tests more resilient to filesystem variation Mads Kiilerich <mads@kiilerich.com> parents: 17085 diff changeset	176	> cat "\$1" \| sed s/pick/mess/ > tmp
5f2cacb715dc tests: make histedit tests more resilient to filesystem variation Mads Kiilerich <mads@kiilerich.com> parents: 17085 diff changeset	177	> mv tmp "\$1"
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	178	> EOF
17086 5f2cacb715dc tests: make histedit tests more resilient to filesystem variation Mads Kiilerich <mads@kiilerich.com> parents: 17085 diff changeset	179	$ HGEDITOR="sh ../edit.sh" hg histedit tip 2>&1 \| fixbundle
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	180	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	181	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	182	$ hg status
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	183	$ hg log --limit 1
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17749 diff changeset	184	changeset: 6:1fd3b2fe7754
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	185	tag: tip
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	186	user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	187	date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	188	summary: f
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	189
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	190
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	191	modify the message
19019 53060cc1b601 histedit-test: generalise --commands "-" usage Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18942 diff changeset	192	$ hg histedit tip --commands - 2>&1 << EOF \| fixbundle
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17749 diff changeset	193	> mess 1fd3b2fe7754 f
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	194	> EOF
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	195	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	196	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	197	$ hg status
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	198	$ hg log --limit 1
19019 53060cc1b601 histedit-test: generalise --commands "-" usage Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18942 diff changeset	199	changeset: 6:62feedb1200e
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	200	tag: tip
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	201	user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	202	date: Thu Jan 01 00:00:00 1970 +0000
19019 53060cc1b601 histedit-test: generalise --commands "-" usage Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18942 diff changeset	203	summary: f
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	204
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	205
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	206	rollback should not work after a histedit
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	207	$ hg rollback
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	208	no rollback information available
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	209	[1]
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	210
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	211	$ cd ..
18913 79580b3140cd histedit: support editing of the first commit (issue3767) Bryan O'Sullivan <bryano@fb.com> parents: 18609 diff changeset	212	$ hg clone -qr0 r r0
79580b3140cd histedit: support editing of the first commit (issue3767) Bryan O'Sullivan <bryano@fb.com> parents: 18609 diff changeset	213	$ cd r0
79580b3140cd histedit: support editing of the first commit (issue3767) Bryan O'Sullivan <bryano@fb.com> parents: 18609 diff changeset	214	$ hg phase -fdr0
19019 53060cc1b601 histedit-test: generalise --commands "-" usage Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18942 diff changeset	215	$ hg histedit --commands - 0 2>&1 << EOF
53060cc1b601 histedit-test: generalise --commands "-" usage Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18942 diff changeset	216	> edit cb9a9f314b8b a > $EDITED
53060cc1b601 histedit-test: generalise --commands "-" usage Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18942 diff changeset	217	> EOF
18913 79580b3140cd histedit: support editing of the first commit (issue3767) Bryan O'Sullivan <bryano@fb.com> parents: 18609 diff changeset	218	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
79580b3140cd histedit: support editing of the first commit (issue3767) Bryan O'Sullivan <bryano@fb.com> parents: 18609 diff changeset	219	adding a
18942 6891e361bec6 histedit: update tests for new intervention framework Matt Mackall <mpm@selenic.com> parents: 18934 diff changeset	220	Make changes as needed, you may commit or record as needed now.
18913 79580b3140cd histedit: support editing of the first commit (issue3767) Bryan O'Sullivan <bryano@fb.com> parents: 18609 diff changeset	221	When you are finished, run hg histedit --continue to resume.
18942 6891e361bec6 histedit: update tests for new intervention framework Matt Mackall <mpm@selenic.com> parents: 18934 diff changeset	222	[1]
18913 79580b3140cd histedit: support editing of the first commit (issue3767) Bryan O'Sullivan <bryano@fb.com> parents: 18609 diff changeset	223	$ HGEDITOR=true hg histedit --continue
79580b3140cd histedit: support editing of the first commit (issue3767) Bryan O'Sullivan <bryano@fb.com> parents: 18609 diff changeset	224	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
79580b3140cd histedit: support editing of the first commit (issue3767) Bryan O'Sullivan <bryano@fb.com> parents: 18609 diff changeset	225	saved backup bundle to $TESTTMP/r0/.hg/strip-backup/cb9a9f314b8b-backup.hg (glob)

author	Sean Farley <sean.michael.farley@gmail.com>
	Wed, 20 Nov 2013 15:16:54 -0500
changeset 20124	dd3af304b3c8
parent 20117	aa9385f983fa
child 21028	a0f437e2f5a9
permissions	-rw-r--r--