Mercurial > evolve
annotate tests/test-evolve-obshistory.t @ 3105:f5d472b7e800 mercurial-4.3
test-compat: revert output changes related to temporary amend commit
This backed out changeset 06844693bb21 and other related changes.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Fri, 20 Oct 2017 19:32:18 +0200 |
parents | ccfcacc5ee7c |
children | a867d59ea97a |
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 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
7 $ . $TESTDIR/testlib/common.sh |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
8 $ cat >> $HGRCPATH <<EOF |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
9 > [ui] |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
10 > interactive = true |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
11 > [phases] |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
12 > publish=False |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
13 > [extensions] |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
14 > evolve = |
2585
b5e3fe610beb
effectflag: activate effect flag on test-evolve-obshistory test file
Boris Feld <boris.feld@octobus.net>
parents:
2546
diff
changeset
|
15 > [experimental] |
b5e3fe610beb
effectflag: activate effect flag on test-evolve-obshistory test file
Boris Feld <boris.feld@octobus.net>
parents:
2546
diff
changeset
|
16 > evolution.effect-flags = yes |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
17 > EOF |
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 Test output on amended commit |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
20 ============================= |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
21 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
22 Test setup |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
23 ---------- |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
24 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
25 $ hg init $TESTTMP/local-amend |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
26 $ cd $TESTTMP/local-amend |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
27 $ mkcommit ROOT |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
28 $ mkcommit A0 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
29 $ echo 42 >> A0 |
2336
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
30 $ hg amend -m "A1 |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
31 > |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
32 > Better commit message" |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
33 $ hg log --hidden -G |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3100
diff
changeset
|
34 @ changeset: 3:4ae3a4151de9 |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
35 | tag: tip |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
36 | parent: 0:ea207398892e |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
37 | user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
38 | 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
|
39 | summary: A1 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
40 | |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3100
diff
changeset
|
41 | x changeset: 2:f137d23bb3e1 |
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3100
diff
changeset
|
42 | | user: test |
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3100
diff
changeset
|
43 | | date: Thu Jan 01 00:00:00 1970 +0000 |
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3100
diff
changeset
|
44 | | obsolete: pruned |
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3100
diff
changeset
|
45 | | summary: temporary amend commit for 471f378eab4c |
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3100
diff
changeset
|
46 | | |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
47 | x changeset: 1:471f378eab4c |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
48 |/ user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
49 | date: Thu Jan 01 00:00:00 1970 +0000 |
3098
87b83a3e0392
test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3083
diff
changeset
|
50 | obsolete: rewritten as 4ae3a4151de9 |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
51 | summary: A0 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
52 | |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
53 o changeset: 0:ea207398892e |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
54 user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
55 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
|
56 summary: ROOT |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
57 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
58 Actual test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
59 ----------- |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
60 $ hg obslog --patch 4ae3a4151de9 |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3100
diff
changeset
|
61 @ 4ae3a4151de9 (3) A1 |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
62 | |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
63 x 471f378eab4c (1) A0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
64 rewritten(description, content) as 4ae3a4151de9 by test (*) (glob) |
2639
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
65 --- a/471f378eab4c-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
66 +++ b/4ae3a4151de9-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
67 @@ -1,1 +1,3 @@ |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
68 -A0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
69 +A1 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
70 + |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
71 +Better commit message |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
72 |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
73 diff -r 471f378eab4c -r 4ae3a4151de9 A0 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
74 --- a/A0 Thu Jan 01 00:00:00 1970 +0000 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
75 +++ b/A0 Thu Jan 01 00:00:00 1970 +0000 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
76 @@ -1,1 +1,2 @@ |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
77 A0 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
78 +42 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
79 |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
80 |
2954 | 81 |
82 $ hg obslog --no-graph --patch 4ae3a4151de9 | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
83 4ae3a4151de9 (2) A1 |
2954 | 84 471f378eab4c (1) A0 |
85 rewritten(description, content) as 4ae3a4151de9 by test (Thu Jan 01 00:00:00 1970 +0000) | |
86 --- a/471f378eab4c-changeset-description | |
87 +++ b/4ae3a4151de9-changeset-description | |
88 @@ -1,1 +1,3 @@ | |
89 -A0 | |
90 +A1 | |
91 + | |
92 +Better commit message | |
93 | |
94 diff -r 471f378eab4c -r 4ae3a4151de9 A0 | |
95 --- a/A0 Thu Jan 01 00:00:00 1970 +0000 | |
96 +++ b/A0 Thu Jan 01 00:00:00 1970 +0000 | |
97 @@ -1,1 +1,2 @@ | |
98 A0 | |
99 +42 | |
100 | |
101 | |
2957 | 102 $ hg obslog 4ae3a4151de9 --graph -T'{label("log.summary", shortdescription)} {if(markers, join(markers % "at {date|hgdate} by {user|person} ", " also "))}' |
103 @ A1 | |
104 | | |
105 x A0 at 0 0 by test | |
106 | |
2441
80b5fc054219
evolve: adding longer aliases for olog
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
2420
diff
changeset
|
107 $ hg obslog 4ae3a4151de9 --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
|
108 [ |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
109 { |
2957 | 110 "markers": [], |
111 "node": "4ae3a4151de9", | |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3100
diff
changeset
|
112 "rev": 3, |
2957 | 113 "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
|
114 }, |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
115 { |
2957 | 116 "markers": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
117 { |
2957 | 118 "date": [ |
119 *, (glob) | |
120 0 (glob) | |
121 ], | |
122 "effect": [ | |
2585
b5e3fe610beb
effectflag: activate effect flag on test-evolve-obshistory test file
Boris Feld <boris.feld@octobus.net>
parents:
2546
diff
changeset
|
123 "description", |
b5e3fe610beb
effectflag: activate effect flag on test-evolve-obshistory test file
Boris Feld <boris.feld@octobus.net>
parents:
2546
diff
changeset
|
124 "content" |
b5e3fe610beb
effectflag: activate effect flag on test-evolve-obshistory test file
Boris Feld <boris.feld@octobus.net>
parents:
2546
diff
changeset
|
125 ], |
2957 | 126 "succnodes": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
127 "4ae3a4151de9" |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
128 ], |
2957 | 129 "user": "test", |
130 "verb": "rewritten" | |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
131 } |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
132 ], |
2957 | 133 "node": "471f378eab4c", |
134 "rev": 1, | |
135 "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
|
136 } |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
137 ] |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
138 $ hg obslog --hidden --patch 471f378eab4c |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
139 x 471f378eab4c (1) A0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
140 rewritten(description, content) as 4ae3a4151de9 by test (*) (glob) |
2639
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
141 --- a/471f378eab4c-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
142 +++ b/4ae3a4151de9-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
143 @@ -1,1 +1,3 @@ |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
144 -A0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
145 +A1 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
146 + |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
147 +Better commit message |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
148 |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
149 diff -r 471f378eab4c -r 4ae3a4151de9 A0 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
150 --- a/A0 Thu Jan 01 00:00:00 1970 +0000 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
151 +++ b/A0 Thu Jan 01 00:00:00 1970 +0000 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
152 @@ -1,1 +1,2 @@ |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
153 A0 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
154 +42 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
155 |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
156 |
2477
d7f7e8f3b51c
test: rename all olog references
Boris Feld <boris.feld@octobus.net>
parents:
2476
diff
changeset
|
157 $ 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
|
158 [ |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
159 { |
2957 | 160 "markers": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
161 { |
2957 | 162 "date": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
163 *, (glob) |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
164 0 (glob) |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
165 ], |
2957 | 166 "effect": [ |
167 *, (glob) | |
168 "content" | |
169 ], | |
170 "succnodes": [ | |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
171 "4ae3a4151de9" |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
172 ], |
2957 | 173 "user": "test", |
174 "verb": "rewritten" | |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
175 } |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
176 ], |
2957 | 177 "node": "471f378eab4c", |
178 "rev": 1, | |
179 "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
|
180 } |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
181 ] |
2290
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
182 $ hg update 471f378eab4c |
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
183 abort: hidden revision '471f378eab4c'! |
2336
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
184 (use --hidden to access hidden revisions; successor: 4ae3a4151de9) |
2290
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
185 [255] |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
186 $ hg update --hidden "desc(A0)" |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
187 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
188 working directory parent is obsolete! (471f378eab4c) |
2336
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
189 (use 'hg evolve' to update to its successor: 4ae3a4151de9) |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
190 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
191 Test output with pruned commit |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
192 ============================== |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
193 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
194 Test setup |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
195 ---------- |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
196 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
197 $ hg init $TESTTMP/local-prune |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
198 $ cd $TESTTMP/local-prune |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
199 $ mkcommit ROOT |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
200 $ mkcommit A0 # 0 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
201 $ mkcommit B0 # 1 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
202 $ hg log --hidden -G |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
203 @ changeset: 2:0dec01379d3b |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
204 | tag: tip |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
205 | user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
206 | 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
|
207 | summary: B0 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
208 | |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
209 o changeset: 1:471f378eab4c |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
210 | user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
211 | 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
|
212 | summary: A0 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
213 | |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
214 o changeset: 0:ea207398892e |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
215 user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
216 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
|
217 summary: ROOT |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
218 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
219 $ hg prune -r 'desc(B0)' |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
220 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
221 working directory now at 471f378eab4c |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
222 1 changesets pruned |
2336
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
223 $ hg log --hidden -G |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
224 x changeset: 2:0dec01379d3b |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
225 | tag: tip |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
226 | user: test |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
227 | date: Thu Jan 01 00:00:00 1970 +0000 |
2709
5d54de9cf50f
merge back with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2698
diff
changeset
|
228 | obsolete: pruned |
2336
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
229 | summary: B0 |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
230 | |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
231 @ changeset: 1:471f378eab4c |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
232 | user: test |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
233 | date: Thu Jan 01 00:00:00 1970 +0000 |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
234 | summary: A0 |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
235 | |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
236 o changeset: 0:ea207398892e |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
237 user: test |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
238 date: Thu Jan 01 00:00:00 1970 +0000 |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
239 summary: ROOT |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
240 |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
241 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
242 Actual test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
243 ----------- |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
244 |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
245 $ hg obslog 'desc(B0)' --hidden --patch |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
246 x 0dec01379d3b (2) B0 |
2478
e3ddb534e5d9
test: improve the globing for obsmarker date
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2420
diff
changeset
|
247 pruned by test (*) (glob) |
3055
774b4ea6ca58
obslog: remove the word "yet" from "No patch available yet"
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3054
diff
changeset
|
248 (No patch available, no successors) |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
249 |
2477
d7f7e8f3b51c
test: rename all olog references
Boris Feld <boris.feld@octobus.net>
parents:
2476
diff
changeset
|
250 $ hg obslog 'desc(B0)' --hidden --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
|
251 [ |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
252 { |
2957 | 253 "markers": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
254 { |
2957 | 255 "date": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
256 *, (glob) |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
257 0 (glob) |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
258 ], |
2957 | 259 "user": "test", |
260 "verb": "pruned" | |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
261 } |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
262 ], |
2957 | 263 "node": "0dec01379d3b", |
264 "rev": 2, | |
265 "shortdescription": "B0" | |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
266 } |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
267 ] |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
268 $ hg obslog 'desc(A0)' --patch |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
269 @ 471f378eab4c (1) A0 |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
270 |
2477
d7f7e8f3b51c
test: rename all olog references
Boris Feld <boris.feld@octobus.net>
parents:
2476
diff
changeset
|
271 $ hg obslog 'desc(A0)' --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
|
272 [ |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
273 { |
2957 | 274 "markers": [], |
275 "node": "471f378eab4c", | |
276 "rev": 1, | |
277 "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
|
278 } |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
279 ] |
2290
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
280 $ hg up 1 |
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
281 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
282 $ hg up 0dec01379d3b |
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
283 abort: hidden revision '0dec01379d3b'! |
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
284 (use --hidden to access hidden revisions; pruned) |
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
285 [255] |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
286 $ hg up --hidden -r 'desc(B0)' |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
287 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
288 working directory parent is obsolete! (0dec01379d3b) |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
289 (use 'hg evolve' to update to its parent successor) |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
290 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
291 Test output with splitted commit |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
292 ================================ |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
293 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
294 Test setup |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
295 ---------- |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
296 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
297 $ hg init $TESTTMP/local-split |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
298 $ cd $TESTTMP/local-split |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
299 $ mkcommit ROOT |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
300 $ echo 42 >> a |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
301 $ echo 43 >> b |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
302 $ hg commit -A -m "A0" |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
303 adding a |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
304 adding b |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
305 $ hg log --hidden -G |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
306 @ changeset: 1:471597cad322 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
307 | tag: tip |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
308 | user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
309 | 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
|
310 | summary: A0 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
311 | |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
312 o changeset: 0:ea207398892e |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
313 user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
314 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
|
315 summary: ROOT |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
316 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
317 $ hg split -r 'desc(A0)' -d "0 0" << EOF |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
318 > y |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
319 > y |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
320 > n |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
321 > n |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
322 > y |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
323 > y |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
324 > EOF |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
325 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
326 adding a |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
327 adding b |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
328 diff --git a/a b/a |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
329 new file mode 100644 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
330 examine changes to 'a'? [Ynesfdaq?] y |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
331 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
332 @@ -0,0 +1,1 @@ |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
333 +42 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
334 record change 1/2 to 'a'? [Ynesfdaq?] y |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
335 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
336 diff --git a/b b/b |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
337 new file mode 100644 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
338 examine changes to 'b'? [Ynesfdaq?] n |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
339 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
340 created new head |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
341 Done splitting? [yN] n |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
342 diff --git a/b b/b |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
343 new file mode 100644 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
344 examine changes to 'b'? [Ynesfdaq?] y |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
345 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
346 @@ -0,0 +1,1 @@ |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
347 +43 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
348 record this change to 'b'? [Ynesfdaq?] y |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
349 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
350 no more change to split |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
351 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
352 $ hg log --hidden -G |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
353 @ changeset: 3:f257fde29c7a |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
354 | tag: tip |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
355 | user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
356 | 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
|
357 | summary: A0 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
358 | |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
359 o changeset: 2:337fec4d2edc |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
360 | parent: 0:ea207398892e |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
361 | user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
362 | 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
|
363 | summary: A0 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
364 | |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
365 | x changeset: 1:471597cad322 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
366 |/ user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
367 | date: Thu Jan 01 00:00:00 1970 +0000 |
3098
87b83a3e0392
test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3083
diff
changeset
|
368 | obsolete: split as 337fec4d2edc, f257fde29c7a |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
369 | summary: A0 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
370 | |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
371 o changeset: 0:ea207398892e |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
372 user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
373 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
|
374 summary: ROOT |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
375 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
376 Actual test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
377 ----------- |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
378 |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
379 Check that debugobshistory on splitted commit show both targets |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
380 $ hg obslog 471597cad322 --hidden --patch |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
381 x 471597cad322 (1) A0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
382 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob) |
3055
774b4ea6ca58
obslog: remove the word "yet" from "No patch available yet"
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3054
diff
changeset
|
383 (No patch available, too many successors (2)) |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
384 |
2477
d7f7e8f3b51c
test: rename all olog references
Boris Feld <boris.feld@octobus.net>
parents:
2476
diff
changeset
|
385 $ hg obslog 471597cad322 --hidden --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
|
386 [ |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
387 { |
2957 | 388 "markers": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
389 { |
2957 | 390 "date": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
391 *, (glob) |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
392 0 (glob) |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
393 ], |
2957 | 394 "effect": [ |
395 "parent", | |
396 "content" | |
397 ], | |
398 "succnodes": [ | |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
399 "337fec4d2edc", |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
400 "f257fde29c7a" |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
401 ], |
2957 | 402 "user": "test", |
403 "verb": "rewritten" | |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
404 } |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
405 ], |
2957 | 406 "node": "471597cad322", |
407 "rev": 1, | |
408 "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
|
409 } |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
410 ] |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
411 Check that debugobshistory on the first successor after split show |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
412 the revision plus the splitted one |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
413 $ hg obslog 337fec4d2edc --patch |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
414 o 337fec4d2edc (2) A0 |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
415 | |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
416 x 471597cad322 (1) A0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
417 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob) |
3055
774b4ea6ca58
obslog: remove the word "yet" from "No patch available yet"
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3054
diff
changeset
|
418 (No patch available, too many successors (2)) |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
419 |
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
|
420 With the all option, it should show the three changesets |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
421 $ hg obslog --all 337fec4d2edc --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
|
422 o 337fec4d2edc (2) A0 |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
423 | |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
424 | @ f257fde29c7a (3) A0 |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
425 |/ |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
426 x 471597cad322 (1) A0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
427 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob) |
3055
774b4ea6ca58
obslog: remove the word "yet" from "No patch available yet"
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3054
diff
changeset
|
428 (No patch available, too many successors (2)) |
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
|
429 |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
430 Check that debugobshistory on the second successor after split show |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
431 the revision plus the splitted one |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
432 $ hg obslog f257fde29c7a --patch |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
433 @ f257fde29c7a (3) A0 |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
434 | |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
435 x 471597cad322 (1) A0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
436 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob) |
3055
774b4ea6ca58
obslog: remove the word "yet" from "No patch available yet"
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3054
diff
changeset
|
437 (No patch available, too many successors (2)) |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
438 |
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
|
439 With the all option, it should show the three changesets |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
440 $ hg obslog f257fde29c7a --all --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
|
441 o 337fec4d2edc (2) A0 |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
442 | |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
443 | @ f257fde29c7a (3) A0 |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
444 |/ |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
445 x 471597cad322 (1) A0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
446 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob) |
3055
774b4ea6ca58
obslog: remove the word "yet" from "No patch available yet"
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3054
diff
changeset
|
447 (No patch available, too many successors (2)) |
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
|
448 |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
449 Obslog with all option all should also works on the splitted commit |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
450 $ hg obslog -a 471597cad322 --hidden --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
|
451 o 337fec4d2edc (2) A0 |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
452 | |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
453 | @ f257fde29c7a (3) A0 |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
454 |/ |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
455 x 471597cad322 (1) A0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
456 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob) |
3055
774b4ea6ca58
obslog: remove the word "yet" from "No patch available yet"
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3054
diff
changeset
|
457 (No patch available, too many successors (2)) |
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
|
458 |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
459 Check that debugobshistory on both successors after split show |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
460 a coherent graph |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
461 $ hg obslog 'f257fde29c7a+337fec4d2edc' --patch |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
462 o 337fec4d2edc (2) A0 |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
463 | |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
464 | @ f257fde29c7a (3) A0 |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
465 |/ |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
466 x 471597cad322 (1) A0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
467 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob) |
3055
774b4ea6ca58
obslog: remove the word "yet" from "No patch available yet"
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3054
diff
changeset
|
468 (No patch available, too many successors (2)) |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
469 |
2290
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
470 $ hg update 471597cad322 |
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
471 abort: hidden revision '471597cad322'! |
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
472 (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a) |
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
473 [255] |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
474 $ hg update --hidden 'min(desc(A0))' |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
475 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
476 working directory parent is obsolete! (471597cad322) |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
477 (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a) |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
478 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
479 Test output with lots of splitted commit |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
480 ======================================== |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
481 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
482 Test setup |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
483 ---------- |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
484 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
485 $ hg init $TESTTMP/local-lots-split |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
486 $ cd $TESTTMP/local-lots-split |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
487 $ mkcommit ROOT |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
488 $ echo 42 >> a |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
489 $ echo 43 >> b |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
490 $ echo 44 >> c |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
491 $ echo 45 >> d |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
492 $ hg commit -A -m "A0" |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
493 adding a |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
494 adding b |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
495 adding c |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
496 adding d |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
497 $ hg log --hidden -G |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
498 @ changeset: 1:de7290d8b885 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
499 | tag: tip |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
500 | user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
501 | 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
|
502 | summary: A0 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
503 | |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
504 o changeset: 0:ea207398892e |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
505 user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
506 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
|
507 summary: ROOT |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
508 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
509 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
510 $ hg split -r 'desc(A0)' -d "0 0" << EOF |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
511 > y |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
512 > y |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
513 > n |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
514 > n |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
515 > n |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
516 > n |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
517 > y |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
518 > y |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
519 > n |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
520 > n |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
521 > n |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
522 > y |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
523 > y |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
524 > n |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
525 > n |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
526 > y |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
527 > y |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
528 > EOF |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
529 0 files updated, 0 files merged, 4 files removed, 0 files unresolved |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
530 adding a |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
531 adding b |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
532 adding c |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
533 adding d |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
534 diff --git a/a b/a |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
535 new file mode 100644 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
536 examine changes to 'a'? [Ynesfdaq?] y |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
537 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
538 @@ -0,0 +1,1 @@ |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
539 +42 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
540 record change 1/4 to 'a'? [Ynesfdaq?] y |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
541 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
542 diff --git a/b b/b |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
543 new file mode 100644 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
544 examine changes to 'b'? [Ynesfdaq?] n |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
545 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
546 diff --git a/c b/c |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
547 new file mode 100644 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
548 examine changes to 'c'? [Ynesfdaq?] n |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
549 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
550 diff --git a/d b/d |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
551 new file mode 100644 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
552 examine changes to 'd'? [Ynesfdaq?] n |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
553 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
554 created new head |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
555 Done splitting? [yN] n |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
556 diff --git a/b b/b |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
557 new file mode 100644 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
558 examine changes to 'b'? [Ynesfdaq?] y |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
559 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
560 @@ -0,0 +1,1 @@ |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
561 +43 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
562 record change 1/3 to 'b'? [Ynesfdaq?] y |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
563 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
564 diff --git a/c b/c |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
565 new file mode 100644 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
566 examine changes to 'c'? [Ynesfdaq?] n |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
567 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
568 diff --git a/d b/d |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
569 new file mode 100644 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
570 examine changes to 'd'? [Ynesfdaq?] n |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
571 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
572 Done splitting? [yN] n |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
573 diff --git a/c b/c |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
574 new file mode 100644 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
575 examine changes to 'c'? [Ynesfdaq?] y |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
576 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
577 @@ -0,0 +1,1 @@ |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
578 +44 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
579 record change 1/2 to 'c'? [Ynesfdaq?] y |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
580 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
581 diff --git a/d b/d |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
582 new file mode 100644 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
583 examine changes to 'd'? [Ynesfdaq?] n |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
584 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
585 Done splitting? [yN] n |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
586 diff --git a/d b/d |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
587 new file mode 100644 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
588 examine changes to 'd'? [Ynesfdaq?] y |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
589 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
590 @@ -0,0 +1,1 @@ |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
591 +45 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
592 record this change to 'd'? [Ynesfdaq?] y |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
593 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
594 no more change to split |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
595 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
596 $ hg log --hidden -G |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
597 @ changeset: 5:c7f044602e9b |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
598 | tag: tip |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
599 | user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
600 | 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
|
601 | summary: A0 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
602 | |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
603 o changeset: 4:1ae8bc733a14 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
604 | user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
605 | 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
|
606 | summary: A0 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
607 | |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
608 o changeset: 3:f257fde29c7a |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
609 | user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
610 | 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
|
611 | summary: A0 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
612 | |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
613 o changeset: 2:337fec4d2edc |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
614 | parent: 0:ea207398892e |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
615 | user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
616 | 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
|
617 | summary: A0 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
618 | |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
619 | x changeset: 1:de7290d8b885 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
620 |/ user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
621 | date: Thu Jan 01 00:00:00 1970 +0000 |
3098
87b83a3e0392
test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3083
diff
changeset
|
622 | obsolete: split as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
623 | summary: A0 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
624 | |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
625 o changeset: 0:ea207398892e |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
626 user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
627 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
|
628 summary: ROOT |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
629 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
630 Actual test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
631 ----------- |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
632 |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
633 $ hg obslog de7290d8b885 --hidden --patch |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
634 x de7290d8b885 (1) A0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
635 rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (*) (glob) |
3055
774b4ea6ca58
obslog: remove the word "yet" from "No patch available yet"
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3054
diff
changeset
|
636 (No patch available, too many successors (4)) |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
637 |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
638 $ hg obslog de7290d8b885 --hidden --all --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
|
639 o 1ae8bc733a14 (4) A0 |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
640 | |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
641 | o 337fec4d2edc (2) A0 |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
642 |/ |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
643 | @ c7f044602e9b (5) A0 |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
644 |/ |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
645 | o f257fde29c7a (3) A0 |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
646 |/ |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
647 x de7290d8b885 (1) A0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
648 rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (*) (glob) |
3055
774b4ea6ca58
obslog: remove the word "yet" from "No patch available yet"
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3054
diff
changeset
|
649 (No patch available, too many successors (4)) |
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
|
650 |
2477
d7f7e8f3b51c
test: rename all olog references
Boris Feld <boris.feld@octobus.net>
parents:
2476
diff
changeset
|
651 $ hg obslog de7290d8b885 --hidden --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
|
652 [ |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
653 { |
2957 | 654 "markers": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
655 { |
2957 | 656 "date": [ |
657 *, (glob) | |
658 0 (glob) | |
659 ], | |
660 "effect": [ | |
2585
b5e3fe610beb
effectflag: activate effect flag on test-evolve-obshistory test file
Boris Feld <boris.feld@octobus.net>
parents:
2546
diff
changeset
|
661 "parent", |
b5e3fe610beb
effectflag: activate effect flag on test-evolve-obshistory test file
Boris Feld <boris.feld@octobus.net>
parents:
2546
diff
changeset
|
662 "content" |
b5e3fe610beb
effectflag: activate effect flag on test-evolve-obshistory test file
Boris Feld <boris.feld@octobus.net>
parents:
2546
diff
changeset
|
663 ], |
2957 | 664 "succnodes": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
665 "1ae8bc733a14", |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
666 "337fec4d2edc", |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
667 "c7f044602e9b", |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
668 "f257fde29c7a" |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
669 ], |
2957 | 670 "user": "test", |
671 "verb": "rewritten" | |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
672 } |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
673 ], |
2957 | 674 "node": "de7290d8b885", |
675 "rev": 1, | |
676 "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
|
677 } |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
678 ] |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
679 $ hg obslog c7f044602e9b --patch |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
680 @ c7f044602e9b (5) A0 |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
681 | |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
682 x de7290d8b885 (1) A0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
683 rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (*) (glob) |
3055
774b4ea6ca58
obslog: remove the word "yet" from "No patch available yet"
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3054
diff
changeset
|
684 (No patch available, too many successors (4)) |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
685 |
2477
d7f7e8f3b51c
test: rename all olog references
Boris Feld <boris.feld@octobus.net>
parents:
2476
diff
changeset
|
686 $ hg obslog c7f044602e9b --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
|
687 [ |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
688 { |
2957 | 689 "markers": [], |
690 "node": "c7f044602e9b", | |
691 "rev": 5, | |
692 "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
|
693 }, |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
694 { |
2957 | 695 "markers": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
696 { |
2957 | 697 "date": [ |
698 *, (glob) | |
699 0 (glob) | |
700 ], | |
701 "effect": [ | |
2585
b5e3fe610beb
effectflag: activate effect flag on test-evolve-obshistory test file
Boris Feld <boris.feld@octobus.net>
parents:
2546
diff
changeset
|
702 "parent", |
b5e3fe610beb
effectflag: activate effect flag on test-evolve-obshistory test file
Boris Feld <boris.feld@octobus.net>
parents:
2546
diff
changeset
|
703 "content" |
b5e3fe610beb
effectflag: activate effect flag on test-evolve-obshistory test file
Boris Feld <boris.feld@octobus.net>
parents:
2546
diff
changeset
|
704 ], |
2957 | 705 "succnodes": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
706 "1ae8bc733a14", |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
707 "337fec4d2edc", |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
708 "c7f044602e9b", |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
709 "f257fde29c7a" |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
710 ], |
2957 | 711 "user": "test", |
712 "verb": "rewritten" | |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
713 } |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
714 ], |
2957 | 715 "node": "de7290d8b885", |
716 "rev": 1, | |
717 "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
|
718 } |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
719 ] |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
720 Check that debugobshistory on all heads show a coherent graph |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
721 $ hg obslog 2::5 --patch |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
722 o 1ae8bc733a14 (4) A0 |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
723 | |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
724 | o 337fec4d2edc (2) A0 |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
725 |/ |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
726 | @ c7f044602e9b (5) A0 |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
727 |/ |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
728 | o f257fde29c7a (3) A0 |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
729 |/ |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
730 x de7290d8b885 (1) A0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
731 rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (*) (glob) |
3055
774b4ea6ca58
obslog: remove the word "yet" from "No patch available yet"
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3054
diff
changeset
|
732 (No patch available, too many successors (4)) |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
733 |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
734 $ hg obslog 5 --all --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
|
735 o 1ae8bc733a14 (4) A0 |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
736 | |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
737 | o 337fec4d2edc (2) A0 |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
738 |/ |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
739 | @ c7f044602e9b (5) A0 |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
740 |/ |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
741 | o f257fde29c7a (3) A0 |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
742 |/ |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
743 x de7290d8b885 (1) A0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
744 rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (*) (glob) |
3055
774b4ea6ca58
obslog: remove the word "yet" from "No patch available yet"
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3054
diff
changeset
|
745 (No patch available, too many successors (4)) |
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
|
746 |
2290
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
747 $ hg update de7290d8b885 |
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
748 abort: hidden revision 'de7290d8b885'! |
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
749 (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a and 2 more) |
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
750 [255] |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
751 $ hg update --hidden 'min(desc(A0))' |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
752 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
753 working directory parent is obsolete! (de7290d8b885) |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
754 (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a and 2 more) |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
755 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
756 Test output with folded commit |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
757 ============================== |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
758 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
759 Test setup |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
760 ---------- |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
761 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
762 $ hg init $TESTTMP/local-fold |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
763 $ cd $TESTTMP/local-fold |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
764 $ mkcommit ROOT |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
765 $ mkcommit A0 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
766 $ mkcommit B0 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
767 $ hg log --hidden -G |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
768 @ changeset: 2:0dec01379d3b |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
769 | tag: tip |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
770 | user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
771 | 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
|
772 | summary: B0 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
773 | |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
774 o changeset: 1:471f378eab4c |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
775 | user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
776 | 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
|
777 | summary: A0 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
778 | |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
779 o changeset: 0:ea207398892e |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
780 user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
781 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
|
782 summary: ROOT |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
783 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
784 $ hg fold --exact -r 'desc(A0) + desc(B0)' --date "0 0" -m "C0" |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
785 2 changesets folded |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
786 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
787 $ hg log --hidden -G |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
788 @ changeset: 3:eb5a0daa2192 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
789 | tag: tip |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
790 | parent: 0:ea207398892e |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
791 | user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
792 | 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
|
793 | summary: C0 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
794 | |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
795 | x changeset: 2:0dec01379d3b |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
796 | | user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
797 | | date: Thu Jan 01 00:00:00 1970 +0000 |
3098
87b83a3e0392
test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3083
diff
changeset
|
798 | | obsolete: rewritten as eb5a0daa2192 |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
799 | | summary: B0 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
800 | | |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
801 | x changeset: 1:471f378eab4c |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
802 |/ user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
803 | date: Thu Jan 01 00:00:00 1970 +0000 |
3098
87b83a3e0392
test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3083
diff
changeset
|
804 | obsolete: rewritten as eb5a0daa2192 |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
805 | summary: A0 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
806 | |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
807 o changeset: 0:ea207398892e |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
808 user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
809 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
|
810 summary: ROOT |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
811 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
812 Actual test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
813 ----------- |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
814 |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
815 Check that debugobshistory on the first folded revision show only |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
816 the revision with the target |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
817 $ 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
|
818 x 471f378eab4c (1) A0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
819 rewritten(description, content) as eb5a0daa2192 by test (*) (glob) |
2639
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
820 --- a/471f378eab4c-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
821 +++ b/eb5a0daa2192-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
822 @@ -1,1 +1,1 @@ |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
823 -A0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
824 +C0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
825 |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
826 diff -r 471f378eab4c -r eb5a0daa2192 B0 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
827 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
828 +++ b/B0 Thu Jan 01 00:00:00 1970 +0000 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
829 @@ -0,0 +1,1 @@ |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
830 +B0 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
831 |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
832 |
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
|
833 Check that with all option, all changesets are shown |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
834 $ 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
|
835 @ eb5a0daa2192 (3) C0 |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
836 |\ |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
837 x | 0dec01379d3b (2) B0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
838 / rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob) |
3055
774b4ea6ca58
obslog: remove the word "yet" from "No patch available yet"
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3054
diff
changeset
|
839 | (No patch available, changesets rebased) |
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
|
840 | |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
841 x 471f378eab4c (1) A0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
842 rewritten(description, content) as eb5a0daa2192 by test (*) (glob) |
2639
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
843 --- a/471f378eab4c-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
844 +++ b/eb5a0daa2192-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
845 @@ -1,1 +1,1 @@ |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
846 -A0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
847 +C0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
848 |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
849 diff -r 471f378eab4c -r eb5a0daa2192 B0 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
850 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
851 +++ b/B0 Thu Jan 01 00:00:00 1970 +0000 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
852 @@ -0,0 +1,1 @@ |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
853 +B0 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
854 |
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
|
855 |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
856 Check that debugobshistory on the second folded revision show only |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
857 the revision with the target |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
858 $ hg obslog --hidden 0dec01379d3b --patch |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
859 x 0dec01379d3b (2) B0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
860 rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob) |
3055
774b4ea6ca58
obslog: remove the word "yet" from "No patch available yet"
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3054
diff
changeset
|
861 (No patch available, changesets rebased) |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
862 |
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
|
863 Check that with all option, all changesets are shown |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
864 $ hg obslog --hidden --all 0dec01379d3b --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
|
865 @ eb5a0daa2192 (3) C0 |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
866 |\ |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
867 x | 0dec01379d3b (2) B0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
868 / rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob) |
3055
774b4ea6ca58
obslog: remove the word "yet" from "No patch available yet"
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3054
diff
changeset
|
869 | (No patch available, changesets rebased) |
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
|
870 | |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
871 x 471f378eab4c (1) A0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
872 rewritten(description, content) as eb5a0daa2192 by test (*) (glob) |
2639
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
873 --- a/471f378eab4c-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
874 +++ b/eb5a0daa2192-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
875 @@ -1,1 +1,1 @@ |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
876 -A0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
877 +C0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
878 |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
879 diff -r 471f378eab4c -r eb5a0daa2192 B0 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
880 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
881 +++ b/B0 Thu Jan 01 00:00:00 1970 +0000 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
882 @@ -0,0 +1,1 @@ |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
883 +B0 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
884 |
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
|
885 |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
886 Check that debugobshistory on the successor 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
|
887 graph |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
888 $ hg obslog eb5a0daa2192 --patch |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
889 @ eb5a0daa2192 (3) C0 |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
890 |\ |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
891 x | 0dec01379d3b (2) B0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
892 / rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob) |
3055
774b4ea6ca58
obslog: remove the word "yet" from "No patch available yet"
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3054
diff
changeset
|
893 | (No patch available, changesets rebased) |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
894 | |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
895 x 471f378eab4c (1) A0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
896 rewritten(description, content) as eb5a0daa2192 by test (*) (glob) |
2639
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
897 --- a/471f378eab4c-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
898 +++ b/eb5a0daa2192-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
899 @@ -1,1 +1,1 @@ |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
900 -A0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
901 +C0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
902 |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
903 diff -r 471f378eab4c -r eb5a0daa2192 B0 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
904 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
905 +++ b/B0 Thu Jan 01 00:00:00 1970 +0000 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
906 @@ -0,0 +1,1 @@ |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
907 +B0 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
908 |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
909 |
2477
d7f7e8f3b51c
test: rename all olog references
Boris Feld <boris.feld@octobus.net>
parents:
2476
diff
changeset
|
910 $ hg obslog eb5a0daa2192 --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
|
911 [ |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
912 { |
2957 | 913 "markers": [], |
914 "node": "eb5a0daa2192", | |
915 "rev": 3, | |
916 "shortdescription": "C0" | |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
917 }, |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
918 { |
2957 | 919 "markers": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
920 { |
2957 | 921 "date": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
922 *, (glob) |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
923 0 (glob) |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
924 ], |
2957 | 925 "effect": [ |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
926 "description", |
2957 | 927 "content" |
928 ], | |
929 "succnodes": [ | |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
930 "eb5a0daa2192" |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
931 ], |
2957 | 932 "user": "test", |
933 "verb": "rewritten" | |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
934 } |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
935 ], |
2957 | 936 "node": "471f378eab4c", |
937 "rev": 1, | |
938 "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
|
939 }, |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
940 { |
2957 | 941 "markers": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
942 { |
2957 | 943 "date": [ |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
944 *, (glob) |
2957 | 945 0 (glob) |
946 ], | |
947 "effect": [ | |
2585
b5e3fe610beb
effectflag: activate effect flag on test-evolve-obshistory test file
Boris Feld <boris.feld@octobus.net>
parents:
2546
diff
changeset
|
948 "description", |
b5e3fe610beb
effectflag: activate effect flag on test-evolve-obshistory test file
Boris Feld <boris.feld@octobus.net>
parents:
2546
diff
changeset
|
949 "parent", |
b5e3fe610beb
effectflag: activate effect flag on test-evolve-obshistory test file
Boris Feld <boris.feld@octobus.net>
parents:
2546
diff
changeset
|
950 "content" |
b5e3fe610beb
effectflag: activate effect flag on test-evolve-obshistory test file
Boris Feld <boris.feld@octobus.net>
parents:
2546
diff
changeset
|
951 ], |
2957 | 952 "succnodes": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
953 "eb5a0daa2192" |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
954 ], |
2957 | 955 "user": "test", |
956 "verb": "rewritten" | |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
957 } |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
958 ], |
2957 | 959 "node": "0dec01379d3b", |
960 "rev": 2, | |
961 "shortdescription": "B0" | |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
962 } |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
963 ] |
2290
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
964 $ hg update 471f378eab4c |
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
965 abort: hidden revision '471f378eab4c'! |
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
966 (use --hidden to access hidden revisions; successor: eb5a0daa2192) |
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
967 [255] |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
968 $ hg update --hidden 'desc(A0)' |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
969 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
970 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
|
971 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
2290
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
972 $ hg update 0dec01379d3b |
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
973 working directory parent is obsolete! (471f378eab4c) |
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
974 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
975 abort: hidden revision '0dec01379d3b'! |
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
976 (use --hidden to access hidden revisions; successor: eb5a0daa2192) |
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
977 [255] |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
978 $ hg update --hidden 'desc(B0)' |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
979 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
980 working directory parent is obsolete! (0dec01379d3b) |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
981 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
982 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
983 Test output with divergence |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
984 =========================== |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
985 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
986 Test setup |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
987 ---------- |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
988 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
989 $ 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
|
990 $ cd $TESTTMP/local-divergence |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
991 $ mkcommit ROOT |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
992 $ mkcommit A0 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
993 $ hg amend -m "A1" |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
994 $ hg log --hidden -G |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
995 @ changeset: 2:fdf9bde5129a |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
996 | tag: tip |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
997 | parent: 0:ea207398892e |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
998 | user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
999 | 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
|
1000 | summary: A1 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1001 | |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1002 | x changeset: 1:471f378eab4c |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1003 |/ user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1004 | date: Thu Jan 01 00:00:00 1970 +0000 |
3098
87b83a3e0392
test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3083
diff
changeset
|
1005 | obsolete: reworded as fdf9bde5129a |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1006 | summary: A0 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1007 | |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1008 o changeset: 0:ea207398892e |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1009 user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1010 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
|
1011 summary: ROOT |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1012 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1013 $ hg update --hidden 'desc(A0)' |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1014 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1015 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
|
1016 (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
|
1017 $ hg amend -m "A2" |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1018 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
|
1019 $ hg log --hidden -G |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1020 @ changeset: 3:65b757b745b9 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1021 | tag: tip |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1022 | parent: 0:ea207398892e |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1023 | user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1024 | 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
|
1025 | instability: content-divergent |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1026 | summary: A2 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1027 | |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1028 | o changeset: 2:fdf9bde5129a |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1029 |/ parent: 0:ea207398892e |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1030 | user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1031 | 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
|
1032 | instability: content-divergent |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1033 | summary: A1 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1034 | |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1035 | x changeset: 1:471f378eab4c |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1036 |/ user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1037 | date: Thu Jan 01 00:00:00 1970 +0000 |
3098
87b83a3e0392
test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3083
diff
changeset
|
1038 | obsolete: reworded as fdf9bde5129a |
87b83a3e0392
test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3083
diff
changeset
|
1039 | obsolete: reworded as 65b757b745b9 |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1040 | summary: A0 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1041 | |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1042 o changeset: 0:ea207398892e |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1043 user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1044 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
|
1045 summary: ROOT |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1046 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1047 Actual test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1048 ----------- |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1049 |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1050 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
|
1051 $ 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
|
1052 x 471f378eab4c (1) A0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1053 rewritten(description) as 65b757b745b9 by test (*) (glob) |
2639
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1054 --- a/471f378eab4c-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1055 +++ b/65b757b745b9-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1056 @@ -1,1 +1,1 @@ |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1057 -A0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1058 +A2 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1059 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1060 rewritten(description) as fdf9bde5129a by test (*) (glob) |
2639
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1061 --- a/471f378eab4c-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1062 +++ b/fdf9bde5129a-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1063 @@ -1,1 +1,1 @@ |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1064 -A0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1065 +A1 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1066 |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1067 |
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
|
1068 |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
1069 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
|
1070 $ 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
|
1071 @ 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
|
1072 | |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
1073 | o fdf9bde5129a (2) A1 |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
1074 |/ |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
1075 x 471f378eab4c (1) A0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1076 rewritten(description) as 65b757b745b9 by test (*) (glob) |
2639
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1077 --- a/471f378eab4c-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1078 +++ b/65b757b745b9-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1079 @@ -1,1 +1,1 @@ |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1080 -A0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1081 +A2 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1082 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1083 rewritten(description) as fdf9bde5129a by test (*) (glob) |
2639
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1084 --- a/471f378eab4c-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1085 +++ b/fdf9bde5129a-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1086 @@ -1,1 +1,1 @@ |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1087 -A0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1088 +A1 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1089 |
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
|
1090 |
2477
d7f7e8f3b51c
test: rename all olog references
Boris Feld <boris.feld@octobus.net>
parents:
2476
diff
changeset
|
1091 $ 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
|
1092 [ |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1093 { |
2957 | 1094 "markers": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1095 { |
2957 | 1096 "date": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1097 *, (glob) |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1098 0 (glob) |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1099 ], |
2957 | 1100 "effect": [ |
1101 "description" | |
1102 ], | |
1103 "succnodes": [ | |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1104 "65b757b745b9" |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1105 ], |
2957 | 1106 "user": "test", |
1107 "verb": "rewritten" | |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1108 }, |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1109 { |
2957 | 1110 "date": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1111 *, (glob) |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1112 0 (glob) |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1113 ], |
2957 | 1114 "effect": [ |
1115 "description" | |
1116 ], | |
1117 "succnodes": [ | |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1118 "fdf9bde5129a" |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1119 ], |
2957 | 1120 "user": "test", |
1121 "verb": "rewritten" | |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1122 } |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1123 ], |
2957 | 1124 "node": "471f378eab4c", |
1125 "rev": 1, | |
1126 "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
|
1127 } |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1128 ] |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1129 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
|
1130 and the diverent one |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
1131 $ hg obslog 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
|
1132 o fdf9bde5129a (2) A1 |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1133 | |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1134 x 471f378eab4c (1) A0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1135 rewritten(description) as 65b757b745b9 by test (*) (glob) |
2639
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1136 --- a/471f378eab4c-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1137 +++ b/65b757b745b9-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1138 @@ -1,1 +1,1 @@ |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1139 -A0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1140 +A2 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1141 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1142 rewritten(description) as fdf9bde5129a by test (*) (glob) |
2639
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1143 --- a/471f378eab4c-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1144 +++ b/fdf9bde5129a-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1145 @@ -1,1 +1,1 @@ |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1146 -A0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1147 +A1 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1148 |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1149 |
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
|
1150 |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
1151 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
|
1152 $ 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
|
1153 @ 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
|
1154 | |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
1155 | o fdf9bde5129a (2) A1 |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
1156 |/ |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
1157 x 471f378eab4c (1) A0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1158 rewritten(description) as 65b757b745b9 by test (*) (glob) |
2639
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1159 --- a/471f378eab4c-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1160 +++ b/65b757b745b9-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1161 @@ -1,1 +1,1 @@ |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1162 -A0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1163 +A2 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1164 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1165 rewritten(description) as fdf9bde5129a by test (*) (glob) |
2639
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1166 --- a/471f378eab4c-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1167 +++ b/fdf9bde5129a-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1168 @@ -1,1 +1,1 @@ |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1169 -A0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1170 +A1 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1171 |
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
|
1172 |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1173 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
|
1174 and the diverent one |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
1175 $ 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
|
1176 @ 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
|
1177 | |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1178 x 471f378eab4c (1) A0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1179 rewritten(description) as 65b757b745b9 by test (*) (glob) |
2639
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1180 --- a/471f378eab4c-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1181 +++ b/65b757b745b9-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1182 @@ -1,1 +1,1 @@ |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1183 -A0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1184 +A2 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1185 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1186 rewritten(description) as fdf9bde5129a by test (*) (glob) |
2639
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1187 --- a/471f378eab4c-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1188 +++ b/fdf9bde5129a-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1189 @@ -1,1 +1,1 @@ |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1190 -A0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1191 +A1 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1192 |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1193 |
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
|
1194 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
|
1195 $ 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
|
1196 @ 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
|
1197 | |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
1198 | o fdf9bde5129a (2) A1 |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
1199 |/ |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
1200 x 471f378eab4c (1) A0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1201 rewritten(description) as 65b757b745b9 by test (*) (glob) |
2639
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1202 --- a/471f378eab4c-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1203 +++ b/65b757b745b9-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1204 @@ -1,1 +1,1 @@ |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1205 -A0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1206 +A2 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1207 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1208 rewritten(description) as fdf9bde5129a by test (*) (glob) |
2639
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1209 --- a/471f378eab4c-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1210 +++ b/fdf9bde5129a-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1211 @@ -1,1 +1,1 @@ |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1212 -A0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1213 +A1 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1214 |
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
|
1215 |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1216 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
|
1217 graph |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
1218 $ 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
|
1219 @ 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
|
1220 | |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1221 | o fdf9bde5129a (2) A1 |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1222 |/ |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1223 x 471f378eab4c (1) A0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1224 rewritten(description) as 65b757b745b9 by test (*) (glob) |
2639
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1225 --- a/471f378eab4c-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1226 +++ b/65b757b745b9-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1227 @@ -1,1 +1,1 @@ |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1228 -A0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1229 +A2 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1230 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1231 rewritten(description) as fdf9bde5129a by test (*) (glob) |
2639
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1232 --- a/471f378eab4c-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1233 +++ b/fdf9bde5129a-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1234 @@ -1,1 +1,1 @@ |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1235 -A0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1236 +A1 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1237 |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1238 |
2477
d7f7e8f3b51c
test: rename all olog references
Boris Feld <boris.feld@octobus.net>
parents:
2476
diff
changeset
|
1239 $ 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
|
1240 [ |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1241 { |
2957 | 1242 "markers": [], |
1243 "node": "65b757b745b9", | |
1244 "rev": 3, | |
1245 "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
|
1246 }, |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1247 { |
2957 | 1248 "markers": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1249 { |
2957 | 1250 "date": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1251 *, (glob) |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1252 0 (glob) |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1253 ], |
2957 | 1254 "effect": [ |
1255 "description" | |
1256 ], | |
1257 "succnodes": [ | |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1258 "65b757b745b9" |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1259 ], |
2957 | 1260 "user": "test", |
1261 "verb": "rewritten" | |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1262 }, |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1263 { |
2957 | 1264 "date": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1265 *, (glob) |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1266 0 (glob) |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1267 ], |
2957 | 1268 "effect": [ |
1269 "description" | |
1270 ], | |
1271 "succnodes": [ | |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1272 "fdf9bde5129a" |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1273 ], |
2957 | 1274 "user": "test", |
1275 "verb": "rewritten" | |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1276 } |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1277 ], |
2957 | 1278 "node": "471f378eab4c", |
1279 "rev": 1, | |
1280 "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
|
1281 }, |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1282 { |
2957 | 1283 "markers": [], |
1284 "node": "fdf9bde5129a", | |
1285 "rev": 2, | |
1286 "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
|
1287 } |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1288 ] |
2290
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
1289 $ hg update 471f378eab4c |
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
1290 abort: hidden revision '471f378eab4c'! |
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
1291 (use --hidden to access hidden revisions; diverged) |
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
1292 [255] |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1293 $ hg update --hidden 'desc(A0)' |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1294 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1295 working directory parent is obsolete! (471f378eab4c) |
2835
20c2499ce8bc
log: divergent was renamed into contentdivergent
Boris Feld <boris.feld@octobus.net>
parents:
2833
diff
changeset
|
1296 (471f378eab4c has diverged, use 'hg evolve --list --contentdivergent' to resolve the issue) |
2336
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1297 |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1298 Test output with amended + folded commit |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1299 ======================================== |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1300 |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1301 Test setup |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1302 ---------- |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1303 |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1304 $ hg init $TESTTMP/local-amend-fold |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1305 $ cd $TESTTMP/local-amend-fold |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1306 $ mkcommit ROOT |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1307 $ mkcommit A0 |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1308 $ mkcommit B0 |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1309 $ hg amend -m "B1" |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1310 $ hg log --hidden -G |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1311 @ changeset: 3:b7ea6d14e664 |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1312 | tag: tip |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1313 | parent: 1:471f378eab4c |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1314 | user: test |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1315 | date: Thu Jan 01 00:00:00 1970 +0000 |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1316 | summary: B1 |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1317 | |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1318 | x changeset: 2:0dec01379d3b |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1319 |/ user: test |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1320 | date: Thu Jan 01 00:00:00 1970 +0000 |
3098
87b83a3e0392
test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3083
diff
changeset
|
1321 | obsolete: reworded as b7ea6d14e664 |
2336
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1322 | summary: B0 |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1323 | |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1324 o changeset: 1:471f378eab4c |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1325 | user: test |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1326 | date: Thu Jan 01 00:00:00 1970 +0000 |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1327 | summary: A0 |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1328 | |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1329 o changeset: 0:ea207398892e |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1330 user: test |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1331 date: Thu Jan 01 00:00:00 1970 +0000 |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1332 summary: ROOT |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1333 |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1334 $ hg fold --exact -r 'desc(A0) + desc(B1)' --date "0 0" -m "C0" |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1335 2 changesets folded |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1336 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1337 $ hg log --hidden -G |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1338 @ changeset: 4:eb5a0daa2192 |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1339 | tag: tip |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1340 | parent: 0:ea207398892e |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1341 | user: test |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1342 | date: Thu Jan 01 00:00:00 1970 +0000 |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1343 | summary: C0 |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1344 | |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1345 | x changeset: 3:b7ea6d14e664 |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1346 | | parent: 1:471f378eab4c |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1347 | | user: test |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1348 | | date: Thu Jan 01 00:00:00 1970 +0000 |
3098
87b83a3e0392
test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3083
diff
changeset
|
1349 | | obsolete: rewritten as eb5a0daa2192 |
2336
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1350 | | summary: B1 |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1351 | | |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1352 | | x changeset: 2:0dec01379d3b |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1353 | |/ user: test |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1354 | | date: Thu Jan 01 00:00:00 1970 +0000 |
3098
87b83a3e0392
test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3083
diff
changeset
|
1355 | | obsolete: reworded as b7ea6d14e664 |
2336
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1356 | | summary: B0 |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1357 | | |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1358 | x changeset: 1:471f378eab4c |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1359 |/ user: test |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1360 | date: Thu Jan 01 00:00:00 1970 +0000 |
3098
87b83a3e0392
test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3083
diff
changeset
|
1361 | obsolete: rewritten as eb5a0daa2192 |
2336
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1362 | summary: A0 |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1363 | |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1364 o changeset: 0:ea207398892e |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1365 user: test |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1366 date: Thu Jan 01 00:00:00 1970 +0000 |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1367 summary: ROOT |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1368 |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1369 Actual test |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1370 ----------- |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1371 |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1372 Check that debugobshistory on head show a coherent graph |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
1373 $ hg obslog eb5a0daa2192 --patch |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1374 @ eb5a0daa2192 (4) C0 |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1375 |\ |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1376 x | 471f378eab4c (1) A0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1377 / rewritten(description, content) as eb5a0daa2192 by test (*) (glob) |
2639
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1378 | --- a/471f378eab4c-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1379 | +++ b/eb5a0daa2192-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1380 | @@ -1,1 +1,1 @@ |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1381 | -A0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1382 | +C0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1383 | |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
1384 | diff -r 471f378eab4c -r eb5a0daa2192 B0 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
1385 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
1386 | +++ b/B0 Thu Jan 01 00:00:00 1970 +0000 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
1387 | @@ -0,0 +1,1 @@ |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
1388 | +B0 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
1389 | |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1390 | |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1391 x b7ea6d14e664 (3) B1 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1392 | rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob) |
3055
774b4ea6ca58
obslog: remove the word "yet" from "No patch available yet"
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3054
diff
changeset
|
1393 | (No patch available, changesets rebased) |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1394 | |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1395 x 0dec01379d3b (2) B0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1396 rewritten(description) as b7ea6d14e664 by test (*) (glob) |
2639
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1397 --- a/0dec01379d3b-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1398 +++ b/b7ea6d14e664-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1399 @@ -1,1 +1,1 @@ |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1400 -B0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1401 +B1 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1402 |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1403 |
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
|
1404 Check that obslog on ROOT with all option show everything |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
1405 $ hg obslog 1 --hidden --all --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
|
1406 @ eb5a0daa2192 (4) C0 |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
1407 |\ |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
1408 x | 471f378eab4c (1) A0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1409 / rewritten(description, content) as eb5a0daa2192 by test (*) (glob) |
2639
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1410 | --- a/471f378eab4c-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1411 | +++ b/eb5a0daa2192-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1412 | @@ -1,1 +1,1 @@ |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1413 | -A0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1414 | +C0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1415 | |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
1416 | diff -r 471f378eab4c -r eb5a0daa2192 B0 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
1417 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
1418 | +++ b/B0 Thu Jan 01 00:00:00 1970 +0000 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
1419 | @@ -0,0 +1,1 @@ |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
1420 | +B0 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
1421 | |
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
|
1422 | |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
1423 x b7ea6d14e664 (3) B1 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1424 | rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob) |
3055
774b4ea6ca58
obslog: remove the word "yet" from "No patch available yet"
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3054
diff
changeset
|
1425 | (No patch available, changesets rebased) |
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
|
1426 | |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
1427 x 0dec01379d3b (2) B0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1428 rewritten(description) as b7ea6d14e664 by test (*) (glob) |
2639
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1429 --- a/0dec01379d3b-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1430 +++ b/b7ea6d14e664-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1431 @@ -1,1 +1,1 @@ |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1432 -B0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1433 +B1 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1434 |
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
|
1435 |
2477
d7f7e8f3b51c
test: rename all olog references
Boris Feld <boris.feld@octobus.net>
parents:
2476
diff
changeset
|
1436 $ hg obslog eb5a0daa2192 --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
|
1437 [ |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1438 { |
2957 | 1439 "markers": [], |
1440 "node": "eb5a0daa2192", | |
1441 "rev": 4, | |
1442 "shortdescription": "C0" | |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1443 }, |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1444 { |
2957 | 1445 "markers": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1446 { |
2957 | 1447 "date": [ |
1448 *, (glob) | |
1449 0 (glob) | |
1450 ], | |
1451 "effect": [ | |
2585
b5e3fe610beb
effectflag: activate effect flag on test-evolve-obshistory test file
Boris Feld <boris.feld@octobus.net>
parents:
2546
diff
changeset
|
1452 *, (glob) |
b5e3fe610beb
effectflag: activate effect flag on test-evolve-obshistory test file
Boris Feld <boris.feld@octobus.net>
parents:
2546
diff
changeset
|
1453 *, (glob) |
b5e3fe610beb
effectflag: activate effect flag on test-evolve-obshistory test file
Boris Feld <boris.feld@octobus.net>
parents:
2546
diff
changeset
|
1454 "content" |
b5e3fe610beb
effectflag: activate effect flag on test-evolve-obshistory test file
Boris Feld <boris.feld@octobus.net>
parents:
2546
diff
changeset
|
1455 ], |
2957 | 1456 "succnodes": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1457 "eb5a0daa2192" |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1458 ], |
2957 | 1459 "user": "test", |
1460 "verb": "rewritten" | |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1461 } |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1462 ], |
2957 | 1463 "node": "b7ea6d14e664", |
1464 "rev": 3, | |
1465 "shortdescription": "B1" | |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1466 }, |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1467 { |
2957 | 1468 "markers": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1469 { |
2957 | 1470 "date": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1471 *, (glob) |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1472 0 (glob) |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1473 ], |
2957 | 1474 "effect": [ |
1475 "description" | |
1476 ], | |
1477 "succnodes": [ | |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1478 "b7ea6d14e664" |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1479 ], |
2957 | 1480 "user": "test", |
1481 "verb": "rewritten" | |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1482 } |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1483 ], |
2957 | 1484 "node": "0dec01379d3b", |
1485 "rev": 2, | |
1486 "shortdescription": "B0" | |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1487 }, |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1488 { |
2957 | 1489 "markers": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1490 { |
2957 | 1491 "date": [ |
1492 *, (glob) | |
1493 0 (glob) | |
1494 ], | |
1495 "effect": [ | |
2585
b5e3fe610beb
effectflag: activate effect flag on test-evolve-obshistory test file
Boris Feld <boris.feld@octobus.net>
parents:
2546
diff
changeset
|
1496 "description", |
b5e3fe610beb
effectflag: activate effect flag on test-evolve-obshistory test file
Boris Feld <boris.feld@octobus.net>
parents:
2546
diff
changeset
|
1497 "content" |
b5e3fe610beb
effectflag: activate effect flag on test-evolve-obshistory test file
Boris Feld <boris.feld@octobus.net>
parents:
2546
diff
changeset
|
1498 ], |
2957 | 1499 "succnodes": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1500 "eb5a0daa2192" |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1501 ], |
2957 | 1502 "user": "test", |
1503 "verb": "rewritten" | |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1504 } |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1505 ], |
2957 | 1506 "node": "471f378eab4c", |
1507 "rev": 1, | |
1508 "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
|
1509 } |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1510 ] |
2336
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1511 $ hg update 471f378eab4c |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1512 abort: hidden revision '471f378eab4c'! |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1513 (use --hidden to access hidden revisions; successor: eb5a0daa2192) |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1514 [255] |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1515 $ hg update --hidden 'desc(A0)' |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1516 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1517 working directory parent is obsolete! (471f378eab4c) |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1518 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1519 $ hg update --hidden 0dec01379d3b |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1520 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1521 working directory parent is obsolete! (0dec01379d3b) |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1522 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1523 $ hg update 0dec01379d3b |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1524 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1525 working directory parent is obsolete! (0dec01379d3b) |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1526 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1527 $ hg update --hidden 'desc(B0)' |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1528 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1529 working directory parent is obsolete! (0dec01379d3b) |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1530 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
2349
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1531 |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1532 Test output with pushed and pulled obs markers |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1533 ============================================== |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1534 |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1535 Test setup |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1536 ---------- |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1537 |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1538 $ hg init $TESTTMP/local-remote-markers-1 |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1539 $ cd $TESTTMP/local-remote-markers-1 |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1540 $ mkcommit ROOT |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1541 $ mkcommit A0 |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1542 $ hg log --hidden -G |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1543 @ changeset: 1:471f378eab4c |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1544 | tag: tip |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1545 | user: test |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1546 | date: Thu Jan 01 00:00:00 1970 +0000 |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1547 | summary: A0 |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1548 | |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1549 o changeset: 0:ea207398892e |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1550 user: test |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1551 date: Thu Jan 01 00:00:00 1970 +0000 |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1552 summary: ROOT |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1553 |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1554 $ hg clone $TESTTMP/local-remote-markers-1 $TESTTMP/local-remote-markers-2 |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1555 updating to branch default |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1556 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1557 $ cd $TESTTMP/local-remote-markers-2 |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1558 $ hg log --hidden -G |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1559 @ changeset: 1:471f378eab4c |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1560 | tag: tip |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1561 | user: test |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1562 | date: Thu Jan 01 00:00:00 1970 +0000 |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1563 | summary: A0 |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1564 | |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1565 o changeset: 0:ea207398892e |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1566 user: test |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1567 date: Thu Jan 01 00:00:00 1970 +0000 |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1568 summary: ROOT |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1569 |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1570 $ cd $TESTTMP/local-remote-markers-1 |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1571 $ hg amend -m "A1" |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1572 $ hg amend -m "A2" |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1573 $ hg log --hidden -G |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1574 @ changeset: 3:7a230b46bf61 |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1575 | tag: tip |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1576 | parent: 0:ea207398892e |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1577 | user: test |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1578 | date: Thu Jan 01 00:00:00 1970 +0000 |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1579 | summary: A2 |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1580 | |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1581 | x changeset: 2:fdf9bde5129a |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1582 |/ parent: 0:ea207398892e |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1583 | user: test |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1584 | date: Thu Jan 01 00:00:00 1970 +0000 |
3098
87b83a3e0392
test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3083
diff
changeset
|
1585 | obsolete: reworded as 7a230b46bf61 |
2349
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1586 | summary: A1 |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1587 | |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1588 | x changeset: 1:471f378eab4c |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1589 |/ user: test |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1590 | date: Thu Jan 01 00:00:00 1970 +0000 |
3098
87b83a3e0392
test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3083
diff
changeset
|
1591 | obsolete: reworded as fdf9bde5129a |
2349
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1592 | summary: A0 |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1593 | |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1594 o changeset: 0:ea207398892e |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1595 user: test |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1596 date: Thu Jan 01 00:00:00 1970 +0000 |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1597 summary: ROOT |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1598 |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1599 Actual test |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1600 ----------- |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1601 |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
1602 $ hg obslog 7a230b46bf61 --patch |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1603 @ 7a230b46bf61 (3) A2 |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1604 | |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1605 x fdf9bde5129a (2) A1 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1606 | rewritten(description) as 7a230b46bf61 by test (*) (glob) |
2639
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1607 | --- a/fdf9bde5129a-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1608 | +++ b/7a230b46bf61-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1609 | @@ -1,1 +1,1 @@ |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1610 | -A1 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1611 | +A2 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1612 | |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1613 | |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1614 x 471f378eab4c (1) A0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1615 rewritten(description) as fdf9bde5129a by test (*) (glob) |
2639
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1616 --- a/471f378eab4c-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1617 +++ b/fdf9bde5129a-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1618 @@ -1,1 +1,1 @@ |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1619 -A0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1620 +A1 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1621 |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1622 |
2349
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1623 $ cd $TESTTMP/local-remote-markers-2 |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1624 $ hg pull |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1625 pulling from $TESTTMP/local-remote-markers-1 |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1626 searching for changes |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1627 adding changesets |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1628 adding manifests |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1629 adding file changes |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1630 added 1 changesets with 0 changes to 1 files (+1 heads) |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1631 2 new obsolescence markers |
2710
e22de367fc74
compat: adapt to change in 53b3a1968aa6-core
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2709
diff
changeset
|
1632 obsoleted 1 changesets |
2349
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1633 (run 'hg heads' to see heads, 'hg merge' to merge) |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1634 working directory parent is obsolete! (471f378eab4c) |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1635 (use 'hg evolve' to update to its successor: 7a230b46bf61) |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1636 Check that debugobshistory works with markers pointing to missing local |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1637 changectx |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
1638 $ hg obslog 7a230b46bf61 --patch |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1639 o 7a230b46bf61 (2) A2 |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1640 | |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1641 x fdf9bde5129a |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1642 | rewritten(description) as 7a230b46bf61 by test (*) (glob) |
3055
774b4ea6ca58
obslog: remove the word "yet" from "No patch available yet"
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3054
diff
changeset
|
1643 | (No patch available, context is not local) |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1644 | |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1645 @ 471f378eab4c (1) A0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1646 rewritten(description) as fdf9bde5129a by test (*) (glob) |
3055
774b4ea6ca58
obslog: remove the word "yet" from "No patch available yet"
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3054
diff
changeset
|
1647 (No patch available, successor is unknown locally) |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1648 |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
1649 $ hg obslog 7a230b46bf61 --color=debug --patch |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1650 o [evolve.node|7a230b46bf61] [evolve.rev|(2)] [evolve.short_description|A2] |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1651 | |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1652 x [evolve.node evolve.missing_change_ctx|fdf9bde5129a] |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1653 | [evolve.verb|rewritten](description) as [evolve.node|7a230b46bf61] by [evolve.user|test] [evolve.date|(*)] (glob) |
3055
774b4ea6ca58
obslog: remove the word "yet" from "No patch available yet"
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3054
diff
changeset
|
1654 | (No patch available, context is not local) |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1655 | |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1656 @ [evolve.node|471f378eab4c] [evolve.rev|(1)] [evolve.short_description|A0] |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1657 [evolve.verb|rewritten](description) as [evolve.node|fdf9bde5129a] by [evolve.user|test] [evolve.date|(*)] (glob) |
3055
774b4ea6ca58
obslog: remove the word "yet" from "No patch available yet"
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3054
diff
changeset
|
1658 (No patch available, successor is unknown locally) |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1659 |