mercurial: tests/test-histedit-commute.t@4234c9af515d (annotated)

17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	1	$ . "$TESTDIR/histedit-helpers.sh"
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	2
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	3	$ cat >> $HGRCPATH <<EOF
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	4	> [extensions]
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	5	> histedit=
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	6	> EOF
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	7
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	8	$ initrepo ()
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	9	> {
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	10	> hg init r
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	11	> cd r
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	12	> for x in a b c d e f ; do
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	13	> echo $x > $x
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	14	> hg add $x
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	15	> hg ci -m $x
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	16	> done
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	17	> }
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	18
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	19	$ initrepo
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	20
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	21	log before edit
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	22	$ hg log --graph
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	23	@ changeset: 5:652413bf663e
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	24	\| tag: tip
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	25	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	26	\| date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	27	\| summary: f
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	28	\|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	29	o changeset: 4:e860deea161a
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	30	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	31	\| date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	32	\| summary: e
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	33	\|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	34	o changeset: 3:055a42cdd887
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	35	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	36	\| date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	37	\| summary: d
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	38	\|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	39	o changeset: 2:177f92b77385
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	40	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	41	\| date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	42	\| summary: c
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	43	\|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	44	o changeset: 1:d2ae7f538514
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	45	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	46	\| date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	47	\| summary: b
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	48	\|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	49	o changeset: 0:cb9a9f314b8b
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	50	user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	51	date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	52	summary: a
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	53
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	54
41509 11c076786d56 histedit: add templating support to histedit's rule file generation Augie Fackler <augie@google.com> parents: 39480 diff changeset	55
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	56	show the edit commands offered
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	57	$ HGEDITOR=cat hg histedit 177f92b77385
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	58	pick 177f92b77385 2 c
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	59	pick 055a42cdd887 3 d
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	60	pick e860deea161a 4 e
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	61	pick 652413bf663e 5 f
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	62
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	63	# Edit history between 177f92b77385 and 652413bf663e
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	64	#
20503 23dc77874191 histedit: clarify description of fold command Adrian Zgorzałek <adek@fb.com> parents: 20117 diff changeset	65	# Commits are listed from least to most recent
23dc77874191 histedit: clarify description of fold command Adrian Zgorzałek <adek@fb.com> parents: 20117 diff changeset	66	#
28396 5490b04e6132 histedit: adds hint how to reorder changesets at editor (issue3766) liscju <piotr.listkiewicz@gmail.com> parents: 28004 diff changeset	67	# You can reorder changesets by reordering the lines
5490b04e6132 histedit: adds hint how to reorder changesets at editor (issue3766) liscju <piotr.listkiewicz@gmail.com> parents: 28004 diff changeset	68	#
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	69	# Commands:
27674 78d86664e3a2 histedit: prefer edit commit, edit message, use commit timeless <timeless@mozdev.org> parents: 27629 diff changeset	70	#
78d86664e3a2 histedit: prefer edit commit, edit message, use commit timeless <timeless@mozdev.org> parents: 27629 diff changeset	71	# e, edit = use commit, but stop for amending
78d86664e3a2 histedit: prefer edit commit, edit message, use commit timeless <timeless@mozdev.org> parents: 27629 diff changeset	72	# m, mess = edit commit message without changing commit content
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	73	# p, pick = use commit
34489 270e344a6c74 histedit: removing the experimental config 'histeditng' Saurabh Singh <singhsrb@fb.com> parents: 33351 diff changeset	74	# b, base = checkout changeset and apply further changesets from there
27674 78d86664e3a2 histedit: prefer edit commit, edit message, use commit timeless <timeless@mozdev.org> parents: 27629 diff changeset	75	# d, drop = remove commit from history
20511 5840da876235 histedit: shorten new fold message Matt Mackall <mpm@selenic.com> parents: 20503 diff changeset	76	# f, fold = use commit, but combine it with the one above
31056 37ab9e20991c histedit: modify rollup to discard date from the rollup commit (issue4820) Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28396 diff changeset	77	# r, roll = like fold, but discard this commit's description and date
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	78	#
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	79
41509 11c076786d56 histedit: add templating support to histedit's rule file generation Augie Fackler <augie@google.com> parents: 39480 diff changeset	80
11c076786d56 histedit: add templating support to histedit's rule file generation Augie Fackler <augie@google.com> parents: 39480 diff changeset	81	test customization of revision summary
11c076786d56 histedit: add templating support to histedit's rule file generation Augie Fackler <augie@google.com> parents: 39480 diff changeset	82	$ HGEDITOR=cat hg histedit 177f92b77385 \
11c076786d56 histedit: add templating support to histedit's rule file generation Augie Fackler <augie@google.com> parents: 39480 diff changeset	83	> --config histedit.summary-template='I am rev {rev} desc {desc} tags {tags}'
11c076786d56 histedit: add templating support to histedit's rule file generation Augie Fackler <augie@google.com> parents: 39480 diff changeset	84	pick 177f92b77385 I am rev 2 desc c tags
11c076786d56 histedit: add templating support to histedit's rule file generation Augie Fackler <augie@google.com> parents: 39480 diff changeset	85	pick 055a42cdd887 I am rev 3 desc d tags
11c076786d56 histedit: add templating support to histedit's rule file generation Augie Fackler <augie@google.com> parents: 39480 diff changeset	86	pick e860deea161a I am rev 4 desc e tags
11c076786d56 histedit: add templating support to histedit's rule file generation Augie Fackler <augie@google.com> parents: 39480 diff changeset	87	pick 652413bf663e I am rev 5 desc f tags tip
11c076786d56 histedit: add templating support to histedit's rule file generation Augie Fackler <augie@google.com> parents: 39480 diff changeset	88
11c076786d56 histedit: add templating support to histedit's rule file generation Augie Fackler <augie@google.com> parents: 39480 diff changeset	89	# Edit history between 177f92b77385 and 652413bf663e
11c076786d56 histedit: add templating support to histedit's rule file generation Augie Fackler <augie@google.com> parents: 39480 diff changeset	90	#
11c076786d56 histedit: add templating support to histedit's rule file generation Augie Fackler <augie@google.com> parents: 39480 diff changeset	91	# Commits are listed from least to most recent
11c076786d56 histedit: add templating support to histedit's rule file generation Augie Fackler <augie@google.com> parents: 39480 diff changeset	92	#
11c076786d56 histedit: add templating support to histedit's rule file generation Augie Fackler <augie@google.com> parents: 39480 diff changeset	93	# You can reorder changesets by reordering the lines
11c076786d56 histedit: add templating support to histedit's rule file generation Augie Fackler <augie@google.com> parents: 39480 diff changeset	94	#
11c076786d56 histedit: add templating support to histedit's rule file generation Augie Fackler <augie@google.com> parents: 39480 diff changeset	95	# Commands:
11c076786d56 histedit: add templating support to histedit's rule file generation Augie Fackler <augie@google.com> parents: 39480 diff changeset	96	#
11c076786d56 histedit: add templating support to histedit's rule file generation Augie Fackler <augie@google.com> parents: 39480 diff changeset	97	# e, edit = use commit, but stop for amending
11c076786d56 histedit: add templating support to histedit's rule file generation Augie Fackler <augie@google.com> parents: 39480 diff changeset	98	# m, mess = edit commit message without changing commit content
11c076786d56 histedit: add templating support to histedit's rule file generation Augie Fackler <augie@google.com> parents: 39480 diff changeset	99	# p, pick = use commit
11c076786d56 histedit: add templating support to histedit's rule file generation Augie Fackler <augie@google.com> parents: 39480 diff changeset	100	# b, base = checkout changeset and apply further changesets from there
11c076786d56 histedit: add templating support to histedit's rule file generation Augie Fackler <augie@google.com> parents: 39480 diff changeset	101	# d, drop = remove commit from history
11c076786d56 histedit: add templating support to histedit's rule file generation Augie Fackler <augie@google.com> parents: 39480 diff changeset	102	# f, fold = use commit, but combine it with the one above
11c076786d56 histedit: add templating support to histedit's rule file generation Augie Fackler <augie@google.com> parents: 39480 diff changeset	103	# r, roll = like fold, but discard this commit's description and date
11c076786d56 histedit: add templating support to histedit's rule file generation Augie Fackler <augie@google.com> parents: 39480 diff changeset	104	#
11c076786d56 histedit: add templating support to histedit's rule file generation Augie Fackler <augie@google.com> parents: 39480 diff changeset	105
11c076786d56 histedit: add templating support to histedit's rule file generation Augie Fackler <augie@google.com> parents: 39480 diff changeset	106
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	107	edit the history
19019 53060cc1b601 histedit-test: generalise --commands "-" usage Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18437 diff changeset	108	(use a hacky editor to check histedit-last-edit.txt backup)
53060cc1b601 histedit-test: generalise --commands "-" usage Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18437 diff changeset	109
53060cc1b601 histedit-test: generalise --commands "-" usage Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18437 diff changeset	110	$ EDITED="$TESTTMP/editedhistory"
53060cc1b601 histedit-test: generalise --commands "-" usage Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18437 diff changeset	111	$ cat > $EDITED <<EOF
27546 c00924c54607 histedit: limit cleanup of histedit-last-edit.txt to success timeless <timeless@mozdev.org> parents: 27545 diff changeset	112	> edit 177f92b77385 c
c00924c54607 histedit: limit cleanup of histedit-last-edit.txt to success timeless <timeless@mozdev.org> parents: 27545 diff changeset	113	> pick e860deea161a e
c00924c54607 histedit: limit cleanup of histedit-last-edit.txt to success timeless <timeless@mozdev.org> parents: 27545 diff changeset	114	> pick 652413bf663e f
c00924c54607 histedit: limit cleanup of histedit-last-edit.txt to success timeless <timeless@mozdev.org> parents: 27545 diff changeset	115	> pick 055a42cdd887 d
c00924c54607 histedit: limit cleanup of histedit-last-edit.txt to success timeless <timeless@mozdev.org> parents: 27545 diff changeset	116	> EOF
c00924c54607 histedit: limit cleanup of histedit-last-edit.txt to success timeless <timeless@mozdev.org> parents: 27545 diff changeset	117	$ HGEDITOR="cat \"$EDITED\" > " hg histedit 177f92b77385 2>&1 \| fixbundle
c00924c54607 histedit: limit cleanup of histedit-last-edit.txt to success timeless <timeless@mozdev.org> parents: 27545 diff changeset	118	0 files updated, 0 files merged, 4 files removed, 0 files unresolved
27629 e7ff83b2bcfe histedit: list action when intervention is required timeless <timeless@mozdev.org> parents: 27546 diff changeset	119	Editing (177f92b77385), you may commit or record as needed now.
e7ff83b2bcfe histedit: list action when intervention is required timeless <timeless@mozdev.org> parents: 27546 diff changeset	120	(hg histedit --continue to resume)
27546 c00924c54607 histedit: limit cleanup of histedit-last-edit.txt to success timeless <timeless@mozdev.org> parents: 27545 diff changeset	121
c00924c54607 histedit: limit cleanup of histedit-last-edit.txt to success timeless <timeless@mozdev.org> parents: 27545 diff changeset	122	rules should end up in .hg/histedit-last-edit.txt:
c00924c54607 histedit: limit cleanup of histedit-last-edit.txt to success timeless <timeless@mozdev.org> parents: 27545 diff changeset	123	$ cat .hg/histedit-last-edit.txt
c00924c54607 histedit: limit cleanup of histedit-last-edit.txt to success timeless <timeless@mozdev.org> parents: 27545 diff changeset	124	edit 177f92b77385 c
c00924c54607 histedit: limit cleanup of histedit-last-edit.txt to success timeless <timeless@mozdev.org> parents: 27545 diff changeset	125	pick e860deea161a e
c00924c54607 histedit: limit cleanup of histedit-last-edit.txt to success timeless <timeless@mozdev.org> parents: 27545 diff changeset	126	pick 652413bf663e f
c00924c54607 histedit: limit cleanup of histedit-last-edit.txt to success timeless <timeless@mozdev.org> parents: 27545 diff changeset	127	pick 055a42cdd887 d
c00924c54607 histedit: limit cleanup of histedit-last-edit.txt to success timeless <timeless@mozdev.org> parents: 27545 diff changeset	128
c00924c54607 histedit: limit cleanup of histedit-last-edit.txt to success timeless <timeless@mozdev.org> parents: 27545 diff changeset	129	$ hg histedit --abort
c00924c54607 histedit: limit cleanup of histedit-last-edit.txt to success timeless <timeless@mozdev.org> parents: 27545 diff changeset	130	4 files updated, 0 files merged, 0 files removed, 0 files unresolved
c00924c54607 histedit: limit cleanup of histedit-last-edit.txt to success timeless <timeless@mozdev.org> parents: 27545 diff changeset	131	$ cat > $EDITED <<EOF
19019 53060cc1b601 histedit-test: generalise --commands "-" usage Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18437 diff changeset	132	> pick 177f92b77385 c
53060cc1b601 histedit-test: generalise --commands "-" usage Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18437 diff changeset	133	> pick e860deea161a e
53060cc1b601 histedit-test: generalise --commands "-" usage Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18437 diff changeset	134	> pick 652413bf663e f
53060cc1b601 histedit-test: generalise --commands "-" usage Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18437 diff changeset	135	> pick 055a42cdd887 d
53060cc1b601 histedit-test: generalise --commands "-" usage Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18437 diff changeset	136	> EOF
17086 5f2cacb715dc tests: make histedit tests more resilient to filesystem variation Mads Kiilerich <mads@kiilerich.com> parents: 17085 diff changeset	137	$ HGEDITOR="cat \"$EDITED\" > " hg histedit 177f92b77385 2>&1 \| fixbundle
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	138
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	139	log after edit
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	140	$ hg log --graph
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17087 diff changeset	141	@ changeset: 5:07114f51870f
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	142	\| tag: tip
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	143	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	144	\| date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	145	\| summary: d
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	146	\|
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17087 diff changeset	147	o changeset: 4:8ade9693061e
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	148	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	149	\| date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	150	\| summary: f
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	151	\|
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17087 diff changeset	152	o changeset: 3:d8249471110a
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	153	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	154	\| date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	155	\| summary: e
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	156	\|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	157	o changeset: 2:177f92b77385
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	158	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	159	\| date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	160	\| summary: c
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	161	\|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	162	o changeset: 1:d2ae7f538514
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	163	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	164	\| date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	165	\| summary: b
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	166	\|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	167	o changeset: 0:cb9a9f314b8b
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	168	user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 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: 17064 diff changeset	170	summary: a
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	171
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	172
41509 11c076786d56 histedit: add templating support to histedit's rule file generation Augie Fackler <augie@google.com> parents: 39480 diff changeset	173
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	174	put things back
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	175
19019 53060cc1b601 histedit-test: generalise --commands "-" usage Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18437 diff changeset	176	$ hg histedit 177f92b77385 --commands - 2>&1 << EOF \| fixbundle
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	177	> pick 177f92b77385 c
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17087 diff changeset	178	> pick 07114f51870f d
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17087 diff changeset	179	> pick d8249471110a e
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17087 diff changeset	180	> pick 8ade9693061e f
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	181	> EOF
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	182
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	183	$ hg log --graph
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17087 diff changeset	184	@ changeset: 5:7eca9b5b1148
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	185	\| tag: tip
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	186	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	187	\| date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	188	\| summary: f
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	189	\|
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17087 diff changeset	190	o changeset: 4:915da888f2de
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	191	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	192	\| date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	193	\| summary: e
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	194	\|
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17087 diff changeset	195	o changeset: 3:10517e47bbbb
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	196	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	197	\| date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	198	\| summary: d
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	199	\|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	200	o changeset: 2:177f92b77385
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	201	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	202	\| date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	203	\| summary: c
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	204	\|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	205	o changeset: 1:d2ae7f538514
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	206	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	207	\| date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	208	\| summary: b
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	209	\|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	210	o changeset: 0:cb9a9f314b8b
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	211	user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	212	date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	213	summary: a
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	214
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	215
41509 11c076786d56 histedit: add templating support to histedit's rule file generation Augie Fackler <augie@google.com> parents: 39480 diff changeset	216
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	217	slightly different this time
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	218
19019 53060cc1b601 histedit-test: generalise --commands "-" usage Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18437 diff changeset	219	$ hg histedit 177f92b77385 --commands - << EOF 2>&1 \| fixbundle
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17087 diff changeset	220	> pick 10517e47bbbb d
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17087 diff changeset	221	> pick 7eca9b5b1148 f
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17087 diff changeset	222	> pick 915da888f2de e
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	223	> pick 177f92b77385 c
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	224	> EOF
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	225	$ hg log --graph
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17087 diff changeset	226	@ changeset: 5:38b92f448761
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	227	\| tag: tip
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	228	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	229	\| date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	230	\| summary: c
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	231	\|
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17087 diff changeset	232	o changeset: 4:de71b079d9ce
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	233	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	234	\| date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	235	\| summary: e
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	236	\|
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17087 diff changeset	237	o changeset: 3:be9ae3a309c6
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	238	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	239	\| date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	240	\| summary: f
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	241	\|
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17087 diff changeset	242	o changeset: 2:799205341b6b
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	243	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	244	\| date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	245	\| summary: d
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	246	\|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	247	o changeset: 1:d2ae7f538514
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	248	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	249	\| date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	250	\| summary: b
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	251	\|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	252	o changeset: 0:cb9a9f314b8b
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	253	user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	254	date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	255	summary: a
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	256
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	257
41509 11c076786d56 histedit: add templating support to histedit's rule file generation Augie Fackler <augie@google.com> parents: 39480 diff changeset	258
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	259	keep prevents stripping dead revs
19019 53060cc1b601 histedit-test: generalise --commands "-" usage Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18437 diff changeset	260	$ hg histedit 799205341b6b --keep --commands - 2>&1 << EOF \| fixbundle
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17087 diff changeset	261	> pick 799205341b6b d
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17087 diff changeset	262	> pick be9ae3a309c6 f
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17087 diff changeset	263	> pick 38b92f448761 c
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17087 diff changeset	264	> pick de71b079d9ce e
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	265	> EOF
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	266	$ hg log --graph
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17087 diff changeset	267	@ changeset: 7:803ef1c6fcfd
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	268	\| tag: tip
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	269	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	270	\| date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	271	\| summary: e
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	272	\|
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17087 diff changeset	273	o changeset: 6:ece0b8d93dda
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17087 diff changeset	274	\| parent: 3:be9ae3a309c6
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	275	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	276	\| date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	277	\| summary: c
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	278	\|
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17087 diff changeset	279	\| o changeset: 5:38b92f448761
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	280	\| \| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	281	\| \| date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	282	\| \| summary: c
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	283	\| \|
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17087 diff changeset	284	\| o changeset: 4:de71b079d9ce
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	285	\|/ user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	286	\| date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	287	\| summary: e
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	288	\|
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17087 diff changeset	289	o changeset: 3:be9ae3a309c6
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	290	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	291	\| date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	292	\| summary: f
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	293	\|
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17087 diff changeset	294	o changeset: 2:799205341b6b
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	295	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	296	\| date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	297	\| summary: d
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	298	\|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	299	o changeset: 1:d2ae7f538514
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	300	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	301	\| date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	302	\| summary: b
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	303	\|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	304	o changeset: 0:cb9a9f314b8b
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	305	user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	306	date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	307	summary: a
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	308
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	309
41509 11c076786d56 histedit: add templating support to histedit's rule file generation Augie Fackler <augie@google.com> parents: 39480 diff changeset	310
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	311	try with --rev
19019 53060cc1b601 histedit-test: generalise --commands "-" usage Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18437 diff changeset	312	$ hg histedit --commands - --rev -2 2>&1 <<EOF \| fixbundle
53060cc1b601 histedit-test: generalise --commands "-" usage Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18437 diff changeset	313	> pick de71b079d9ce e
53060cc1b601 histedit-test: generalise --commands "-" usage Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18437 diff changeset	314	> pick 38b92f448761 c
53060cc1b601 histedit-test: generalise --commands "-" usage Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18437 diff changeset	315	> EOF
27955 b721c9543a4f histedit: show correct hash ID at verification error FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27712 diff changeset	316	hg: parse error: pick "de71b079d9ce" changeset was not a candidate
27712 bb810c8b3eca histedit: report the unacceptable changeset timeless <timeless@mozdev.org> parents: 27674 diff changeset	317	(only use listed changesets)
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	318	$ hg log --graph
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17087 diff changeset	319	@ changeset: 7:803ef1c6fcfd
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	320	\| tag: tip
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	321	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	322	\| date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	323	\| summary: e
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	324	\|
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17087 diff changeset	325	o changeset: 6:ece0b8d93dda
358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17087 diff changeset	326	\| parent: 3:be9ae3a309c6
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	327	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	328	\| date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	329	\| summary: c
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	330	\|
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17087 diff changeset	331	\| o changeset: 5:38b92f448761
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	332	\| \| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	333	\| \| date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	334	\| \| summary: c
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	335	\| \|
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17087 diff changeset	336	\| o changeset: 4:de71b079d9ce
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	337	\|/ user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	338	\| date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	339	\| summary: e
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	340	\|
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17087 diff changeset	341	o changeset: 3:be9ae3a309c6
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	342	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	343	\| date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	344	\| summary: f
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	345	\|
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17087 diff changeset	346	o changeset: 2:799205341b6b
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	347	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	348	\| date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	349	\| summary: d
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	350	\|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	351	o changeset: 1:d2ae7f538514
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	352	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	353	\| date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	354	\| summary: b
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	355	\|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	356	o changeset: 0:cb9a9f314b8b
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	357	user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	358	date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	359	summary: a
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	360
41509 11c076786d56 histedit: add templating support to histedit's rule file generation Augie Fackler <augie@google.com> parents: 39480 diff changeset	361
21950 af44c7a1e55e histedit: respect revsetalias entries (issue4311) Augie Fackler <raf@durin42.com> parents: 20511 diff changeset	362	Verify that revsetalias entries work with histedit:
af44c7a1e55e histedit: respect revsetalias entries (issue4311) Augie Fackler <raf@durin42.com> parents: 20511 diff changeset	363	$ cat >> $HGRCPATH <<EOF
af44c7a1e55e histedit: respect revsetalias entries (issue4311) Augie Fackler <raf@durin42.com> parents: 20511 diff changeset	364	> [revsetalias]
af44c7a1e55e histedit: respect revsetalias entries (issue4311) Augie Fackler <raf@durin42.com> parents: 20511 diff changeset	365	> grandparent(ARG) = p1(p1(ARG))
af44c7a1e55e histedit: respect revsetalias entries (issue4311) Augie Fackler <raf@durin42.com> parents: 20511 diff changeset	366	> EOF
af44c7a1e55e histedit: respect revsetalias entries (issue4311) Augie Fackler <raf@durin42.com> parents: 20511 diff changeset	367	$ echo extra commit >> c
af44c7a1e55e histedit: respect revsetalias entries (issue4311) Augie Fackler <raf@durin42.com> parents: 20511 diff changeset	368	$ hg ci -m 'extra commit to c'
af44c7a1e55e histedit: respect revsetalias entries (issue4311) Augie Fackler <raf@durin42.com> parents: 20511 diff changeset	369	$ HGEDITOR=cat hg histedit 'grandparent(.)'
af44c7a1e55e histedit: respect revsetalias entries (issue4311) Augie Fackler <raf@durin42.com> parents: 20511 diff changeset	370	pick ece0b8d93dda 6 c
af44c7a1e55e histedit: respect revsetalias entries (issue4311) Augie Fackler <raf@durin42.com> parents: 20511 diff changeset	371	pick 803ef1c6fcfd 7 e
af44c7a1e55e histedit: respect revsetalias entries (issue4311) Augie Fackler <raf@durin42.com> parents: 20511 diff changeset	372	pick 9c863c565126 8 extra commit to c
af44c7a1e55e histedit: respect revsetalias entries (issue4311) Augie Fackler <raf@durin42.com> parents: 20511 diff changeset	373
af44c7a1e55e histedit: respect revsetalias entries (issue4311) Augie Fackler <raf@durin42.com> parents: 20511 diff changeset	374	# Edit history between ece0b8d93dda and 9c863c565126
af44c7a1e55e histedit: respect revsetalias entries (issue4311) Augie Fackler <raf@durin42.com> parents: 20511 diff changeset	375	#
af44c7a1e55e histedit: respect revsetalias entries (issue4311) Augie Fackler <raf@durin42.com> parents: 20511 diff changeset	376	# Commits are listed from least to most recent
af44c7a1e55e histedit: respect revsetalias entries (issue4311) Augie Fackler <raf@durin42.com> parents: 20511 diff changeset	377	#
28396 5490b04e6132 histedit: adds hint how to reorder changesets at editor (issue3766) liscju <piotr.listkiewicz@gmail.com> parents: 28004 diff changeset	378	# You can reorder changesets by reordering the lines
5490b04e6132 histedit: adds hint how to reorder changesets at editor (issue3766) liscju <piotr.listkiewicz@gmail.com> parents: 28004 diff changeset	379	#
21950 af44c7a1e55e histedit: respect revsetalias entries (issue4311) Augie Fackler <raf@durin42.com> parents: 20511 diff changeset	380	# Commands:
27674 78d86664e3a2 histedit: prefer edit commit, edit message, use commit timeless <timeless@mozdev.org> parents: 27629 diff changeset	381	#
78d86664e3a2 histedit: prefer edit commit, edit message, use commit timeless <timeless@mozdev.org> parents: 27629 diff changeset	382	# e, edit = use commit, but stop for amending
78d86664e3a2 histedit: prefer edit commit, edit message, use commit timeless <timeless@mozdev.org> parents: 27629 diff changeset	383	# m, mess = edit commit message without changing commit content
21950 af44c7a1e55e histedit: respect revsetalias entries (issue4311) Augie Fackler <raf@durin42.com> parents: 20511 diff changeset	384	# p, pick = use commit
34489 270e344a6c74 histedit: removing the experimental config 'histeditng' Saurabh Singh <singhsrb@fb.com> parents: 33351 diff changeset	385	# b, base = checkout changeset and apply further changesets from there
27674 78d86664e3a2 histedit: prefer edit commit, edit message, use commit timeless <timeless@mozdev.org> parents: 27629 diff changeset	386	# d, drop = remove commit from history
21950 af44c7a1e55e histedit: respect revsetalias entries (issue4311) Augie Fackler <raf@durin42.com> parents: 20511 diff changeset	387	# f, fold = use commit, but combine it with the one above
31056 37ab9e20991c histedit: modify rollup to discard date from the rollup commit (issue4820) Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28396 diff changeset	388	# r, roll = like fold, but discard this commit's description and date
21950 af44c7a1e55e histedit: respect revsetalias entries (issue4311) Augie Fackler <raf@durin42.com> parents: 20511 diff changeset	389	#
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	390
41509 11c076786d56 histedit: add templating support to histedit's rule file generation Augie Fackler <augie@google.com> parents: 39480 diff changeset	391
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	392	should also work if a commit message is missing
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	393	$ BUNDLE="$TESTDIR/missing-comment.hg"
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	394	$ hg init missing
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	395	$ cd missing
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	396	$ hg unbundle $BUNDLE
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	397	adding changesets
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	398	adding manifests
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	399	adding file changes
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	400	added 3 changesets with 3 changes to 1 files
39480 89630d0b3e23 phase: report number of non-public changeset alongside the new range Boris Feld <boris.feld@octobus.net> parents: 35414 diff changeset	401	new changesets 141947992243:bd22688093b3 (3 drafts)
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	402	(run 'hg update' to get a working copy)
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	403	$ hg co tip
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	404	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	405	$ hg log --graph
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	406	@ changeset: 2:bd22688093b3
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	407	\| tag: tip
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	408	\| user: Robert Altman <robert.altman@telventDTN.com>
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	409	\| date: Mon Nov 28 16:40:04 2011 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	410	\| summary: Update file.
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	411	\|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	412	o changeset: 1:3b3e956f9171
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	413	\| user: Robert Altman <robert.altman@telventDTN.com>
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	414	\| date: Mon Nov 28 16:37:57 2011 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	415	\|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	416	o changeset: 0:141947992243
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	417	user: Robert Altman <robert.altman@telventDTN.com>
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	418	date: Mon Nov 28 16:35:28 2011 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	419	summary: Checked in text file
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	420
41509 11c076786d56 histedit: add templating support to histedit's rule file generation Augie Fackler <augie@google.com> parents: 39480 diff changeset	421
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	422	$ hg histedit 0
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	423	$ cd ..
23889 3831e9b3750a histedit: add a test to show that issue4251 is fixed (issue4251) Augie Fackler <raf@durin42.com> parents: 22152 diff changeset	424
3831e9b3750a histedit: add a test to show that issue4251 is fixed (issue4251) Augie Fackler <raf@durin42.com> parents: 22152 diff changeset	425	$ cd ..
3831e9b3750a histedit: add a test to show that issue4251 is fixed (issue4251) Augie Fackler <raf@durin42.com> parents: 22152 diff changeset	426
3831e9b3750a histedit: add a test to show that issue4251 is fixed (issue4251) Augie Fackler <raf@durin42.com> parents: 22152 diff changeset	427
3831e9b3750a histedit: add a test to show that issue4251 is fixed (issue4251) Augie Fackler <raf@durin42.com> parents: 22152 diff changeset	428	Test to make sure folding renames doesn't cause bogus conflicts (issue4251):
3831e9b3750a histedit: add a test to show that issue4251 is fixed (issue4251) Augie Fackler <raf@durin42.com> parents: 22152 diff changeset	429	$ hg init issue4251
3831e9b3750a histedit: add a test to show that issue4251 is fixed (issue4251) Augie Fackler <raf@durin42.com> parents: 22152 diff changeset	430	$ cd issue4251
3831e9b3750a histedit: add a test to show that issue4251 is fixed (issue4251) Augie Fackler <raf@durin42.com> parents: 22152 diff changeset	431
3831e9b3750a histedit: add a test to show that issue4251 is fixed (issue4251) Augie Fackler <raf@durin42.com> parents: 22152 diff changeset	432	$ mkdir initial-dir
3831e9b3750a histedit: add a test to show that issue4251 is fixed (issue4251) Augie Fackler <raf@durin42.com> parents: 22152 diff changeset	433	$ echo foo > initial-dir/initial-file
3831e9b3750a histedit: add a test to show that issue4251 is fixed (issue4251) Augie Fackler <raf@durin42.com> parents: 22152 diff changeset	434	$ hg add initial-dir/initial-file
3831e9b3750a histedit: add a test to show that issue4251 is fixed (issue4251) Augie Fackler <raf@durin42.com> parents: 22152 diff changeset	435	$ hg commit -m "initial commit"
3831e9b3750a histedit: add a test to show that issue4251 is fixed (issue4251) Augie Fackler <raf@durin42.com> parents: 22152 diff changeset	436
3831e9b3750a histedit: add a test to show that issue4251 is fixed (issue4251) Augie Fackler <raf@durin42.com> parents: 22152 diff changeset	437	Move the file to a new directory, and in the same commit, change its content:
3831e9b3750a histedit: add a test to show that issue4251 is fixed (issue4251) Augie Fackler <raf@durin42.com> parents: 22152 diff changeset	438	$ mkdir another-dir
3831e9b3750a histedit: add a test to show that issue4251 is fixed (issue4251) Augie Fackler <raf@durin42.com> parents: 22152 diff changeset	439	$ hg mv initial-dir/initial-file another-dir/
3831e9b3750a histedit: add a test to show that issue4251 is fixed (issue4251) Augie Fackler <raf@durin42.com> parents: 22152 diff changeset	440	$ echo changed > another-dir/initial-file
3831e9b3750a histedit: add a test to show that issue4251 is fixed (issue4251) Augie Fackler <raf@durin42.com> parents: 22152 diff changeset	441	$ hg commit -m "moved and changed"
3831e9b3750a histedit: add a test to show that issue4251 is fixed (issue4251) Augie Fackler <raf@durin42.com> parents: 22152 diff changeset	442
3831e9b3750a histedit: add a test to show that issue4251 is fixed (issue4251) Augie Fackler <raf@durin42.com> parents: 22152 diff changeset	443	Rename the file:
3831e9b3750a histedit: add a test to show that issue4251 is fixed (issue4251) Augie Fackler <raf@durin42.com> parents: 22152 diff changeset	444	$ hg mv another-dir/initial-file another-dir/renamed-file
3831e9b3750a histedit: add a test to show that issue4251 is fixed (issue4251) Augie Fackler <raf@durin42.com> parents: 22152 diff changeset	445	$ hg commit -m "renamed"
3831e9b3750a histedit: add a test to show that issue4251 is fixed (issue4251) Augie Fackler <raf@durin42.com> parents: 22152 diff changeset	446
3831e9b3750a histedit: add a test to show that issue4251 is fixed (issue4251) Augie Fackler <raf@durin42.com> parents: 22152 diff changeset	447	Now, let's try to fold the second commit into the first:
3831e9b3750a histedit: add a test to show that issue4251 is fixed (issue4251) Augie Fackler <raf@durin42.com> parents: 22152 diff changeset	448	$ cat > editor.sh <<EOF
3831e9b3750a histedit: add a test to show that issue4251 is fixed (issue4251) Augie Fackler <raf@durin42.com> parents: 22152 diff changeset	449	> #!/bin/sh
3831e9b3750a histedit: add a test to show that issue4251 is fixed (issue4251) Augie Fackler <raf@durin42.com> parents: 22152 diff changeset	450	> cat > \$1 <<ENDOF
3831e9b3750a histedit: add a test to show that issue4251 is fixed (issue4251) Augie Fackler <raf@durin42.com> parents: 22152 diff changeset	451	> pick b0f4233702ca 0 initial commit
3831e9b3750a histedit: add a test to show that issue4251 is fixed (issue4251) Augie Fackler <raf@durin42.com> parents: 22152 diff changeset	452	> fold 5e8704a8f2d2 1 moved and changed
3831e9b3750a histedit: add a test to show that issue4251 is fixed (issue4251) Augie Fackler <raf@durin42.com> parents: 22152 diff changeset	453	> pick 40e7299e8fa7 2 renamed
3831e9b3750a histedit: add a test to show that issue4251 is fixed (issue4251) Augie Fackler <raf@durin42.com> parents: 22152 diff changeset	454	> ENDOF
3831e9b3750a histedit: add a test to show that issue4251 is fixed (issue4251) Augie Fackler <raf@durin42.com> parents: 22152 diff changeset	455	> EOF
3831e9b3750a histedit: add a test to show that issue4251 is fixed (issue4251) Augie Fackler <raf@durin42.com> parents: 22152 diff changeset	456
23910 759df5197e9a test-histedit-commute: call helper script with sh Matt Mackall <mpm@selenic.com> parents: 23889 diff changeset	457	$ HGEDITOR="sh ./editor.sh" hg histedit 0
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 34661 diff changeset	458	saved backup bundle to $TESTTMP/issue4251/.hg/strip-backup/b0f4233702ca-4cf5af69-histedit.hg
23889 3831e9b3750a histedit: add a test to show that issue4251 is fixed (issue4251) Augie Fackler <raf@durin42.com> parents: 22152 diff changeset	459
3831e9b3750a histedit: add a test to show that issue4251 is fixed (issue4251) Augie Fackler <raf@durin42.com> parents: 22152 diff changeset	460	$ hg --config diff.git=yes export 0
3831e9b3750a histedit: add a test to show that issue4251 is fixed (issue4251) Augie Fackler <raf@durin42.com> parents: 22152 diff changeset	461	# HG changeset patch
3831e9b3750a histedit: add a test to show that issue4251 is fixed (issue4251) Augie Fackler <raf@durin42.com> parents: 22152 diff changeset	462	# User test
3831e9b3750a histedit: add a test to show that issue4251 is fixed (issue4251) Augie Fackler <raf@durin42.com> parents: 22152 diff changeset	463	# Date 0 0
3831e9b3750a histedit: add a test to show that issue4251 is fixed (issue4251) Augie Fackler <raf@durin42.com> parents: 22152 diff changeset	464	# Thu Jan 01 00:00:00 1970 +0000
3831e9b3750a histedit: add a test to show that issue4251 is fixed (issue4251) Augie Fackler <raf@durin42.com> parents: 22152 diff changeset	465	# Node ID fffadc26f8f85623ce60b028a3f1ccc3730f8530
3831e9b3750a histedit: add a test to show that issue4251 is fixed (issue4251) Augie Fackler <raf@durin42.com> parents: 22152 diff changeset	466	# Parent 0000000000000000000000000000000000000000
3831e9b3750a histedit: add a test to show that issue4251 is fixed (issue4251) Augie Fackler <raf@durin42.com> parents: 22152 diff changeset	467	pick b0f4233702ca 0 initial commit
3831e9b3750a histedit: add a test to show that issue4251 is fixed (issue4251) Augie Fackler <raf@durin42.com> parents: 22152 diff changeset	468	fold 5e8704a8f2d2 1 moved and changed
3831e9b3750a histedit: add a test to show that issue4251 is fixed (issue4251) Augie Fackler <raf@durin42.com> parents: 22152 diff changeset	469	pick 40e7299e8fa7 2 renamed
3831e9b3750a histedit: add a test to show that issue4251 is fixed (issue4251) Augie Fackler <raf@durin42.com> parents: 22152 diff changeset	470
3831e9b3750a histedit: add a test to show that issue4251 is fixed (issue4251) Augie Fackler <raf@durin42.com> parents: 22152 diff changeset	471	diff --git a/another-dir/initial-file b/another-dir/initial-file
3831e9b3750a histedit: add a test to show that issue4251 is fixed (issue4251) Augie Fackler <raf@durin42.com> parents: 22152 diff changeset	472	new file mode 100644
3831e9b3750a histedit: add a test to show that issue4251 is fixed (issue4251) Augie Fackler <raf@durin42.com> parents: 22152 diff changeset	473	--- /dev/null
3831e9b3750a histedit: add a test to show that issue4251 is fixed (issue4251) Augie Fackler <raf@durin42.com> parents: 22152 diff changeset	474	+++ b/another-dir/initial-file
3831e9b3750a histedit: add a test to show that issue4251 is fixed (issue4251) Augie Fackler <raf@durin42.com> parents: 22152 diff changeset	475	@@ -0,0 +1,1 @@
3831e9b3750a histedit: add a test to show that issue4251 is fixed (issue4251) Augie Fackler <raf@durin42.com> parents: 22152 diff changeset	476	+changed
3831e9b3750a histedit: add a test to show that issue4251 is fixed (issue4251) Augie Fackler <raf@durin42.com> parents: 22152 diff changeset	477
41509 11c076786d56 histedit: add templating support to histedit's rule file generation Augie Fackler <augie@google.com> parents: 39480 diff changeset	478
23889 3831e9b3750a histedit: add a test to show that issue4251 is fixed (issue4251) Augie Fackler <raf@durin42.com> parents: 22152 diff changeset	479	$ hg --config diff.git=yes export 1
3831e9b3750a histedit: add a test to show that issue4251 is fixed (issue4251) Augie Fackler <raf@durin42.com> parents: 22152 diff changeset	480	# HG changeset patch
3831e9b3750a histedit: add a test to show that issue4251 is fixed (issue4251) Augie Fackler <raf@durin42.com> parents: 22152 diff changeset	481	# User test
3831e9b3750a histedit: add a test to show that issue4251 is fixed (issue4251) Augie Fackler <raf@durin42.com> parents: 22152 diff changeset	482	# Date 0 0
3831e9b3750a histedit: add a test to show that issue4251 is fixed (issue4251) Augie Fackler <raf@durin42.com> parents: 22152 diff changeset	483	# Thu Jan 01 00:00:00 1970 +0000
3831e9b3750a histedit: add a test to show that issue4251 is fixed (issue4251) Augie Fackler <raf@durin42.com> parents: 22152 diff changeset	484	# Node ID 9b730d82b00af8a2766facebfa47cc124405a118
3831e9b3750a histedit: add a test to show that issue4251 is fixed (issue4251) Augie Fackler <raf@durin42.com> parents: 22152 diff changeset	485	# Parent fffadc26f8f85623ce60b028a3f1ccc3730f8530
3831e9b3750a histedit: add a test to show that issue4251 is fixed (issue4251) Augie Fackler <raf@durin42.com> parents: 22152 diff changeset	486	renamed
3831e9b3750a histedit: add a test to show that issue4251 is fixed (issue4251) Augie Fackler <raf@durin42.com> parents: 22152 diff changeset	487
3831e9b3750a histedit: add a test to show that issue4251 is fixed (issue4251) Augie Fackler <raf@durin42.com> parents: 22152 diff changeset	488	diff --git a/another-dir/initial-file b/another-dir/renamed-file
3831e9b3750a histedit: add a test to show that issue4251 is fixed (issue4251) Augie Fackler <raf@durin42.com> parents: 22152 diff changeset	489	rename from another-dir/initial-file
3831e9b3750a histedit: add a test to show that issue4251 is fixed (issue4251) Augie Fackler <raf@durin42.com> parents: 22152 diff changeset	490	rename to another-dir/renamed-file
3831e9b3750a histedit: add a test to show that issue4251 is fixed (issue4251) Augie Fackler <raf@durin42.com> parents: 22152 diff changeset	491
41509 11c076786d56 histedit: add templating support to histedit's rule file generation Augie Fackler <augie@google.com> parents: 39480 diff changeset	492
23889 3831e9b3750a histedit: add a test to show that issue4251 is fixed (issue4251) Augie Fackler <raf@durin42.com> parents: 22152 diff changeset	493	$ cd ..
35390 7b73bf1a48d4 histedit: preserve active branch while histediting Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	494
7b73bf1a48d4 histedit: preserve active branch while histediting Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	495	Test that branches are preserved and stays active
7b73bf1a48d4 histedit: preserve active branch while histediting Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	496	-------------------------------------------------
7b73bf1a48d4 histedit: preserve active branch while histediting Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	497
7b73bf1a48d4 histedit: preserve active branch while histediting Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	498	$ hg init repo-with-branch
7b73bf1a48d4 histedit: preserve active branch while histediting Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	499	$ cd repo-with-branch
7b73bf1a48d4 histedit: preserve active branch while histediting Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	500	$ echo a > a
7b73bf1a48d4 histedit: preserve active branch while histediting Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	501	$ hg add a
7b73bf1a48d4 histedit: preserve active branch while histediting Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	502	$ hg commit -m A
7b73bf1a48d4 histedit: preserve active branch while histediting Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	503	$ hg branch foo
7b73bf1a48d4 histedit: preserve active branch while histediting Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	504	marked working directory as branch foo
7b73bf1a48d4 histedit: preserve active branch while histediting Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	505	(branches are permanent and global, did you want a bookmark?)
7b73bf1a48d4 histedit: preserve active branch while histediting Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	506	$ echo a > b
7b73bf1a48d4 histedit: preserve active branch while histediting Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	507	$ hg add b
7b73bf1a48d4 histedit: preserve active branch while histediting Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	508	$ hg commit -m foo-B
7b73bf1a48d4 histedit: preserve active branch while histediting Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	509	$ echo a > c
7b73bf1a48d4 histedit: preserve active branch while histediting Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	510	$ hg add c
7b73bf1a48d4 histedit: preserve active branch while histediting Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	511	$ hg commit -m foo-C
7b73bf1a48d4 histedit: preserve active branch while histediting Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	512
7b73bf1a48d4 histedit: preserve active branch while histediting Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	513	$ hg branch
7b73bf1a48d4 histedit: preserve active branch while histediting Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	514	foo
7b73bf1a48d4 histedit: preserve active branch while histediting Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	515	$ echo "pick efefa76d6dc3 2 foo-C" >> cmd
7b73bf1a48d4 histedit: preserve active branch while histediting Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	516	$ echo "pick 7336e7550422 1 foo-B" >> cmd
7b73bf1a48d4 histedit: preserve active branch while histediting Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	517
7b73bf1a48d4 histedit: preserve active branch while histediting Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	518	$ HGEDITOR=cat hg histedit -r ".^" --commands cmd --quiet
7b73bf1a48d4 histedit: preserve active branch while histediting Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	519	$ hg log --template '{rev} {branch}\n'
7b73bf1a48d4 histedit: preserve active branch while histediting Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	520	2 foo
7b73bf1a48d4 histedit: preserve active branch while histediting Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	521	1 foo
7b73bf1a48d4 histedit: preserve active branch while histediting Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	522	0 default
7b73bf1a48d4 histedit: preserve active branch while histediting Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	523	$ hg branch
7b73bf1a48d4 histedit: preserve active branch while histediting Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	524	foo
7b73bf1a48d4 histedit: preserve active branch while histediting Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	525
7b73bf1a48d4 histedit: preserve active branch while histediting Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	526	$ cd ..

author	Pierre-Yves David <pierre-yves.david@octobus.net>
	Sat, 16 May 2020 20:38:31 +0200
branch	stable
changeset 44912	4234c9af515d
parent 41509	11c076786d56
child 45857	ec6ba70be853
permissions	-rw-r--r--