mercurial: tests/test-histedit-edit.t@93f3a06b2035 (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	> graphlog=
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	6	> histedit=
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	7	> EOF
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	8
17087 a79776f427b4 tests: make histedit pass on Windows MSYS Mads Kiilerich <mads@kiilerich.com> parents: 17086 diff changeset	9	$ EDITED="$TESTTMP/editedhistory"
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	10	$ cat > $EDITED <<EOF
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	11	> pick 177f92b77385 c
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	12	> pick 055a42cdd887 d
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	13	> edit e860deea161a e
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	14	> pick 652413bf663e f
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	15	> EOF
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	16	$ initrepo ()
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	> hg init r
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	19	> cd r
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	20	> 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	21	> echo $x > $x
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	22	> hg add $x
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	23	> hg ci -m $x
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	24	> done
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	25	> }
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	26
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	27	$ initrepo
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	28
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	29	log before edit
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	30	$ hg log --graph
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	31	@ changeset: 5:652413bf663e
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	32	\| tag: tip
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	33	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	34	\| 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	35	\| summary: f
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	36	\|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	37	o changeset: 4:e860deea161a
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	38	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	39	\| 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	40	\| summary: e
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	41	\|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	42	o changeset: 3:055a42cdd887
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	43	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	44	\| 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	45	\| summary: d
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	46	\|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	47	o changeset: 2:177f92b77385
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	48	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	49	\| 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	50	\| summary: c
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	51	\|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	52	o changeset: 1:d2ae7f538514
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	53	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	54	\| 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	55	\| summary: b
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	56	\|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	57	o changeset: 0:cb9a9f314b8b
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	58	user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	59	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	60	summary: a
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	61
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	62
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	63	edit the history
17086 5f2cacb715dc tests: make histedit tests more resilient to filesystem variation Mads Kiilerich <mads@kiilerich.com> parents: 17085 diff changeset	64	$ HGEDITOR="cat \"$EDITED\" > " hg histedit 177f92b77385 2>&1 \| fixbundle
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	65	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	66	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	67	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	68
17749 40601f2b7608 histedit: simplify computation of `newchildren` during --continue Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17087 diff changeset	69	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	70
40601f2b7608 histedit: simplify computation of `newchildren` during --continue Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17087 diff changeset	71	$ hg id -n
40601f2b7608 histedit: simplify computation of `newchildren` during --continue Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17087 diff changeset	72	3+
40601f2b7608 histedit: simplify computation of `newchildren` during --continue Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17087 diff changeset	73	$ hg up 0
40601f2b7608 histedit: simplify computation of `newchildren` during --continue Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17087 diff changeset	74	0 files updated, 0 files merged, 3 files removed, 0 files unresolved
40601f2b7608 histedit: simplify computation of `newchildren` during --continue Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17087 diff changeset	75	$ HGEDITOR='echo foobaz > ' hg histedit --continue
18609 909cb9ddba4a histedit: always abort with same message when working dir is wrong. Simon Heimberg <simohe@besonet.ch> parents: 18437 diff changeset	76	abort: 055a42cdd887 is not an ancestor of working directory
17749 40601f2b7608 histedit: simplify computation of `newchildren` during --continue Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17087 diff changeset	77	(update to 055a42cdd887 or descendant and run "hg histedit --continue" again)
40601f2b7608 histedit: simplify computation of `newchildren` during --continue Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17087 diff changeset	78	[255]
40601f2b7608 histedit: simplify computation of `newchildren` during --continue Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17087 diff changeset	79	$ hg up 3
40601f2b7608 histedit: simplify computation of `newchildren` during --continue Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17087 diff changeset	80	3 files updated, 0 files merged, 0 files removed, 0 files unresolved
40601f2b7608 histedit: simplify computation of `newchildren` during --continue Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17087 diff changeset	81
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	82	commit, then edit the revision
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	83	$ hg ci -m 'wat'
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	84	created new head
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	85	$ echo a > e
17087 a79776f427b4 tests: make histedit pass on Windows MSYS Mads Kiilerich <mads@kiilerich.com> parents: 17086 diff changeset	86	$ 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	87	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	88	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	89
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	90	$ hg log --graph
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17749 diff changeset	91	@ changeset: 6:b5f70786f9b0
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	92	\| tag: tip
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	93	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	94	\| 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	95	\| summary: f
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	96	\|
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17749 diff changeset	97	o changeset: 5:a5e1ba2f7afb
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	98	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	99	\| 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	100	\| summary: foobaz
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	101	\|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	102	o changeset: 4:1a60820cd1f6
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	103	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	104	\| 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	105	\| summary: wat
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	106	\|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	107	o changeset: 3:055a42cdd887
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	108	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	109	\| 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	110	\| summary: d
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	111	\|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	112	o changeset: 2:177f92b77385
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	113	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	114	\| 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	115	\| summary: c
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	116	\|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	117	o changeset: 1:d2ae7f538514
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	118	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	119	\| 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	120	\| summary: b
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	121	\|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	122	o changeset: 0:cb9a9f314b8b
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	123	user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	124	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	125	summary: a
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	126
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	127
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	128	$ hg cat e
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	129	a
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	130
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17749 diff changeset	131	check histedit_source
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17749 diff changeset	132
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17749 diff changeset	133	$ hg log --debug --rev 5
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17749 diff changeset	134	changeset: 5:a5e1ba2f7afb899ef1581cea528fd885d2fca70d
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17749 diff changeset	135	phase: draft
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17749 diff changeset	136	parent: 4:1a60820cd1f6004a362aa622ebc47d59bc48eb34
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17749 diff changeset	137	parent: -1:0000000000000000000000000000000000000000
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17749 diff changeset	138	manifest: 5:5ad3be8791f39117565557781f5464363b918a45
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17749 diff changeset	139	user: test
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17749 diff changeset	140	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	141	files: e
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17749 diff changeset	142	extra: branch=default
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17749 diff changeset	143	extra: histedit_source=e860deea161a2f77de56603b340ebbb4536308ae
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17749 diff changeset	144	description:
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17749 diff changeset	145	foobaz
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17749 diff changeset	146
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17749 diff changeset	147
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17749 diff changeset	148
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	149	$ cat > $EDITED <<EOF
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17749 diff changeset	150	> edit b5f70786f9b0 f
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	151	> EOF
17086 5f2cacb715dc tests: make histedit tests more resilient to filesystem variation Mads Kiilerich <mads@kiilerich.com> parents: 17085 diff changeset	152	$ HGEDITOR="cat \"$EDITED\" > " hg histedit tip 2>&1 \| fixbundle
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	153	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	154	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	155	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	156	$ hg status
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	157	A f
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	158	$ HGEDITOR='true' hg histedit --continue
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	159	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	160	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	161
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	162	$ hg status
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	163
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	164	log after edit
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	165	$ hg log --limit 1
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17749 diff changeset	166	changeset: 6:a107ee126658
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	167	tag: tip
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	168	user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	169	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	170	summary: f
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	171
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	172
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	173	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	174	$ cat > ../edit.sh <<EOF
17086 5f2cacb715dc tests: make histedit tests more resilient to filesystem variation Mads Kiilerich <mads@kiilerich.com> parents: 17085 diff changeset	175	> 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	176	> mv tmp "\$1"
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	177	> EOF
17086 5f2cacb715dc tests: make histedit tests more resilient to filesystem variation Mads Kiilerich <mads@kiilerich.com> parents: 17085 diff changeset	178	$ 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	179	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	180	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	181	$ hg status
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	182	$ hg log --limit 1
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17749 diff changeset	183	changeset: 6:1fd3b2fe7754
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	184	tag: tip
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	185	user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	186	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	187	summary: f
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	188
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	189
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	190	modify the message
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	191	$ cat > $EDITED <<EOF
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17749 diff changeset	192	> mess 1fd3b2fe7754 f
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	193	> EOF
17086 5f2cacb715dc tests: make histedit tests more resilient to filesystem variation Mads Kiilerich <mads@kiilerich.com> parents: 17085 diff changeset	194	$ HGEDITOR="cat \"$EDITED\" > " hg histedit tip 2>&1 \| fixbundle
17085 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
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17749 diff changeset	199	changeset: 6:5585e802ef99
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
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17749 diff changeset	203	summary: mess 1fd3b2fe7754 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	$ echo edit cb9a9f314b8b a > $EDITED
79580b3140cd histedit: support editing of the first commit (issue3767) Bryan O'Sullivan <bryano@fb.com> parents: 18609 diff changeset	215	$ hg phase -fdr0
79580b3140cd histedit: support editing of the first commit (issue3767) Bryan O'Sullivan <bryano@fb.com> parents: 18609 diff changeset	216	$ HGEDITOR="cat \"$EDITED\" > " hg histedit 0 2>&1
79580b3140cd histedit: support editing of the first commit (issue3767) Bryan O'Sullivan <bryano@fb.com> parents: 18609 diff changeset	217	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	218	adding a
79580b3140cd histedit: support editing of the first commit (issue3767) Bryan O'Sullivan <bryano@fb.com> parents: 18609 diff changeset	219	abort: Make changes as needed, you may commit or record as needed now.
79580b3140cd histedit: support editing of the first commit (issue3767) Bryan O'Sullivan <bryano@fb.com> parents: 18609 diff changeset	220	When you are finished, run hg histedit --continue to resume.
79580b3140cd histedit: support editing of the first commit (issue3767) Bryan O'Sullivan <bryano@fb.com> parents: 18609 diff changeset	221	[255]
79580b3140cd histedit: support editing of the first commit (issue3767) Bryan O'Sullivan <bryano@fb.com> parents: 18609 diff changeset	222	$ HGEDITOR=true hg histedit --continue
79580b3140cd histedit: support editing of the first commit (issue3767) Bryan O'Sullivan <bryano@fb.com> parents: 18609 diff changeset	223	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	224	saved backup bundle to $TESTTMP/r0/.hg/strip-backup/cb9a9f314b8b-backup.hg (glob)

author	Augie Fackler <raf@durin42.com>
	Fri, 08 Feb 2013 16:27:49 -0600
changeset 18934	93f3a06b2035
parent 18913	79580b3140cd
child 18942	6891e361bec6
permissions	-rw-r--r--