evolve: tests/test-evolve-obshistory-content-divergent.t annotate

annotate tests/test-evolve-obshistory-content-divergent.t @ 5171:7f7f40cc6c9b

obslog: make date template property into dates

author	Anton Shestakov <av6@dwimlabs.net>
date	Tue, 18 Feb 2020 18:16:11 +0800
parents	897b371cd0c5
children	258c0a99c5b0

rev	line source
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	1 This test file test the various messages when accessing obsolete
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	2 revisions.
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	3
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	4 Global setup
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	5 ============
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	6
3885 3df8b6ecce2a tests: extract obshistory setup in a separate file Boris Feld <boris.feld@octobus.net> parents: 3884 diff changeset	7 $ . $TESTDIR/testlib/obshistory_setup.sh
5079 1f92a6aa40d6 evolve: add pre-check logic for content-divergence in rewriteutil.precheck() Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4983 diff changeset	8 $ cat >> $HGRCPATH << EOF
1f92a6aa40d6 evolve: add pre-check logic for content-divergence in rewriteutil.precheck() Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4983 diff changeset	9 > [experimental]
1f92a6aa40d6 evolve: add pre-check logic for content-divergence in rewriteutil.precheck() Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4983 diff changeset	10 > evolution.allowdivergence = True
1f92a6aa40d6 evolve: add pre-check logic for content-divergence in rewriteutil.precheck() Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4983 diff changeset	11 > EOF
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	12
3891 11b775fddda8 tests: extract the content-divergence test case into a separate file Boris Feld <boris.feld@octobus.net> parents: 3890 diff changeset	13 Test output with content-divergence
11b775fddda8 tests: extract the content-divergence test case into a separate file Boris Feld <boris.feld@octobus.net> parents: 3890 diff changeset	14 ===================================
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	15
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	16 Test setup
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	17 ----------
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	18
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	19 $ hg init $TESTTMP/local-divergence
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	20 $ cd $TESTTMP/local-divergence
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	21 $ mkcommit ROOT
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	22 $ mkcommit A0
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	23 $ hg amend -m "A1"
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	24 $ hg log --hidden -G
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	25 @ changeset: 2:fdf9bde5129a
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	26 \| tag: tip
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	27 \| parent: 0:ea207398892e
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	28 \| user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	29 \| date: Thu Jan 01 00:00:00 1970 +0000
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	30 \| summary: A1
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	31 \|
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	32 \| x changeset: 1:471f378eab4c
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	33 \|/ user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	34 \| date: Thu Jan 01 00:00:00 1970 +0000
3115 663dbef40f97 obsfate: re-enables operation display in obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3083 diff changeset	35 \| obsolete: reworded using amend as 2:fdf9bde5129a
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	36 \| summary: A0
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	37 \|
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	38 o changeset: 0:ea207398892e
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	39 user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	40 date: Thu Jan 01 00:00:00 1970 +0000
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	41 summary: ROOT
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	42
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	43 $ hg update --hidden 'desc(A0)'
3747 1e103c7f7663 test: update to new outputs Boris Feld <boris.feld@octobus.net> parents: 3730 diff changeset	44 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1e103c7f7663 test: update to new outputs Boris Feld <boris.feld@octobus.net> parents: 3730 diff changeset	45 updated to hidden changeset 471f378eab4c
3432 f57be161f34b test: update with new 'update' hint about obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3417 diff changeset	46 (hidden revision '471f378eab4c' was rewritten as: fdf9bde5129a)
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	47 working directory parent is obsolete! (471f378eab4c)
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	48 (use 'hg evolve' to update to its successor: fdf9bde5129a)
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	49 $ hg amend -m "A2"
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	50 2 new content-divergent changesets
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	51 $ hg log --hidden -G
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	52 @ changeset: 3:65b757b745b9
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	53 \| tag: tip
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	54 \| parent: 0:ea207398892e
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	55 \| user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	56 \| date: Thu Jan 01 00:00:00 1970 +0000
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	57 \| instability: content-divergent
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	58 \| summary: A2
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	59 \|
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3411 diff changeset	60 \| * changeset: 2:fdf9bde5129a
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	61 \|/ parent: 0:ea207398892e
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	62 \| user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	63 \| date: Thu Jan 01 00:00:00 1970 +0000
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	64 \| instability: content-divergent
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	65 \| summary: A1
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	66 \|
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	67 \| x changeset: 1:471f378eab4c
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	68 \|/ user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	69 \| date: Thu Jan 01 00:00:00 1970 +0000
3115 663dbef40f97 obsfate: re-enables operation display in obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3083 diff changeset	70 \| obsolete: reworded using amend as 2:fdf9bde5129a
663dbef40f97 obsfate: re-enables operation display in obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3083 diff changeset	71 \| obsolete: reworded using amend as 3:65b757b745b9
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	72 \| summary: A0
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	73 \|
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	74 o changeset: 0:ea207398892e
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	75 user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	76 date: Thu Jan 01 00:00:00 1970 +0000
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	77 summary: ROOT
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	78
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	79 Actual test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	80 -----------
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	81
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	82 Check that debugobshistory on the divergent revision show both destinations
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	83 $ hg obslog --hidden 471f378eab4c --patch
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	84 x 471f378eab4c (1) A0
5123 900668a93629 obslog: use _successorsetverb() in regular obslog too Anton Shestakov <av6@dwimlabs.net> parents: 5079 diff changeset	85 reworded(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
3400 6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	86 diff -r 471f378eab4c -r 65b757b745b9 changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	87 --- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	88 +++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	89 @@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	90 -A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	91 +A2
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	92
5123 900668a93629 obslog: use _successorsetverb() in regular obslog too Anton Shestakov <av6@dwimlabs.net> parents: 5079 diff changeset	93 reworded(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
3400 6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	94 diff -r 471f378eab4c -r fdf9bde5129a changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	95 --- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	96 +++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	97 @@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	98 -A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	99 +A1
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	100
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	101
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	102
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	103 Check that with all option, every changeset is shown
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	104 $ hg obslog --hidden --all 471f378eab4c --patch
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	105 @ 65b757b745b9 (3) A2
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	106 \|
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3411 diff changeset	107 \| * fdf9bde5129a (2) A1
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	108 \|/
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	109 x 471f378eab4c (1) A0
5123 900668a93629 obslog: use _successorsetverb() in regular obslog too Anton Shestakov <av6@dwimlabs.net> parents: 5079 diff changeset	110 reworded(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
3400 6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	111 diff -r 471f378eab4c -r 65b757b745b9 changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	112 --- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	113 +++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	114 @@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	115 -A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	116 +A2
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	117
5123 900668a93629 obslog: use _successorsetverb() in regular obslog too Anton Shestakov <av6@dwimlabs.net> parents: 5079 diff changeset	118 reworded(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
3400 6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	119 diff -r 471f378eab4c -r fdf9bde5129a changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	120 --- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	121 +++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	122 @@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	123 -A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	124 +A1
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	125
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	126
2477 d7f7e8f3b51c test: rename all olog references Boris Feld <boris.feld@octobus.net> parents: 2476 diff changeset	127 $ hg obslog --hidden 471f378eab4c --no-graph -Tjson \| python -m json.tool
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	128 [
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	129 {
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	130 "markers": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	131 {
5171 7f7f40cc6c9b obslog: make date template property into dates Anton Shestakov <av6@dwimlabs.net> parents: 5169 diff changeset	132 "dates": [
7f7f40cc6c9b obslog: make date template property into dates Anton Shestakov <av6@dwimlabs.net> parents: 5169 diff changeset	133 [
7f7f40cc6c9b obslog: make date template property into dates Anton Shestakov <av6@dwimlabs.net> parents: 5169 diff changeset	134 *, (glob)
7f7f40cc6c9b obslog: make date template property into dates Anton Shestakov <av6@dwimlabs.net> parents: 5169 diff changeset	135 0
7f7f40cc6c9b obslog: make date template property into dates Anton Shestakov <av6@dwimlabs.net> parents: 5169 diff changeset	136 ]
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	137 ],
4939 7aba58dc4b73 obslog: use plural name "effects" for list of all effects Martin von Zweigbergk <martinvonz@google.com> parents: 4918 diff changeset	138 "effects": [
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	139 "description"
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	140 ],
5169 897b371cd0c5 obslog: make operation template property into operations Anton Shestakov <av6@dwimlabs.net> parents: 5168 diff changeset	141 "operations": [
897b371cd0c5 obslog: make operation template property into operations Anton Shestakov <av6@dwimlabs.net> parents: 5168 diff changeset	142 "amend"
897b371cd0c5 obslog: make operation template property into operations Anton Shestakov <av6@dwimlabs.net> parents: 5168 diff changeset	143 ],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	144 "succnodes": [
4951 7bfd3fed5d1f obslog: make {succnodes} be full hex nodes Martin von Zweigbergk <martinvonz@google.com> parents: 4939 diff changeset	145 "65b757b745b935093c87a2bccd877521cccffcbd"
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	146 ],
5168 c7ca43bba6c5 obslog: make user template property into users Anton Shestakov <av6@dwimlabs.net> parents: 5125 diff changeset	147 "users": [
c7ca43bba6c5 obslog: make user template property into users Anton Shestakov <av6@dwimlabs.net> parents: 5125 diff changeset	148 "test"
c7ca43bba6c5 obslog: make user template property into users Anton Shestakov <av6@dwimlabs.net> parents: 5125 diff changeset	149 ],
5123 900668a93629 obslog: use _successorsetverb() in regular obslog too Anton Shestakov <av6@dwimlabs.net> parents: 5079 diff changeset	150 "verb": "reworded"
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	151 },
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	152 {
5171 7f7f40cc6c9b obslog: make date template property into dates Anton Shestakov <av6@dwimlabs.net> parents: 5169 diff changeset	153 "dates": [
7f7f40cc6c9b obslog: make date template property into dates Anton Shestakov <av6@dwimlabs.net> parents: 5169 diff changeset	154 [
7f7f40cc6c9b obslog: make date template property into dates Anton Shestakov <av6@dwimlabs.net> parents: 5169 diff changeset	155 *, (glob)
7f7f40cc6c9b obslog: make date template property into dates Anton Shestakov <av6@dwimlabs.net> parents: 5169 diff changeset	156 0
7f7f40cc6c9b obslog: make date template property into dates Anton Shestakov <av6@dwimlabs.net> parents: 5169 diff changeset	157 ]
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	158 ],
4939 7aba58dc4b73 obslog: use plural name "effects" for list of all effects Martin von Zweigbergk <martinvonz@google.com> parents: 4918 diff changeset	159 "effects": [
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	160 "description"
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	161 ],
5169 897b371cd0c5 obslog: make operation template property into operations Anton Shestakov <av6@dwimlabs.net> parents: 5168 diff changeset	162 "operations": [
897b371cd0c5 obslog: make operation template property into operations Anton Shestakov <av6@dwimlabs.net> parents: 5168 diff changeset	163 "amend"
897b371cd0c5 obslog: make operation template property into operations Anton Shestakov <av6@dwimlabs.net> parents: 5168 diff changeset	164 ],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	165 "succnodes": [
4951 7bfd3fed5d1f obslog: make {succnodes} be full hex nodes Martin von Zweigbergk <martinvonz@google.com> parents: 4939 diff changeset	166 "fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	167 ],
5168 c7ca43bba6c5 obslog: make user template property into users Anton Shestakov <av6@dwimlabs.net> parents: 5125 diff changeset	168 "users": [
c7ca43bba6c5 obslog: make user template property into users Anton Shestakov <av6@dwimlabs.net> parents: 5125 diff changeset	169 "test"
c7ca43bba6c5 obslog: make user template property into users Anton Shestakov <av6@dwimlabs.net> parents: 5125 diff changeset	170 ],
5123 900668a93629 obslog: use _successorsetverb() in regular obslog too Anton Shestakov <av6@dwimlabs.net> parents: 5079 diff changeset	171 "verb": "reworded"
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	172 }
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	173 ],
4983 6d40e0166522 obslog: make {node} the full node and leave shortening to template Martin von Zweigbergk <martinvonz@google.com> parents: 4951 diff changeset	174 "node": "471f378eab4c5e25f6c77f785b27c936efb22874",
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	175 "shortdescription": "A0"
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	176 }
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	177 ]
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	178 Check that debugobshistory on the first diverged revision show the revision
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	179 and the diverent one
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	180 $ hg obslog fdf9bde5129a --patch
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3411 diff changeset	181 * fdf9bde5129a (2) A1
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	182 \|
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	183 x 471f378eab4c (1) A0
5123 900668a93629 obslog: use _successorsetverb() in regular obslog too Anton Shestakov <av6@dwimlabs.net> parents: 5079 diff changeset	184 reworded(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
3400 6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	185 diff -r 471f378eab4c -r 65b757b745b9 changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	186 --- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	187 +++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	188 @@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	189 -A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	190 +A2
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	191
5123 900668a93629 obslog: use _successorsetverb() in regular obslog too Anton Shestakov <av6@dwimlabs.net> parents: 5079 diff changeset	192 reworded(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
3400 6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	193 diff -r 471f378eab4c -r fdf9bde5129a changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	194 --- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	195 +++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	196 @@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	197 -A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	198 +A1
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	199
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	200
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	201
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	202 Check that all option show all of them
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	203 $ hg obslog fdf9bde5129a -a --patch
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	204 @ 65b757b745b9 (3) A2
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	205 \|
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3411 diff changeset	206 \| * fdf9bde5129a (2) A1
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	207 \|/
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	208 x 471f378eab4c (1) A0
5123 900668a93629 obslog: use _successorsetverb() in regular obslog too Anton Shestakov <av6@dwimlabs.net> parents: 5079 diff changeset	209 reworded(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
3400 6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	210 diff -r 471f378eab4c -r 65b757b745b9 changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	211 --- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	212 +++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	213 @@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	214 -A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	215 +A2
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	216
5123 900668a93629 obslog: use _successorsetverb() in regular obslog too Anton Shestakov <av6@dwimlabs.net> parents: 5079 diff changeset	217 reworded(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
3400 6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	218 diff -r 471f378eab4c -r fdf9bde5129a changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	219 --- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	220 +++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	221 @@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	222 -A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	223 +A1
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	224
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	225
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	226 Check that debugobshistory on the second diverged revision show the revision
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	227 and the diverent one
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	228 $ hg obslog 65b757b745b9 --patch
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	229 @ 65b757b745b9 (3) A2
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	230 \|
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	231 x 471f378eab4c (1) A0
5123 900668a93629 obslog: use _successorsetverb() in regular obslog too Anton Shestakov <av6@dwimlabs.net> parents: 5079 diff changeset	232 reworded(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
3400 6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	233 diff -r 471f378eab4c -r 65b757b745b9 changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	234 --- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	235 +++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	236 @@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	237 -A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	238 +A2
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	239
5123 900668a93629 obslog: use _successorsetverb() in regular obslog too Anton Shestakov <av6@dwimlabs.net> parents: 5079 diff changeset	240 reworded(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
3400 6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	241 diff -r 471f378eab4c -r fdf9bde5129a changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	242 --- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	243 +++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	244 @@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	245 -A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	246 +A1
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	247
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	248
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	249 Check that all option show all of them
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	250 $ hg obslog 65b757b745b9 -a --patch
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	251 @ 65b757b745b9 (3) A2
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	252 \|
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3411 diff changeset	253 \| * fdf9bde5129a (2) A1
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	254 \|/
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	255 x 471f378eab4c (1) A0
5123 900668a93629 obslog: use _successorsetverb() in regular obslog too Anton Shestakov <av6@dwimlabs.net> parents: 5079 diff changeset	256 reworded(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
3400 6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	257 diff -r 471f378eab4c -r 65b757b745b9 changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	258 --- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	259 +++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	260 @@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	261 -A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	262 +A2
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	263
5123 900668a93629 obslog: use _successorsetverb() in regular obslog too Anton Shestakov <av6@dwimlabs.net> parents: 5079 diff changeset	264 reworded(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
3400 6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	265 diff -r 471f378eab4c -r fdf9bde5129a changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	266 --- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	267 +++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	268 @@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	269 -A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	270 +A1
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	271
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	272
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	273 Check that debugobshistory on the both diverged revision show a coherent
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	274 graph
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	275 $ hg obslog '65b757b745b9+fdf9bde5129a' --patch
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	276 @ 65b757b745b9 (3) A2
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	277 \|
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3411 diff changeset	278 \| * fdf9bde5129a (2) A1
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	279 \|/
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	280 x 471f378eab4c (1) A0
5123 900668a93629 obslog: use _successorsetverb() in regular obslog too Anton Shestakov <av6@dwimlabs.net> parents: 5079 diff changeset	281 reworded(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
3400 6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	282 diff -r 471f378eab4c -r 65b757b745b9 changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	283 --- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	284 +++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	285 @@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	286 -A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	287 +A2
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	288
5123 900668a93629 obslog: use _successorsetverb() in regular obslog too Anton Shestakov <av6@dwimlabs.net> parents: 5079 diff changeset	289 reworded(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
3400 6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	290 diff -r 471f378eab4c -r fdf9bde5129a changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	291 --- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	292 +++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	293 @@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	294 -A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	295 +A1
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	296
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	297
2477 d7f7e8f3b51c test: rename all olog references Boris Feld <boris.feld@octobus.net> parents: 2476 diff changeset	298 $ hg obslog '65b757b745b9+fdf9bde5129a' --no-graph -Tjson \| python -m json.tool
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	299 [
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	300 {
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	301 "markers": [],
4983 6d40e0166522 obslog: make {node} the full node and leave shortening to template Martin von Zweigbergk <martinvonz@google.com> parents: 4951 diff changeset	302 "node": "65b757b745b935093c87a2bccd877521cccffcbd",
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	303 "shortdescription": "A2"
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	304 },
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	305 {
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	306 "markers": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	307 {
5171 7f7f40cc6c9b obslog: make date template property into dates Anton Shestakov <av6@dwimlabs.net> parents: 5169 diff changeset	308 "dates": [
7f7f40cc6c9b obslog: make date template property into dates Anton Shestakov <av6@dwimlabs.net> parents: 5169 diff changeset	309 [
7f7f40cc6c9b obslog: make date template property into dates Anton Shestakov <av6@dwimlabs.net> parents: 5169 diff changeset	310 *, (glob)
7f7f40cc6c9b obslog: make date template property into dates Anton Shestakov <av6@dwimlabs.net> parents: 5169 diff changeset	311 0
7f7f40cc6c9b obslog: make date template property into dates Anton Shestakov <av6@dwimlabs.net> parents: 5169 diff changeset	312 ]
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	313 ],
4939 7aba58dc4b73 obslog: use plural name "effects" for list of all effects Martin von Zweigbergk <martinvonz@google.com> parents: 4918 diff changeset	314 "effects": [
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	315 "description"
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	316 ],
5169 897b371cd0c5 obslog: make operation template property into operations Anton Shestakov <av6@dwimlabs.net> parents: 5168 diff changeset	317 "operations": [
897b371cd0c5 obslog: make operation template property into operations Anton Shestakov <av6@dwimlabs.net> parents: 5168 diff changeset	318 "amend"
897b371cd0c5 obslog: make operation template property into operations Anton Shestakov <av6@dwimlabs.net> parents: 5168 diff changeset	319 ],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	320 "succnodes": [
4951 7bfd3fed5d1f obslog: make {succnodes} be full hex nodes Martin von Zweigbergk <martinvonz@google.com> parents: 4939 diff changeset	321 "65b757b745b935093c87a2bccd877521cccffcbd"
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	322 ],
5168 c7ca43bba6c5 obslog: make user template property into users Anton Shestakov <av6@dwimlabs.net> parents: 5125 diff changeset	323 "users": [
c7ca43bba6c5 obslog: make user template property into users Anton Shestakov <av6@dwimlabs.net> parents: 5125 diff changeset	324 "test"
c7ca43bba6c5 obslog: make user template property into users Anton Shestakov <av6@dwimlabs.net> parents: 5125 diff changeset	325 ],
5123 900668a93629 obslog: use _successorsetverb() in regular obslog too Anton Shestakov <av6@dwimlabs.net> parents: 5079 diff changeset	326 "verb": "reworded"
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	327 },
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	328 {
5171 7f7f40cc6c9b obslog: make date template property into dates Anton Shestakov <av6@dwimlabs.net> parents: 5169 diff changeset	329 "dates": [
7f7f40cc6c9b obslog: make date template property into dates Anton Shestakov <av6@dwimlabs.net> parents: 5169 diff changeset	330 [
7f7f40cc6c9b obslog: make date template property into dates Anton Shestakov <av6@dwimlabs.net> parents: 5169 diff changeset	331 *, (glob)
7f7f40cc6c9b obslog: make date template property into dates Anton Shestakov <av6@dwimlabs.net> parents: 5169 diff changeset	332 0
7f7f40cc6c9b obslog: make date template property into dates Anton Shestakov <av6@dwimlabs.net> parents: 5169 diff changeset	333 ]
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	334 ],
4939 7aba58dc4b73 obslog: use plural name "effects" for list of all effects Martin von Zweigbergk <martinvonz@google.com> parents: 4918 diff changeset	335 "effects": [
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	336 "description"
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	337 ],
5169 897b371cd0c5 obslog: make operation template property into operations Anton Shestakov <av6@dwimlabs.net> parents: 5168 diff changeset	338 "operations": [
897b371cd0c5 obslog: make operation template property into operations Anton Shestakov <av6@dwimlabs.net> parents: 5168 diff changeset	339 "amend"
897b371cd0c5 obslog: make operation template property into operations Anton Shestakov <av6@dwimlabs.net> parents: 5168 diff changeset	340 ],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	341 "succnodes": [
4951 7bfd3fed5d1f obslog: make {succnodes} be full hex nodes Martin von Zweigbergk <martinvonz@google.com> parents: 4939 diff changeset	342 "fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	343 ],
5168 c7ca43bba6c5 obslog: make user template property into users Anton Shestakov <av6@dwimlabs.net> parents: 5125 diff changeset	344 "users": [
c7ca43bba6c5 obslog: make user template property into users Anton Shestakov <av6@dwimlabs.net> parents: 5125 diff changeset	345 "test"
c7ca43bba6c5 obslog: make user template property into users Anton Shestakov <av6@dwimlabs.net> parents: 5125 diff changeset	346 ],
5123 900668a93629 obslog: use _successorsetverb() in regular obslog too Anton Shestakov <av6@dwimlabs.net> parents: 5079 diff changeset	347 "verb": "reworded"
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	348 }
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	349 ],
4983 6d40e0166522 obslog: make {node} the full node and leave shortening to template Martin von Zweigbergk <martinvonz@google.com> parents: 4951 diff changeset	350 "node": "471f378eab4c5e25f6c77f785b27c936efb22874",
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	351 "shortdescription": "A0"
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	352 },
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	353 {
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	354 "markers": [],
4983 6d40e0166522 obslog: make {node} the full node and leave shortening to template Martin von Zweigbergk <martinvonz@google.com> parents: 4951 diff changeset	355 "node": "fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e",
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	356 "shortdescription": "A1"
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	357 }
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	358 ]
2290 a36a8c6a09ac ui: change the hidden revision error message Boris Feld <boris.feld@octobus.net> parents: 2289 diff changeset	359 $ hg update 471f378eab4c
3663 54a469cd5b26 test: update output to match upstream Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3567 diff changeset	360 abort: hidden revision '471f378eab4c' has diverged!
54a469cd5b26 test: update output to match upstream Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3567 diff changeset	361 (use --hidden to access hidden revisions)
2290 a36a8c6a09ac ui: change the hidden revision error message Boris Feld <boris.feld@octobus.net> parents: 2289 diff changeset	362 [255]
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	363 $ hg update --hidden 'desc(A0)'
3747 1e103c7f7663 test: update to new outputs Boris Feld <boris.feld@octobus.net> parents: 3730 diff changeset	364 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1e103c7f7663 test: update to new outputs Boris Feld <boris.feld@octobus.net> parents: 3730 diff changeset	365 updated to hidden changeset 471f378eab4c
3432 f57be161f34b test: update with new 'update' hint about obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3417 diff changeset	366 (hidden revision '471f378eab4c' has diverged)
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	367 working directory parent is obsolete! (471f378eab4c)
3154 406992d0d611 evolve: rename --contentdivergent flag to --content-divergent Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3115 diff changeset	368 (471f378eab4c has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)

Mercurial > evolve

annotate tests/test-evolve-obshistory-content-divergent.t @ 5171:7f7f40cc6c9b