mercurial-source: tests/test-histedit-edit.t annotate

annotate tests/test-histedit-edit.t @ 24759:e767f5aba810

histedit: fix preventing strips during histedit We were trying to prevent strips of important nodes during histedit, but the check was actually comparing the short hashes in the rules to the exact value the user typed in, so it only ever worked if the user typed a 12 character hash.

author	Durham Goode <durham@fb.com>
date	Sat, 04 Apr 2015 11:24:48 -0700
parents	68d998a76994
children	7b59f16174c5

rev	line source
17071 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
17071 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=
24166 11d72683f3de histedit: don't allow to strip nodes which are necessary to continue histedit Mateusz Kwapich <mitrandir@fb.com> parents: 23847 diff changeset	6 > strip=
17071 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
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	9 $ initrepo ()
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	10 > {
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	11 > hg init r
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	12 > cd r
24197 be7cb25186be histedit: add --edit-plan option to histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24166 diff changeset	13 > for x in a b c d e f g; do
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	14 > echo $x > $x
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	15 > hg add $x
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	16 > hg ci -m $x
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	17 > done
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
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	20 $ initrepo
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	21
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	22 log before edit
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	23 $ hg log --graph
24197 be7cb25186be histedit: add --edit-plan option to histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24166 diff changeset	24 @ changeset: 6:3c6a8ed2ebe8
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	25 \| tag: tip
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	26 \| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	27 \| date: Thu Jan 01 00:00:00 1970 +0000
24197 be7cb25186be histedit: add --edit-plan option to histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24166 diff changeset	28 \| summary: g
be7cb25186be histedit: add --edit-plan option to histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24166 diff changeset	29 \|
be7cb25186be histedit: add --edit-plan option to histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24166 diff changeset	30 o changeset: 5:652413bf663e
be7cb25186be histedit: add --edit-plan option to histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24166 diff changeset	31 \| user: test
be7cb25186be histedit: add --edit-plan option to histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24166 diff changeset	32 \| date: Thu Jan 01 00:00:00 1970 +0000
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	33 \| summary: f
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	34 \|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	35 o changeset: 4:e860deea161a
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	36 \| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	37 \| 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	38 \| summary: e
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	39 \|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	40 o changeset: 3:055a42cdd887
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	41 \| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	42 \| 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	43 \| summary: d
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	44 \|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	45 o changeset: 2:177f92b77385
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	46 \| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	47 \| 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	48 \| summary: c
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	49 \|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	50 o changeset: 1:d2ae7f538514
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	51 \| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	52 \| 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	53 \| summary: b
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	54 \|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	55 o changeset: 0:cb9a9f314b8b
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	56 user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	57 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	58 summary: a
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	59
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	60
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	61 edit the history
19019 53060cc1b601 histedit-test: generalise --commands "-" usage Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18942 diff changeset	62 $ 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	63 > pick 177f92b77385 c
53060cc1b601 histedit-test: generalise --commands "-" usage Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18942 diff changeset	64 > pick 055a42cdd887 d
53060cc1b601 histedit-test: generalise --commands "-" usage Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18942 diff changeset	65 > edit e860deea161a e
53060cc1b601 histedit-test: generalise --commands "-" usage Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18942 diff changeset	66 > pick 652413bf663e f
24197 be7cb25186be histedit: add --edit-plan option to histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24166 diff changeset	67 > pick 3c6a8ed2ebe8 g
19019 53060cc1b601 histedit-test: generalise --commands "-" usage Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18942 diff changeset	68 > EOF
24197 be7cb25186be histedit: add --edit-plan option to histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24166 diff changeset	69 0 files updated, 0 files merged, 3 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	70 Make changes as needed, you may commit or record as needed now.
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	71 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	72
24197 be7cb25186be histedit: add --edit-plan option to histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24166 diff changeset	73 edit the plan
be7cb25186be histedit: add --edit-plan option to histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24166 diff changeset	74 $ hg histedit --edit-plan --commands - 2>&1 << EOF
be7cb25186be histedit: add --edit-plan option to histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24166 diff changeset	75 > edit e860deea161a e
be7cb25186be histedit: add --edit-plan option to histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24166 diff changeset	76 > pick 652413bf663e f
be7cb25186be histedit: add --edit-plan option to histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24166 diff changeset	77 > drop 3c6a8ed2ebe8 g
be7cb25186be histedit: add --edit-plan option to histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24166 diff changeset	78 > EOF
be7cb25186be histedit: add --edit-plan option to histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24166 diff changeset	79
17750 40601f2b7608 histedit: simplify computation of `newchildren` during --continue Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17073 diff changeset	80 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: 17073 diff changeset	81
40601f2b7608 histedit: simplify computation of `newchildren` during --continue Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17073 diff changeset	82 $ hg id -n
40601f2b7608 histedit: simplify computation of `newchildren` during --continue Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17073 diff changeset	83 3+
40601f2b7608 histedit: simplify computation of `newchildren` during --continue Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17073 diff changeset	84 $ hg up 0
19479 11664641fbad histedit: add checkunfinished support (issue3955) Matt Mackall <mpm@selenic.com> parents: 19215 diff changeset	85 abort: histedit in progress
11664641fbad histedit: add checkunfinished support (issue3955) Matt Mackall <mpm@selenic.com> parents: 19215 diff changeset	86 (use 'hg histedit --continue' or 'hg histedit --abort')
17750 40601f2b7608 histedit: simplify computation of `newchildren` during --continue Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17073 diff changeset	87 [255]
40601f2b7608 histedit: simplify computation of `newchildren` during --continue Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17073 diff changeset	88
24166 11d72683f3de histedit: don't allow to strip nodes which are necessary to continue histedit Mateusz Kwapich <mitrandir@fb.com> parents: 23847 diff changeset	89 Try to delete necessary commit
24759 e767f5aba810 histedit: fix preventing strips during histedit Durham Goode <durham@fb.com> parents: 24419 diff changeset	90 $ hg strip -r 652413b
e767f5aba810 histedit: fix preventing strips during histedit Durham Goode <durham@fb.com> parents: 24419 diff changeset	91 abort: histedit in progress, can't strip 652413bf663e
24166 11d72683f3de histedit: don't allow to strip nodes which are necessary to continue histedit Mateusz Kwapich <mitrandir@fb.com> parents: 23847 diff changeset	92 [255]
11d72683f3de histedit: don't allow to strip nodes which are necessary to continue histedit Mateusz Kwapich <mitrandir@fb.com> parents: 23847 diff changeset	93
19496 607191a45f8c checkunfinished: accommodate histedit quirk Matt Mackall <mpm@selenic.com> parents: 19479 diff changeset	94 commit, then edit the revision
607191a45f8c checkunfinished: accommodate histedit quirk Matt Mackall <mpm@selenic.com> parents: 19479 diff changeset	95 $ hg ci -m 'wat'
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	96 created new head
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	97 $ echo a > e
24419 68d998a76994 test-histedit-edit.t: demonstrate qnew fails during a histedit (issue4366) Augie Fackler <augie@google.com> parents: 24267 diff changeset	98
68d998a76994 test-histedit-edit.t: demonstrate qnew fails during a histedit (issue4366) Augie Fackler <augie@google.com> parents: 24267 diff changeset	99 qnew should fail while we're in the middle of the edit step
68d998a76994 test-histedit-edit.t: demonstrate qnew fails during a histedit (issue4366) Augie Fackler <augie@google.com> parents: 24267 diff changeset	100
68d998a76994 test-histedit-edit.t: demonstrate qnew fails during a histedit (issue4366) Augie Fackler <augie@google.com> parents: 24267 diff changeset	101 $ hg --config extensions.mq= qnew please-fail
68d998a76994 test-histedit-edit.t: demonstrate qnew fails during a histedit (issue4366) Augie Fackler <augie@google.com> parents: 24267 diff changeset	102 abort: histedit in progress
68d998a76994 test-histedit-edit.t: demonstrate qnew fails during a histedit (issue4366) Augie Fackler <augie@google.com> parents: 24267 diff changeset	103 (use 'hg histedit --continue' or 'hg histedit --abort')
68d998a76994 test-histedit-edit.t: demonstrate qnew fails during a histedit (issue4366) Augie Fackler <augie@google.com> parents: 24267 diff changeset	104 [255]
17073 a79776f427b4 tests: make histedit pass on Windows MSYS Mads Kiilerich <mads@kiilerich.com> parents: 17072 diff changeset	105 $ HGEDITOR='echo foobaz > ' hg histedit --continue 2>&1 \| fixbundle
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	106 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	107 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	108
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	109 $ hg log --graph
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17750 diff changeset	110 @ changeset: 6:b5f70786f9b0
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	111 \| tag: tip
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	112 \| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	113 \| 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	114 \| summary: f
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	115 \|
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17750 diff changeset	116 o changeset: 5:a5e1ba2f7afb
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	117 \| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	118 \| 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	119 \| summary: foobaz
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	120 \|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	121 o changeset: 4:1a60820cd1f6
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	122 \| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	123 \| 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	124 \| summary: wat
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	125 \|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	126 o changeset: 3:055a42cdd887
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	127 \| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	128 \| 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	129 \| summary: d
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	130 \|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	131 o changeset: 2:177f92b77385
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	132 \| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	133 \| 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	134 \| summary: c
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	135 \|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	136 o changeset: 1:d2ae7f538514
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	137 \| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	138 \| 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	139 \| summary: b
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	140 \|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	141 o changeset: 0:cb9a9f314b8b
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	142 user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	143 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	144 summary: a
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	145
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	146
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	147 $ hg cat e
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	148 a
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	149
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17750 diff changeset	150 check histedit_source
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17750 diff changeset	151
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17750 diff changeset	152 $ hg log --debug --rev 5
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17750 diff changeset	153 changeset: 5:a5e1ba2f7afb899ef1581cea528fd885d2fca70d
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17750 diff changeset	154 phase: draft
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17750 diff changeset	155 parent: 4:1a60820cd1f6004a362aa622ebc47d59bc48eb34
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17750 diff changeset	156 parent: -1:0000000000000000000000000000000000000000
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17750 diff changeset	157 manifest: 5:5ad3be8791f39117565557781f5464363b918a45
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17750 diff changeset	158 user: test
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17750 diff changeset	159 date: Thu Jan 01 00:00:00 1970 +0000
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17750 diff changeset	160 files: e
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17750 diff changeset	161 extra: branch=default
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17750 diff changeset	162 extra: histedit_source=e860deea161a2f77de56603b340ebbb4536308ae
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17750 diff changeset	163 description:
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17750 diff changeset	164 foobaz
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17750 diff changeset	165
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17750 diff changeset	166
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17750 diff changeset	167
19019 53060cc1b601 histedit-test: generalise --commands "-" usage Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18942 diff changeset	168 $ hg histedit tip --commands - 2>&1 <<EOF\| fixbundle
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17750 diff changeset	169 > edit b5f70786f9b0 f
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	170 > EOF
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	171 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	172 Make changes as needed, you may commit or record as needed now.
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	173 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	174 $ hg status
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	175 A f
19213 f324a9b8d4bf summary: add tests for some extensions we plan to modify Bryan O'Sullivan <bryano@fb.com> parents: 19019 diff changeset	176
f324a9b8d4bf summary: add tests for some extensions we plan to modify Bryan O'Sullivan <bryano@fb.com> parents: 19019 diff changeset	177 $ hg summary
f324a9b8d4bf summary: add tests for some extensions we plan to modify Bryan O'Sullivan <bryano@fb.com> parents: 19019 diff changeset	178 parent: 5:a5e1ba2f7afb
f324a9b8d4bf summary: add tests for some extensions we plan to modify Bryan O'Sullivan <bryano@fb.com> parents: 19019 diff changeset	179 foobaz
f324a9b8d4bf summary: add tests for some extensions we plan to modify Bryan O'Sullivan <bryano@fb.com> parents: 19019 diff changeset	180 branch: default
f324a9b8d4bf summary: add tests for some extensions we plan to modify Bryan O'Sullivan <bryano@fb.com> parents: 19019 diff changeset	181 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	182 update: 1 new changesets (update)
19215 f184fe1e2ac5 summary: add a histedit hook Bryan O'Sullivan <bryano@fb.com> parents: 19213 diff changeset	183 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	184
21409 37a3ac247c0d histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21407 diff changeset	185 (test also that editor is invoked if histedit is continued for
37a3ac247c0d histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21407 diff changeset	186 "edit" action)
37a3ac247c0d histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21407 diff changeset	187
37a3ac247c0d histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21407 diff changeset	188 $ HGEDITOR='cat' hg histedit --continue
37a3ac247c0d histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21407 diff changeset	189 f
37a3ac247c0d histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21407 diff changeset	190
37a3ac247c0d histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21407 diff changeset	191
37a3ac247c0d histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21407 diff changeset	192 HG: Enter commit message. Lines beginning with 'HG:' are removed.
37a3ac247c0d histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21407 diff changeset	193 HG: Leave message empty to abort commit.
37a3ac247c0d histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21407 diff changeset	194 HG: --
37a3ac247c0d histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21407 diff changeset	195 HG: user: test
37a3ac247c0d histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21407 diff changeset	196 HG: branch 'default'
37a3ac247c0d histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21407 diff changeset	197 HG: added f
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	198 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
23847 aa4a1672583e bundles: do not overwrite existing backup bundles (BC) Durham Goode <durham@fb.com> parents: 21930 diff changeset	199 saved backup bundle to $TESTTMP/r/.hg/strip-backup/b5f70786f9b0-c28d9c86-backup.hg (glob)
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17750 diff changeset	200
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	201 $ hg status
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	202
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	203 log after edit
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	204 $ hg log --limit 1
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17750 diff changeset	205 changeset: 6:a107ee126658
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	206 tag: tip
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	207 user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	208 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	209 summary: f
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	210
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	211
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	212 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	213 $ cat > ../edit.sh <<EOF
17072 5f2cacb715dc tests: make histedit tests more resilient to filesystem variation Mads Kiilerich <mads@kiilerich.com> parents: 17071 diff changeset	214 > cat "\$1" \| sed s/pick/mess/ > tmp
5f2cacb715dc tests: make histedit tests more resilient to filesystem variation Mads Kiilerich <mads@kiilerich.com> parents: 17071 diff changeset	215 > mv tmp "\$1"
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	216 > EOF
17072 5f2cacb715dc tests: make histedit tests more resilient to filesystem variation Mads Kiilerich <mads@kiilerich.com> parents: 17071 diff changeset	217 $ HGEDITOR="sh ../edit.sh" hg histedit tip 2>&1 \| fixbundle
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	218 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	219 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	220 $ hg status
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	221 $ hg log --limit 1
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17750 diff changeset	222 changeset: 6:1fd3b2fe7754
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	223 tag: tip
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	224 user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	225 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	226 summary: f
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	227
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	228
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	229 modify the message
21028 a0f437e2f5a9 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	230
a0f437e2f5a9 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	231 check saving last-message.txt, at first
a0f437e2f5a9 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	232
a0f437e2f5a9 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	233 $ cat > $TESTTMP/commitfailure.py <<EOF
a0f437e2f5a9 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	234 > from mercurial import util
a0f437e2f5a9 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	235 > def reposetup(ui, repo):
a0f437e2f5a9 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	236 > class commitfailure(repo.__class__):
a0f437e2f5a9 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	237 > def commit(self, args, *kwargs):
a0f437e2f5a9 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	238 > raise util.Abort('emulating unexpected abort')
a0f437e2f5a9 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	239 > repo.__class__ = commitfailure
a0f437e2f5a9 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	240 > EOF
21233 213fd1a99cd9 histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21028 diff changeset	241 $ cat >> .hg/hgrc <<EOF
21028 a0f437e2f5a9 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	242 > [extensions]
21233 213fd1a99cd9 histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21028 diff changeset	243 > # this failure occurs before editor invocation
21028 a0f437e2f5a9 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	244 > commitfailure = $TESTTMP/commitfailure.py
a0f437e2f5a9 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	245 > EOF
a0f437e2f5a9 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	246
a0f437e2f5a9 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	247 $ cat > $TESTTMP/editor.sh <<EOF
a0f437e2f5a9 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	248 > echo "==== before editing"
a0f437e2f5a9 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	249 > cat \$1
a0f437e2f5a9 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	250 > echo "===="
a0f437e2f5a9 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	251 > echo "check saving last-message.txt" >> \$1
a0f437e2f5a9 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	252 > EOF
21233 213fd1a99cd9 histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21028 diff changeset	253
213fd1a99cd9 histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21028 diff changeset	254 (test that editor is not invoked before transaction starting)
213fd1a99cd9 histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21028 diff changeset	255
213fd1a99cd9 histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21028 diff changeset	256 $ rm -f .hg/last-message.txt
213fd1a99cd9 histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21028 diff changeset	257 $ HGEDITOR="sh $TESTTMP/editor.sh" hg histedit tip --commands - 2>&1 << EOF \| fixbundle
213fd1a99cd9 histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21028 diff changeset	258 > mess 1fd3b2fe7754 f
213fd1a99cd9 histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21028 diff changeset	259 > EOF
213fd1a99cd9 histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21028 diff changeset	260 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
213fd1a99cd9 histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21028 diff changeset	261 abort: emulating unexpected abort
21930 a5168eb9b2bc tests: cat error messages are different on Solaris Danek Duvall <danek.duvall@oracle.com> parents: 21409 diff changeset	262 $ test -f .hg/last-message.txt
21233 213fd1a99cd9 histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21028 diff changeset	263 [1]
213fd1a99cd9 histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21028 diff changeset	264
213fd1a99cd9 histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21028 diff changeset	265 $ cat >> .hg/hgrc <<EOF
213fd1a99cd9 histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21028 diff changeset	266 > [extensions]
213fd1a99cd9 histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21028 diff changeset	267 > commitfailure = !
213fd1a99cd9 histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21028 diff changeset	268 > EOF
213fd1a99cd9 histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21028 diff changeset	269 $ hg histedit --abort -q
213fd1a99cd9 histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21028 diff changeset	270
213fd1a99cd9 histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21028 diff changeset	271 (test that editor is invoked and commit message is saved into
213fd1a99cd9 histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21028 diff changeset	272 "last-message.txt")
213fd1a99cd9 histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21028 diff changeset	273
213fd1a99cd9 histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21028 diff changeset	274 $ cat >> .hg/hgrc <<EOF
213fd1a99cd9 histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21028 diff changeset	275 > [hooks]
213fd1a99cd9 histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21028 diff changeset	276 > # this failure occurs after editor invocation
213fd1a99cd9 histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21028 diff changeset	277 > pretxncommit.unexpectedabort = false
213fd1a99cd9 histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21028 diff changeset	278 > EOF
213fd1a99cd9 histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21028 diff changeset	279
21407 47bfe5d433ac histedit: use the editor gotten by "getcommiteditor()" for "message" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21233 diff changeset	280 $ hg status --rev '1fd3b2fe7754^1' --rev 1fd3b2fe7754
47bfe5d433ac histedit: use the editor gotten by "getcommiteditor()" for "message" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21233 diff changeset	281 A f
47bfe5d433ac histedit: use the editor gotten by "getcommiteditor()" for "message" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21233 diff changeset	282
21028 a0f437e2f5a9 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	283 $ rm -f .hg/last-message.txt
21407 47bfe5d433ac histedit: use the editor gotten by "getcommiteditor()" for "message" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21233 diff changeset	284 $ HGEDITOR="sh $TESTTMP/editor.sh" hg histedit tip --commands - 2>&1 << EOF
21028 a0f437e2f5a9 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	285 > mess 1fd3b2fe7754 f
a0f437e2f5a9 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	286 > EOF
a0f437e2f5a9 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	287 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
21407 47bfe5d433ac histedit: use the editor gotten by "getcommiteditor()" for "message" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21233 diff changeset	288 adding f
21028 a0f437e2f5a9 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	289 ==== before editing
a0f437e2f5a9 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	290 f
21407 47bfe5d433ac histedit: use the editor gotten by "getcommiteditor()" for "message" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21233 diff changeset	291
47bfe5d433ac histedit: use the editor gotten by "getcommiteditor()" for "message" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21233 diff changeset	292
47bfe5d433ac histedit: use the editor gotten by "getcommiteditor()" for "message" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21233 diff changeset	293 HG: Enter commit message. Lines beginning with 'HG:' are removed.
47bfe5d433ac histedit: use the editor gotten by "getcommiteditor()" for "message" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21233 diff changeset	294 HG: Leave message empty to abort commit.
47bfe5d433ac histedit: use the editor gotten by "getcommiteditor()" for "message" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21233 diff changeset	295 HG: --
47bfe5d433ac histedit: use the editor gotten by "getcommiteditor()" for "message" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21233 diff changeset	296 HG: user: test
47bfe5d433ac histedit: use the editor gotten by "getcommiteditor()" for "message" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21233 diff changeset	297 HG: branch 'default'
47bfe5d433ac histedit: use the editor gotten by "getcommiteditor()" for "message" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21233 diff changeset	298 HG: added f
21028 a0f437e2f5a9 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	299 ====
21233 213fd1a99cd9 histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21028 diff changeset	300 transaction abort!
213fd1a99cd9 histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21028 diff changeset	301 rollback completed
213fd1a99cd9 histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21028 diff changeset	302 note: commit message saved in .hg/last-message.txt
213fd1a99cd9 histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21028 diff changeset	303 abort: pretxncommit.unexpectedabort hook exited with status 1
21407 47bfe5d433ac histedit: use the editor gotten by "getcommiteditor()" for "message" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21233 diff changeset	304 [255]
21028 a0f437e2f5a9 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	305 $ cat .hg/last-message.txt
a0f437e2f5a9 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	306 f
21407 47bfe5d433ac histedit: use the editor gotten by "getcommiteditor()" for "message" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21233 diff changeset	307
47bfe5d433ac histedit: use the editor gotten by "getcommiteditor()" for "message" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21233 diff changeset	308
21028 a0f437e2f5a9 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	309 check saving last-message.txt
a0f437e2f5a9 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	310
21409 37a3ac247c0d histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21407 diff changeset	311 (test also that editor is invoked if histedit is continued for "message"
37a3ac247c0d histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21407 diff changeset	312 action)
37a3ac247c0d histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21407 diff changeset	313
37a3ac247c0d histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21407 diff changeset	314 $ HGEDITOR=cat hg histedit --continue
37a3ac247c0d histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21407 diff changeset	315 f
37a3ac247c0d histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21407 diff changeset	316
37a3ac247c0d histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21407 diff changeset	317
37a3ac247c0d histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21407 diff changeset	318 HG: Enter commit message. Lines beginning with 'HG:' are removed.
37a3ac247c0d histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21407 diff changeset	319 HG: Leave message empty to abort commit.
37a3ac247c0d histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21407 diff changeset	320 HG: --
37a3ac247c0d histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21407 diff changeset	321 HG: user: test
37a3ac247c0d histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21407 diff changeset	322 HG: branch 'default'
37a3ac247c0d histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21407 diff changeset	323 HG: added f
37a3ac247c0d histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21407 diff changeset	324 transaction abort!
37a3ac247c0d histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21407 diff changeset	325 rollback completed
37a3ac247c0d histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21407 diff changeset	326 note: commit message saved in .hg/last-message.txt
37a3ac247c0d histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21407 diff changeset	327 abort: pretxncommit.unexpectedabort hook exited with status 1
37a3ac247c0d histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21407 diff changeset	328 [255]
37a3ac247c0d histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21407 diff changeset	329
21233 213fd1a99cd9 histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21028 diff changeset	330 $ cat >> .hg/hgrc <<EOF
213fd1a99cd9 histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21028 diff changeset	331 > [hooks]
213fd1a99cd9 histedit: use "editor" argument of "commit()" instead of explicit "ui.edit()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21028 diff changeset	332 > pretxncommit.unexpectedabort =
21028 a0f437e2f5a9 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	333 > EOF
a0f437e2f5a9 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	334 $ hg histedit --abort -q
a0f437e2f5a9 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	335
a0f437e2f5a9 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	336 then, check "modify the message" itself
a0f437e2f5a9 histedit: save manually edited commit message into ".hg/last-message.txt" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20117 diff changeset	337
19019 53060cc1b601 histedit-test: generalise --commands "-" usage Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18942 diff changeset	338 $ hg histedit tip --commands - 2>&1 << EOF \| fixbundle
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17750 diff changeset	339 > mess 1fd3b2fe7754 f
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	340 > EOF
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	341 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	342 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	343 $ hg status
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	344 $ hg log --limit 1
19019 53060cc1b601 histedit-test: generalise --commands "-" usage Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18942 diff changeset	345 changeset: 6:62feedb1200e
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	346 tag: tip
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	347 user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	348 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	349 summary: f
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	350
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	351
17071 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	352 rollback should not work after a histedit
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	353 $ hg rollback
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	354 no rollback information available
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	355 [1]
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	356
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17067 diff changeset	357 $ cd ..
18913 79580b3140cd histedit: support editing of the first commit (issue3767) Bryan O'Sullivan <bryano@fb.com> parents: 18609 diff changeset	358 $ hg clone -qr0 r r0
79580b3140cd histedit: support editing of the first commit (issue3767) Bryan O'Sullivan <bryano@fb.com> parents: 18609 diff changeset	359 $ cd r0
79580b3140cd histedit: support editing of the first commit (issue3767) Bryan O'Sullivan <bryano@fb.com> parents: 18609 diff changeset	360 $ hg phase -fdr0
19019 53060cc1b601 histedit-test: generalise --commands "-" usage Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18942 diff changeset	361 $ 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	362 > edit cb9a9f314b8b a > $EDITED
53060cc1b601 histedit-test: generalise --commands "-" usage Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18942 diff changeset	363 > EOF
18913 79580b3140cd histedit: support editing of the first commit (issue3767) Bryan O'Sullivan <bryano@fb.com> parents: 18609 diff changeset	364 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	365 adding a
18942 6891e361bec6 histedit: update tests for new intervention framework Matt Mackall <mpm@selenic.com> parents: 18934 diff changeset	366 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	367 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	368 [1]
18913 79580b3140cd histedit: support editing of the first commit (issue3767) Bryan O'Sullivan <bryano@fb.com> parents: 18609 diff changeset	369 $ HGEDITOR=true hg histedit --continue
79580b3140cd histedit: support editing of the first commit (issue3767) Bryan O'Sullivan <bryano@fb.com> parents: 18609 diff changeset	370 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
23847 aa4a1672583e bundles: do not overwrite existing backup bundles (BC) Durham Goode <durham@fb.com> parents: 21930 diff changeset	371 saved backup bundle to $TESTTMP/r0/.hg/strip-backup/cb9a9f314b8b-cc5ccb0b-backup.hg (glob)

Mercurial > hg > mercurial-source

annotate tests/test-histedit-edit.t @ 24759:e767f5aba810