evolve: tests/test-evolve-templates.t@1627153804dc (annotated)

2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1	This test file test the various templates for precursors and successors.
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	2
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	3	Global setup
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	4	============
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	5
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	6	$ . $TESTDIR/testlib/common.sh
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	7	$ cat >> $HGRCPATH <<EOF
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	8	> [ui]
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	9	> interactive = true
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	10	> [phases]
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	11	> publish=False
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	12	> [extensions]
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	13	> evolve =
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	14	> [alias]
2497 1e9b86ed78c9 template: make the template definition more manageable Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2496 diff changeset	15	> tlog = log -G -T '{node\|short}\
1e9b86ed78c9 template: make the template definition more manageable Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2496 diff changeset	16	> {if(precursors, "\n Precursors: {precursors}")}\
2500 2092007af205 template: update precursors template output Boris Feld <boris.feld@octobus.net> parents: 2499 diff changeset	17	> {if(precursors, "\n semi-colon: {join(precursors, "; ")}")}\
2498 b765650b37ee template: skip "successors" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2497 diff changeset	18	> {if(successors, "\n Successors: {successors}")}\
2595 54ac473663ff compat-test: merge with stable Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2594 diff changeset	19	> {if(successors, "\n semi-colon: {join(successors, "; ")}")}\n'
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	20	> EOF
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	21
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	22	Test templates on amended commit
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	23	================================
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	24
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	25	Test setup
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	26	----------
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	27
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	28	$ hg init $TESTTMP/templates-local-amend
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	29	$ cd $TESTTMP/templates-local-amend
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	30	$ mkcommit ROOT
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	31	$ mkcommit A0
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	32	$ echo 42 >> A0
2589 8412b0b7b512 obsfate: build more advanced markers for tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2555 diff changeset	33	$ HGUSER=test1 hg amend -m "A1" --config devel.default-date="1234567890 0"
8412b0b7b512 obsfate: build more advanced markers for tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2555 diff changeset	34	$ HGUSER=test2 hg amend -m "A2" --config devel.default-date="987654321 0"
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	35	$ hg log --hidden -G
2487 590da9c523ae template: add successors template Boris Feld <boris.feld@octobus.net> parents: 2486 diff changeset	36	@ changeset: 4:d004c8f274b9
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	37	\| tag: tip
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	38	\| parent: 0:ea207398892e
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	39	\| user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	40	\| date: Thu Jan 01 00:00:00 1970 +0000
2487 590da9c523ae template: add successors template Boris Feld <boris.feld@octobus.net> parents: 2486 diff changeset	41	\| summary: A2
590da9c523ae template: add successors template Boris Feld <boris.feld@octobus.net> parents: 2486 diff changeset	42	\|
590da9c523ae template: add successors template Boris Feld <boris.feld@octobus.net> parents: 2486 diff changeset	43	\| x changeset: 3:a468dc9b3633
590da9c523ae template: add successors template Boris Feld <boris.feld@octobus.net> parents: 2486 diff changeset	44	\|/ parent: 0:ea207398892e
590da9c523ae template: add successors template Boris Feld <boris.feld@octobus.net> parents: 2486 diff changeset	45	\| user: test
590da9c523ae template: add successors template Boris Feld <boris.feld@octobus.net> parents: 2486 diff changeset	46	\| date: Thu Jan 01 00:00:00 1970 +0000
590da9c523ae template: add successors template Boris Feld <boris.feld@octobus.net> parents: 2486 diff changeset	47	\| summary: A1
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	48	\|
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	49	\| x changeset: 2:f137d23bb3e1
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	50	\| \| user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	51	\| \| date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	52	\| \| summary: temporary amend commit for 471f378eab4c
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	53	\| \|
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	54	\| x changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	55	\|/ user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	56	\| date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	57	\| summary: A0
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	58	\|
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	59	o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	60	user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	61	date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	62	summary: ROOT
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	63
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	64	Check templates
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	65	---------------
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	66	$ hg up 'desc(A0)' --hidden
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	67	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	68	working directory parent is obsolete! (471f378eab4c)
2487 590da9c523ae template: add successors template Boris Feld <boris.feld@octobus.net> parents: 2486 diff changeset	69	(use 'hg evolve' to update to its successor: d004c8f274b9)
590da9c523ae template: add successors template Boris Feld <boris.feld@octobus.net> parents: 2486 diff changeset	70
590da9c523ae template: add successors template Boris Feld <boris.feld@octobus.net> parents: 2486 diff changeset	71	Precursors template should show current revision as it is the working copy
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	72	$ hg olog tip
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	73	o d004c8f274b9 (4) A2
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	74	\|
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	75	x a468dc9b3633 (3) A1
2798 2280461343e5 test-compat: merge mercurial-4.2 with the new stable branch content Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2710 diff changeset	76	\| rewritten(description) by test2 (*) as d004c8f274b9 (glob)
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	77	\|
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	78	@ 471f378eab4c (1) A0
2798 2280461343e5 test-compat: merge mercurial-4.2 with the new stable branch content Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2710 diff changeset	79	rewritten(description, content) by test1 (*) as a468dc9b3633 (glob)
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	80
2487 590da9c523ae template: add successors template Boris Feld <boris.feld@octobus.net> parents: 2486 diff changeset	81	$ hg tlog
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	82	o d004c8f274b9
0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	83	\| Precursors: 471f378eab4c
2500 2092007af205 template: update precursors template output Boris Feld <boris.feld@octobus.net> parents: 2499 diff changeset	84	\| semi-colon: 471f378eab4c
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	85	\| @ 471f378eab4c
2496 5ed8af9c4a21 template: skip "Precursors" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2495 diff changeset	86	\|/ Successors: [d004c8f274b9]
2502 d5db7464676d template: update successors template output Boris Feld <boris.feld@octobus.net> parents: 2500 diff changeset	87	\| semi-colon: [d004c8f274b9]
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	88	o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	89
2487 590da9c523ae template: add successors template Boris Feld <boris.feld@octobus.net> parents: 2486 diff changeset	90	$ hg up 'desc(A1)' --hidden
590da9c523ae template: add successors template Boris Feld <boris.feld@octobus.net> parents: 2486 diff changeset	91	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
590da9c523ae template: add successors template Boris Feld <boris.feld@octobus.net> parents: 2486 diff changeset	92	working directory parent is obsolete! (a468dc9b3633)
590da9c523ae template: add successors template Boris Feld <boris.feld@octobus.net> parents: 2486 diff changeset	93	(use 'hg evolve' to update to its successor: d004c8f274b9)
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	94
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	95	Precursors template should show current revision as it is the working copy
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	96	$ hg tlog
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	97	o d004c8f274b9
0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	98	\| Precursors: a468dc9b3633
2500 2092007af205 template: update precursors template output Boris Feld <boris.feld@octobus.net> parents: 2499 diff changeset	99	\| semi-colon: a468dc9b3633
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	100	\| @ a468dc9b3633
2496 5ed8af9c4a21 template: skip "Precursors" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2495 diff changeset	101	\|/ Successors: [d004c8f274b9]
2502 d5db7464676d template: update successors template output Boris Feld <boris.feld@octobus.net> parents: 2500 diff changeset	102	\| semi-colon: [d004c8f274b9]
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	103	o ea207398892e
2499 8abc7066e384 template: skip "fate" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2498 diff changeset	104
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	105	Precursors template should show the precursor as we force its display with
2487 590da9c523ae template: add successors template Boris Feld <boris.feld@octobus.net> parents: 2486 diff changeset	106	--hidden
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	107	$ hg tlog --hidden
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	108	o d004c8f274b9
0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	109	\| Precursors: a468dc9b3633
2500 2092007af205 template: update precursors template output Boris Feld <boris.feld@octobus.net> parents: 2499 diff changeset	110	\| semi-colon: a468dc9b3633
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	111	\| @ a468dc9b3633
0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	112	\|/ Precursors: 471f378eab4c
2500 2092007af205 template: update precursors template output Boris Feld <boris.feld@octobus.net> parents: 2499 diff changeset	113	\| semi-colon: 471f378eab4c
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	114	\| Successors: [d004c8f274b9]
2502 d5db7464676d template: update successors template output Boris Feld <boris.feld@octobus.net> parents: 2500 diff changeset	115	\| semi-colon: [d004c8f274b9]
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	116	\| x f137d23bb3e1
2591 1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2590 diff changeset	117	\| \|
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	118	\| x 471f378eab4c
2496 5ed8af9c4a21 template: skip "Precursors" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2495 diff changeset	119	\|/ Successors: [a468dc9b3633]
2502 d5db7464676d template: update successors template output Boris Feld <boris.feld@octobus.net> parents: 2500 diff changeset	120	\| semi-colon: [a468dc9b3633]
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	121	o ea207398892e
2499 8abc7066e384 template: skip "fate" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2498 diff changeset	122
2614 9a1c92132519 test-compat: fix previous merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2595 diff changeset	123
2487 590da9c523ae template: add successors template Boris Feld <boris.feld@octobus.net> parents: 2486 diff changeset	124	$ hg up 'desc(A2)'
590da9c523ae template: add successors template Boris Feld <boris.feld@octobus.net> parents: 2486 diff changeset	125	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
590da9c523ae template: add successors template Boris Feld <boris.feld@octobus.net> parents: 2486 diff changeset	126	$ hg tlog
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	127	@ d004c8f274b9
2499 8abc7066e384 template: skip "fate" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2498 diff changeset	128	\|
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	129	o ea207398892e
2499 8abc7066e384 template: skip "fate" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2498 diff changeset	130
2487 590da9c523ae template: add successors template Boris Feld <boris.feld@octobus.net> parents: 2486 diff changeset	131	$ hg tlog --hidden
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	132	@ d004c8f274b9
0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	133	\| Precursors: a468dc9b3633
2500 2092007af205 template: update precursors template output Boris Feld <boris.feld@octobus.net> parents: 2499 diff changeset	134	\| semi-colon: a468dc9b3633
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	135	\| x a468dc9b3633
0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	136	\|/ Precursors: 471f378eab4c
2500 2092007af205 template: update precursors template output Boris Feld <boris.feld@octobus.net> parents: 2499 diff changeset	137	\| semi-colon: 471f378eab4c
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	138	\| Successors: [d004c8f274b9]
2502 d5db7464676d template: update successors template output Boris Feld <boris.feld@octobus.net> parents: 2500 diff changeset	139	\| semi-colon: [d004c8f274b9]
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	140	\| x f137d23bb3e1
2591 1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2590 diff changeset	141	\| \|
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	142	\| x 471f378eab4c
2496 5ed8af9c4a21 template: skip "Precursors" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2495 diff changeset	143	\|/ Successors: [a468dc9b3633]
2502 d5db7464676d template: update successors template output Boris Feld <boris.feld@octobus.net> parents: 2500 diff changeset	144	\| semi-colon: [a468dc9b3633]
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	145	o ea207398892e
2499 8abc7066e384 template: skip "fate" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2498 diff changeset	146
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	147
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	148	Test templates with splitted commit
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	149	===================================
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	150
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	151	$ hg init $TESTTMP/templates-local-split
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	152	$ cd $TESTTMP/templates-local-split
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	153	$ mkcommit ROOT
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	154	$ echo 42 >> a
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	155	$ echo 43 >> b
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	156	$ hg commit -A -m "A0"
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	157	adding a
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	158	adding b
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	159	$ hg log --hidden -G
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	160	@ changeset: 1:471597cad322
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	161	\| tag: tip
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	162	\| user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	163	\| date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	164	\| summary: A0
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	165	\|
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	166	o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	167	user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	168	date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	169	summary: ROOT
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	170
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	171	$ hg split -r 'desc(A0)' -d "0 0" << EOF
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	172	> y
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	173	> y
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	174	> n
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	175	> n
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	176	> y
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	177	> y
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	178	> EOF
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	179	0 files updated, 0 files merged, 2 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	180	adding a
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	181	adding b
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	182	diff --git a/a b/a
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	183	new file mode 100644
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	184	examine changes to 'a'? [Ynesfdaq?] y
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	185
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	186	@@ -0,0 +1,1 @@
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	187	+42
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	188	record change 1/2 to 'a'? [Ynesfdaq?] y
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	189
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	190	diff --git a/b b/b
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	191	new file mode 100644
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	192	examine changes to 'b'? [Ynesfdaq?] n
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	193
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	194	created new head
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	195	Done splitting? [yN] n
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	196	diff --git a/b b/b
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	197	new file mode 100644
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	198	examine changes to 'b'? [Ynesfdaq?] y
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	199
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	200	@@ -0,0 +1,1 @@
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	201	+43
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	202	record this change to 'b'? [Ynesfdaq?] y
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	203
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	204	no more change to split
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	205
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	206	$ hg log --hidden -G
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	207	@ changeset: 3:f257fde29c7a
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	208	\| tag: tip
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	209	\| user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	210	\| date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	211	\| summary: A0
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	212	\|
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	213	o changeset: 2:337fec4d2edc
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	214	\| parent: 0:ea207398892e
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	215	\| user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	216	\| date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	217	\| summary: A0
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	218	\|
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	219	\| x changeset: 1:471597cad322
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	220	\|/ user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	221	\| date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	222	\| summary: A0
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	223	\|
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	224	o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	225	user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	226	date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	227	summary: ROOT
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	228
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	229
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	230	Check templates
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	231	---------------
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	232
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	233	$ hg up 'obsolete()' --hidden
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	234	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	235	working directory parent is obsolete! (471597cad322)
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	236	(use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a)
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	237
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	238	Precursors template should show current revision as it is the working copy
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	239	$ hg tlog
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	240	o f257fde29c7a
0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	241	\| Precursors: 471597cad322
2500 2092007af205 template: update precursors template output Boris Feld <boris.feld@octobus.net> parents: 2499 diff changeset	242	\| semi-colon: 471597cad322
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	243	o 337fec4d2edc
0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	244	\| Precursors: 471597cad322
2500 2092007af205 template: update precursors template output Boris Feld <boris.feld@octobus.net> parents: 2499 diff changeset	245	\| semi-colon: 471597cad322
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	246	\| @ 471597cad322
2496 5ed8af9c4a21 template: skip "Precursors" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2495 diff changeset	247	\|/ Successors: [337fec4d2edc, f257fde29c7a]
2502 d5db7464676d template: update successors template output Boris Feld <boris.feld@octobus.net> parents: 2500 diff changeset	248	\| semi-colon: [337fec4d2edc, f257fde29c7a]
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	249	o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	250
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	251
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	252	$ hg up f257fde29c7a
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	253	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	254
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	255	Precursors template should not show a precursor as it's not displayed in the
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	256	log
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	257	$ hg tlog
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	258	@ f257fde29c7a
2499 8abc7066e384 template: skip "fate" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2498 diff changeset	259	\|
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	260	o 337fec4d2edc
2499 8abc7066e384 template: skip "fate" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2498 diff changeset	261	\|
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	262	o ea207398892e
2499 8abc7066e384 template: skip "fate" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2498 diff changeset	263
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	264	Precursors template should show the precursor as we force its display with
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	265	--hidden
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	266	$ hg tlog --hidden
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	267	@ f257fde29c7a
0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	268	\| Precursors: 471597cad322
2500 2092007af205 template: update precursors template output Boris Feld <boris.feld@octobus.net> parents: 2499 diff changeset	269	\| semi-colon: 471597cad322
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	270	o 337fec4d2edc
0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	271	\| Precursors: 471597cad322
2500 2092007af205 template: update precursors template output Boris Feld <boris.feld@octobus.net> parents: 2499 diff changeset	272	\| semi-colon: 471597cad322
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	273	\| x 471597cad322
2496 5ed8af9c4a21 template: skip "Precursors" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2495 diff changeset	274	\|/ Successors: [337fec4d2edc, f257fde29c7a]
2502 d5db7464676d template: update successors template output Boris Feld <boris.feld@octobus.net> parents: 2500 diff changeset	275	\| semi-colon: [337fec4d2edc, f257fde29c7a]
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	276	o ea207398892e
2499 8abc7066e384 template: skip "fate" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2498 diff changeset	277
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	278	Test templates with folded commit
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	279	==============================
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	280
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	281	Test setup
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	282	----------
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	283
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	284	$ hg init $TESTTMP/templates-local-fold
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	285	$ cd $TESTTMP/templates-local-fold
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	286	$ mkcommit ROOT
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	287	$ mkcommit A0
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	288	$ mkcommit B0
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	289	$ hg log --hidden -G
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	290	@ changeset: 2:0dec01379d3b
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	291	\| tag: tip
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	292	\| user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	293	\| date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	294	\| summary: B0
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	295	\|
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	296	o changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	297	\| user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	298	\| date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	299	\| summary: A0
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	300	\|
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	301	o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	302	user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	303	date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	304	summary: ROOT
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	305
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	306	$ hg fold --exact -r 'desc(A0) + desc(B0)' --date "0 0" -m "C0"
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	307	2 changesets folded
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	308	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	309	$ hg log --hidden -G
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	310	@ changeset: 3:eb5a0daa2192
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	311	\| tag: tip
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	312	\| parent: 0:ea207398892e
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	313	\| user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	314	\| date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	315	\| summary: C0
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	316	\|
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	317	\| x changeset: 2:0dec01379d3b
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	318	\| \| user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	319	\| \| date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	320	\| \| summary: B0
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	321	\| \|
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	322	\| x changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	323	\|/ user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	324	\| date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	325	\| summary: A0
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	326	\|
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	327	o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	328	user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	329	date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	330	summary: ROOT
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	331
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	332	Check templates
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	333	---------------
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	334
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	335	$ hg up 'desc(A0)' --hidden
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	336	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	337	working directory parent is obsolete! (471f378eab4c)
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	338	(use 'hg evolve' to update to its successor: eb5a0daa2192)
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	339
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	340	Precursors template should show current revision as it is the working copy
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	341	$ hg tlog
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	342	o eb5a0daa2192
0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	343	\| Precursors: 471f378eab4c
2500 2092007af205 template: update precursors template output Boris Feld <boris.feld@octobus.net> parents: 2499 diff changeset	344	\| semi-colon: 471f378eab4c
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	345	\| @ 471f378eab4c
2496 5ed8af9c4a21 template: skip "Precursors" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2495 diff changeset	346	\|/ Successors: [eb5a0daa2192]
2502 d5db7464676d template: update successors template output Boris Feld <boris.feld@octobus.net> parents: 2500 diff changeset	347	\| semi-colon: [eb5a0daa2192]
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	348	o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	349
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	350	$ hg up 'desc(B0)' --hidden
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	351	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	352	working directory parent is obsolete! (0dec01379d3b)
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	353	(use 'hg evolve' to update to its successor: eb5a0daa2192)
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	354
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	355	Precursors template should show both precursors as they should be both
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	356	displayed
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	357	$ hg tlog
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	358	o eb5a0daa2192
2500 2092007af205 template: update precursors template output Boris Feld <boris.feld@octobus.net> parents: 2499 diff changeset	359	\| Precursors: 0dec01379d3b 471f378eab4c
2092007af205 template: update precursors template output Boris Feld <boris.feld@octobus.net> parents: 2499 diff changeset	360	\| semi-colon: 0dec01379d3b; 471f378eab4c
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	361	\| @ 0dec01379d3b
0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	362	\| \| Successors: [eb5a0daa2192]
2502 d5db7464676d template: update successors template output Boris Feld <boris.feld@octobus.net> parents: 2500 diff changeset	363	\| \| semi-colon: [eb5a0daa2192]
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	364	\| x 471f378eab4c
2496 5ed8af9c4a21 template: skip "Precursors" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2495 diff changeset	365	\|/ Successors: [eb5a0daa2192]
2502 d5db7464676d template: update successors template output Boris Feld <boris.feld@octobus.net> parents: 2500 diff changeset	366	\| semi-colon: [eb5a0daa2192]
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	367	o ea207398892e
2499 8abc7066e384 template: skip "fate" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2498 diff changeset	368
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	369	$ hg up 'desc(C0)'
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	370	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	371
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	372	Precursors template should not show precursors as it's not displayed in the
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	373	log
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	374	$ hg tlog
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	375	@ eb5a0daa2192
2499 8abc7066e384 template: skip "fate" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2498 diff changeset	376	\|
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	377	o ea207398892e
2499 8abc7066e384 template: skip "fate" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2498 diff changeset	378
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	379	Precursors template should show both precursors as we force its display with
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	380	--hidden
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	381	$ hg tlog --hidden
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	382	@ eb5a0daa2192
2500 2092007af205 template: update precursors template output Boris Feld <boris.feld@octobus.net> parents: 2499 diff changeset	383	\| Precursors: 0dec01379d3b 471f378eab4c
2092007af205 template: update precursors template output Boris Feld <boris.feld@octobus.net> parents: 2499 diff changeset	384	\| semi-colon: 0dec01379d3b; 471f378eab4c
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	385	\| x 0dec01379d3b
0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	386	\| \| Successors: [eb5a0daa2192]
2502 d5db7464676d template: update successors template output Boris Feld <boris.feld@octobus.net> parents: 2500 diff changeset	387	\| \| semi-colon: [eb5a0daa2192]
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	388	\| x 471f378eab4c
2496 5ed8af9c4a21 template: skip "Precursors" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2495 diff changeset	389	\|/ Successors: [eb5a0daa2192]
2502 d5db7464676d template: update successors template output Boris Feld <boris.feld@octobus.net> parents: 2500 diff changeset	390	\| semi-colon: [eb5a0daa2192]
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	391	o ea207398892e
2499 8abc7066e384 template: skip "fate" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2498 diff changeset	392
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	393
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	394	Test templates with divergence
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	395	==============================
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	396
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	397	Test setup
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	398	----------
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	399
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	400	$ hg init $TESTTMP/templates-local-divergence
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	401	$ cd $TESTTMP/templates-local-divergence
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	402	$ mkcommit ROOT
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	403	$ mkcommit A0
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	404	$ hg amend -m "A1"
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	405	$ hg log --hidden -G
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	406	@ changeset: 2:fdf9bde5129a
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	407	\| tag: tip
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	408	\| parent: 0:ea207398892e
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	409	\| user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	410	\| date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	411	\| summary: A1
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	412	\|
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	413	\| x changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	414	\|/ user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	415	\| date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	416	\| summary: A0
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	417	\|
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	418	o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	419	user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	420	date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	421	summary: ROOT
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	422
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	423	$ hg update --hidden 'desc(A0)'
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	424	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	425	working directory parent is obsolete! (471f378eab4c)
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	426	(use 'hg evolve' to update to its successor: fdf9bde5129a)
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	427	$ hg amend -m "A2"
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	428	2 new divergent changesets
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	429	$ hg log --hidden -G
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	430	@ changeset: 3:65b757b745b9
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	431	\| tag: tip
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	432	\| parent: 0:ea207398892e
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	433	\| user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	434	\| date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	435	\| trouble: divergent
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	436	\| summary: A2
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	437	\|
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	438	\| o changeset: 2:fdf9bde5129a
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	439	\|/ parent: 0:ea207398892e
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	440	\| user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	441	\| date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	442	\| trouble: divergent
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	443	\| summary: A1
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	444	\|
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	445	\| x changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	446	\|/ user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	447	\| date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	448	\| summary: A0
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	449	\|
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	450	o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	451	user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	452	date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	453	summary: ROOT
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	454
2487 590da9c523ae template: add successors template Boris Feld <boris.feld@octobus.net> parents: 2486 diff changeset	455	$ hg amend -m 'A3'
590da9c523ae template: add successors template Boris Feld <boris.feld@octobus.net> parents: 2486 diff changeset	456
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	457	Check templates
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	458	---------------
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	459
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	460	$ hg up 'desc(A0)' --hidden
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	461	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	462	working directory parent is obsolete! (471f378eab4c)
2546 abe6dfbdc744 evolve: fix typo: -list -> --list Kyle Lippincott <spectral@google.com> parents: 2502 diff changeset	463	(471f378eab4c has diverged, use 'hg evolve --list --divergent' to resolve the issue)
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	464
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	465	Precursors template should show current revision as it is the working copy
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	466	$ hg tlog
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	467	o 019fadeab383
0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	468	\| Precursors: 471f378eab4c
2500 2092007af205 template: update precursors template output Boris Feld <boris.feld@octobus.net> parents: 2499 diff changeset	469	\| semi-colon: 471f378eab4c
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	470	\| o fdf9bde5129a
0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	471	\|/ Precursors: 471f378eab4c
2500 2092007af205 template: update precursors template output Boris Feld <boris.feld@octobus.net> parents: 2499 diff changeset	472	\| semi-colon: 471f378eab4c
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	473	\| @ 471f378eab4c
2496 5ed8af9c4a21 template: skip "Precursors" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2495 diff changeset	474	\|/ Successors: [fdf9bde5129a], [019fadeab383]
2502 d5db7464676d template: update successors template output Boris Feld <boris.feld@octobus.net> parents: 2500 diff changeset	475	\| semi-colon: [fdf9bde5129a]; [019fadeab383]
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	476	o ea207398892e
2499 8abc7066e384 template: skip "fate" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2498 diff changeset	477
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	478	$ hg up 'desc(A1)'
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	479	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	480	Precursors template should not show precursors as it's not displayed in the
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	481	log
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	482	$ hg tlog
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	483	o 019fadeab383
2499 8abc7066e384 template: skip "fate" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2498 diff changeset	484	\|
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	485	\| @ fdf9bde5129a
2499 8abc7066e384 template: skip "fate" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2498 diff changeset	486	\|/
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	487	o ea207398892e
2499 8abc7066e384 template: skip "fate" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2498 diff changeset	488
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	489
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	490	Precursors template should a precursor as we force its display with --hidden
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	491	$ hg tlog --hidden
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	492	o 019fadeab383
0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	493	\| Precursors: 65b757b745b9
2500 2092007af205 template: update precursors template output Boris Feld <boris.feld@octobus.net> parents: 2499 diff changeset	494	\| semi-colon: 65b757b745b9
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	495	\| x 65b757b745b9
0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	496	\|/ Precursors: 471f378eab4c
2500 2092007af205 template: update precursors template output Boris Feld <boris.feld@octobus.net> parents: 2499 diff changeset	497	\| semi-colon: 471f378eab4c
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	498	\| Successors: [019fadeab383]
2502 d5db7464676d template: update successors template output Boris Feld <boris.feld@octobus.net> parents: 2500 diff changeset	499	\| semi-colon: [019fadeab383]
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	500	\| @ fdf9bde5129a
0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	501	\|/ Precursors: 471f378eab4c
2500 2092007af205 template: update precursors template output Boris Feld <boris.feld@octobus.net> parents: 2499 diff changeset	502	\| semi-colon: 471f378eab4c
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	503	\| x 471f378eab4c
2496 5ed8af9c4a21 template: skip "Precursors" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2495 diff changeset	504	\|/ Successors: [fdf9bde5129a], [65b757b745b9]
2502 d5db7464676d template: update successors template output Boris Feld <boris.feld@octobus.net> parents: 2500 diff changeset	505	\| semi-colon: [fdf9bde5129a]; [65b757b745b9]
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	506	o ea207398892e
2499 8abc7066e384 template: skip "fate" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2498 diff changeset	507
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	508
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	509	Test templates with amended + folded commit
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	510	===========================================
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	511
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	512	Test setup
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	513	----------
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	514
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	515	$ hg init $TESTTMP/templates-local-amend-fold
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	516	$ cd $TESTTMP/templates-local-amend-fold
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	517	$ mkcommit ROOT
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	518	$ mkcommit A0
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	519	$ mkcommit B0
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	520	$ hg amend -m "B1"
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	521	$ hg log --hidden -G
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	522	@ changeset: 3:b7ea6d14e664
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	523	\| tag: tip
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	524	\| parent: 1:471f378eab4c
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	525	\| user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	526	\| date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	527	\| summary: B1
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	528	\|
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	529	\| x changeset: 2:0dec01379d3b
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	530	\|/ user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	531	\| date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	532	\| summary: B0
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	533	\|
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	534	o changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	535	\| user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	536	\| date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	537	\| summary: A0
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	538	\|
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	539	o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	540	user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	541	date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	542	summary: ROOT
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	543
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	544	$ hg fold --exact -r 'desc(A0) + desc(B1)' --date "0 0" -m "C0"
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	545	2 changesets folded
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	546	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	547	$ hg log --hidden -G
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	548	@ changeset: 4:eb5a0daa2192
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	549	\| tag: tip
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	550	\| parent: 0:ea207398892e
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	551	\| user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	552	\| date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	553	\| summary: C0
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	554	\|
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	555	\| x changeset: 3:b7ea6d14e664
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	556	\| \| parent: 1:471f378eab4c
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	557	\| \| user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	558	\| \| date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	559	\| \| summary: B1
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	560	\| \|
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	561	\| \| x changeset: 2:0dec01379d3b
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	562	\| \|/ user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	563	\| \| date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	564	\| \| summary: B0
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	565	\| \|
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	566	\| x changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	567	\|/ user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	568	\| date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	569	\| summary: A0
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	570	\|
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	571	o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	572	user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	573	date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	574	summary: ROOT
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	575
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	576	Check templates
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	577	---------------
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	578
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	579	$ hg up 'desc(A0)' --hidden
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	580	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	581	working directory parent is obsolete! (471f378eab4c)
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	582	(use 'hg evolve' to update to its successor: eb5a0daa2192)
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	583	$ hg tlog
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	584	o eb5a0daa2192
0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	585	\| Precursors: 471f378eab4c
2500 2092007af205 template: update precursors template output Boris Feld <boris.feld@octobus.net> parents: 2499 diff changeset	586	\| semi-colon: 471f378eab4c
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	587	\| @ 471f378eab4c
2496 5ed8af9c4a21 template: skip "Precursors" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2495 diff changeset	588	\|/ Successors: [eb5a0daa2192]
2502 d5db7464676d template: update successors template output Boris Feld <boris.feld@octobus.net> parents: 2500 diff changeset	589	\| semi-colon: [eb5a0daa2192]
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	590	o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	591
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	592	$ hg up 'desc(B0)' --hidden
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	593	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	594	working directory parent is obsolete! (0dec01379d3b)
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	595	(use 'hg evolve' to update to its successor: eb5a0daa2192)
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	596	$ hg tlog
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	597	o eb5a0daa2192
2500 2092007af205 template: update precursors template output Boris Feld <boris.feld@octobus.net> parents: 2499 diff changeset	598	\| Precursors: 0dec01379d3b 471f378eab4c
2092007af205 template: update precursors template output Boris Feld <boris.feld@octobus.net> parents: 2499 diff changeset	599	\| semi-colon: 0dec01379d3b; 471f378eab4c
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	600	\| @ 0dec01379d3b
0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	601	\| \| Successors: [eb5a0daa2192]
2502 d5db7464676d template: update successors template output Boris Feld <boris.feld@octobus.net> parents: 2500 diff changeset	602	\| \| semi-colon: [eb5a0daa2192]
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	603	\| x 471f378eab4c
2496 5ed8af9c4a21 template: skip "Precursors" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2495 diff changeset	604	\|/ Successors: [eb5a0daa2192]
2502 d5db7464676d template: update successors template output Boris Feld <boris.feld@octobus.net> parents: 2500 diff changeset	605	\| semi-colon: [eb5a0daa2192]
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	606	o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	607
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	608
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	609	$ hg up 'desc(B1)' --hidden
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	610	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	611	working directory parent is obsolete! (b7ea6d14e664)
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	612	(use 'hg evolve' to update to its successor: eb5a0daa2192)
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	613	$ hg tlog
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	614	o eb5a0daa2192
2500 2092007af205 template: update precursors template output Boris Feld <boris.feld@octobus.net> parents: 2499 diff changeset	615	\| Precursors: 471f378eab4c b7ea6d14e664
2092007af205 template: update precursors template output Boris Feld <boris.feld@octobus.net> parents: 2499 diff changeset	616	\| semi-colon: 471f378eab4c; b7ea6d14e664
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	617	\| @ b7ea6d14e664
0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	618	\| \| Successors: [eb5a0daa2192]
2502 d5db7464676d template: update successors template output Boris Feld <boris.feld@octobus.net> parents: 2500 diff changeset	619	\| \| semi-colon: [eb5a0daa2192]
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	620	\| x 471f378eab4c
2496 5ed8af9c4a21 template: skip "Precursors" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2495 diff changeset	621	\|/ Successors: [eb5a0daa2192]
2502 d5db7464676d template: update successors template output Boris Feld <boris.feld@octobus.net> parents: 2500 diff changeset	622	\| semi-colon: [eb5a0daa2192]
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	623	o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	624
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	625
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	626	$ hg up 'desc(C0)'
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	627	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	628	$ hg tlog
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	629	@ eb5a0daa2192
2499 8abc7066e384 template: skip "fate" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2498 diff changeset	630	\|
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	631	o ea207398892e
2499 8abc7066e384 template: skip "fate" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2498 diff changeset	632
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	633	$ hg tlog --hidden
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	634	@ eb5a0daa2192
2500 2092007af205 template: update precursors template output Boris Feld <boris.feld@octobus.net> parents: 2499 diff changeset	635	\| Precursors: 471f378eab4c b7ea6d14e664
2092007af205 template: update precursors template output Boris Feld <boris.feld@octobus.net> parents: 2499 diff changeset	636	\| semi-colon: 471f378eab4c; b7ea6d14e664
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	637	\| x b7ea6d14e664
0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	638	\| \| Precursors: 0dec01379d3b
2500 2092007af205 template: update precursors template output Boris Feld <boris.feld@octobus.net> parents: 2499 diff changeset	639	\| \| semi-colon: 0dec01379d3b
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	640	\| \| Successors: [eb5a0daa2192]
2502 d5db7464676d template: update successors template output Boris Feld <boris.feld@octobus.net> parents: 2500 diff changeset	641	\| \| semi-colon: [eb5a0daa2192]
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	642	\| \| x 0dec01379d3b
2496 5ed8af9c4a21 template: skip "Precursors" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2495 diff changeset	643	\| \|/ Successors: [b7ea6d14e664]
2502 d5db7464676d template: update successors template output Boris Feld <boris.feld@octobus.net> parents: 2500 diff changeset	644	\| \| semi-colon: [b7ea6d14e664]
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	645	\| x 471f378eab4c
2496 5ed8af9c4a21 template: skip "Precursors" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2495 diff changeset	646	\|/ Successors: [eb5a0daa2192]
2502 d5db7464676d template: update successors template output Boris Feld <boris.feld@octobus.net> parents: 2500 diff changeset	647	\| semi-colon: [eb5a0daa2192]
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	648	o ea207398892e
2499 8abc7066e384 template: skip "fate" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2498 diff changeset	649
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	650	Test template with pushed and pulled obs markers
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	651	==============================================
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	652
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	653	Test setup
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	654	----------
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	655
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	656	$ hg init $TESTTMP/templates-local-remote-markers-1
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	657	$ cd $TESTTMP/templates-local-remote-markers-1
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	658	$ mkcommit ROOT
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	659	$ mkcommit A0
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	660	$ hg clone $TESTTMP/templates-local-remote-markers-1 $TESTTMP/templates-local-remote-markers-2
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	661	updating to branch default
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	662	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	663	$ cd $TESTTMP/templates-local-remote-markers-2
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	664	$ hg log --hidden -G
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	665	@ changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	666	\| tag: tip
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	667	\| user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	668	\| date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	669	\| summary: A0
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	670	\|
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	671	o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	672	user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	673	date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	674	summary: ROOT
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	675
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	676	$ cd $TESTTMP/templates-local-remote-markers-1
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	677	$ hg amend -m "A1"
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	678	$ hg amend -m "A2"
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	679	$ hg log --hidden -G
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	680	@ changeset: 3:7a230b46bf61
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	681	\| tag: tip
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	682	\| parent: 0:ea207398892e
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	683	\| user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	684	\| date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	685	\| summary: A2
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	686	\|
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	687	\| x changeset: 2:fdf9bde5129a
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	688	\|/ parent: 0:ea207398892e
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	689	\| user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	690	\| date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	691	\| summary: A1
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	692	\|
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	693	\| x changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	694	\|/ user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	695	\| date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	696	\| summary: A0
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	697	\|
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	698	o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	699	user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	700	date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	701	summary: ROOT
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	702
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	703	$ cd $TESTTMP/templates-local-remote-markers-2
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	704	$ hg pull
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	705	pulling from $TESTTMP/templates-local-remote-markers-1
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	706	searching for changes
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	707	adding changesets
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	708	adding manifests
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	709	adding file changes
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	710	added 1 changesets with 0 changes to 1 files (+1 heads)
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	711	2 new obsolescence markers
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	712	(run 'hg heads' to see heads, 'hg merge' to merge)
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	713	working directory parent is obsolete! (471f378eab4c)
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	714	(use 'hg evolve' to update to its successor: 7a230b46bf61)
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	715	$ hg log --hidden -G
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	716	o changeset: 2:7a230b46bf61
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	717	\| tag: tip
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	718	\| parent: 0:ea207398892e
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	719	\| user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	720	\| date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	721	\| summary: A2
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	722	\|
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	723	\| @ changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	724	\|/ user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	725	\| date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	726	\| summary: A0
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	727	\|
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	728	o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	729	user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	730	date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	731	summary: ROOT
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	732
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	733	Check templates
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	734	---------------
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	735
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	736	$ hg tlog
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	737	o 7a230b46bf61
0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	738	\| Precursors: 471f378eab4c
2500 2092007af205 template: update precursors template output Boris Feld <boris.feld@octobus.net> parents: 2499 diff changeset	739	\| semi-colon: 471f378eab4c
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	740	\| @ 471f378eab4c
2496 5ed8af9c4a21 template: skip "Precursors" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2495 diff changeset	741	\|/ Successors: [7a230b46bf61]
2502 d5db7464676d template: update successors template output Boris Feld <boris.feld@octobus.net> parents: 2500 diff changeset	742	\| semi-colon: [7a230b46bf61]
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	743	o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	744
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	745	Test templates with pruned commits
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	746	==================================
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	747
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	748	Test setup
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	749	----------
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	750
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	751	$ hg init $TESTTMP/templates-local-prune
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	752	$ cd $TESTTMP/templates-local-prune
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	753	$ mkcommit ROOT
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	754	$ mkcommit A0
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	755	$ hg prune .
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	756	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	757	working directory now at ea207398892e
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	758	1 changesets pruned
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	759
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	760	Check output
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	761	------------
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	762
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	763	$ hg up "desc(A0)" --hidden
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	764	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	765	working directory parent is obsolete! (471f378eab4c)
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	766	(use 'hg evolve' to update to its parent successor)
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	767	$ hg tlog
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	768	@ 471f378eab4c
2591 1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2590 diff changeset	769	\|
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	770	o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	771

author	Pierre-Yves David <pierre-yves.david@octobus.net>
	Tue, 25 Jul 2017 03:59:22 +0200
branch	mercurial-4.1
changeset 2799	1627153804dc
parent 2700	52d5c5ce27e4
parent 2798	2280461343e5
child 2800	13c4d518327a
child 3002	00e4d31b8cdb
permissions	-rw-r--r--