20 @ 000000000000 (-1) |
20 @ 000000000000 (-1) |
21 |
21 |
22 $ hg obslog 'wdir()' |
22 $ hg obslog 'wdir()' |
23 abort: working directory revision cannot be specified |
23 abort: working directory revision cannot be specified |
24 [255] |
24 [255] |
25 |
|
26 Test output with folded commit |
|
27 ============================== |
|
28 |
|
29 Test setup |
|
30 ---------- |
|
31 |
|
32 $ hg init $TESTTMP/local-fold |
|
33 $ cd $TESTTMP/local-fold |
|
34 $ mkcommit ROOT |
|
35 $ mkcommit A0 |
|
36 $ mkcommit B0 |
|
37 $ hg log --hidden -G |
|
38 @ changeset: 2:0dec01379d3b |
|
39 | tag: tip |
|
40 | user: test |
|
41 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
42 | summary: B0 |
|
43 | |
|
44 o changeset: 1:471f378eab4c |
|
45 | user: test |
|
46 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
47 | summary: A0 |
|
48 | |
|
49 o changeset: 0:ea207398892e |
|
50 user: test |
|
51 date: Thu Jan 01 00:00:00 1970 +0000 |
|
52 summary: ROOT |
|
53 |
|
54 $ hg fold --exact -r 'desc(A0) + desc(B0)' --date "0 0" -m "C0" |
|
55 2 changesets folded |
|
56 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
57 $ hg log --hidden -G |
|
58 @ changeset: 3:eb5a0daa2192 |
|
59 | tag: tip |
|
60 | parent: 0:ea207398892e |
|
61 | user: test |
|
62 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
63 | summary: C0 |
|
64 | |
|
65 | x changeset: 2:0dec01379d3b |
|
66 | | user: test |
|
67 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
68 | | obsolete: rewritten using fold as 3:eb5a0daa2192 |
|
69 | | summary: B0 |
|
70 | | |
|
71 | x changeset: 1:471f378eab4c |
|
72 |/ user: test |
|
73 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
74 | obsolete: rewritten using fold as 3:eb5a0daa2192 |
|
75 | summary: A0 |
|
76 | |
|
77 o changeset: 0:ea207398892e |
|
78 user: test |
|
79 date: Thu Jan 01 00:00:00 1970 +0000 |
|
80 summary: ROOT |
|
81 |
|
82 Actual test |
|
83 ----------- |
|
84 |
|
85 Check that debugobshistory on the first folded revision show only |
|
86 the revision with the target |
|
87 $ hg obslog --hidden 471f378eab4c --patch |
|
88 x 471f378eab4c (1) A0 |
|
89 rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
|
90 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description |
|
91 --- a/changeset-description |
|
92 +++ b/changeset-description |
|
93 @@ -1,1 +1,1 @@ |
|
94 -A0 |
|
95 +C0 |
|
96 |
|
97 diff -r 471f378eab4c -r eb5a0daa2192 B0 |
|
98 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
99 +++ b/B0 Thu Jan 01 00:00:00 1970 +0000 |
|
100 @@ -0,0 +1,1 @@ |
|
101 +B0 |
|
102 |
|
103 |
|
104 Check that with all option, all changesets are shown |
|
105 $ hg obslog --hidden --all 471f378eab4c --patch |
|
106 @ eb5a0daa2192 (3) C0 |
|
107 |\ |
|
108 x | 0dec01379d3b (2) B0 |
|
109 / rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
|
110 | (No patch available, changesets rebased) |
|
111 | |
|
112 x 471f378eab4c (1) A0 |
|
113 rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
|
114 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description |
|
115 --- a/changeset-description |
|
116 +++ b/changeset-description |
|
117 @@ -1,1 +1,1 @@ |
|
118 -A0 |
|
119 +C0 |
|
120 |
|
121 diff -r 471f378eab4c -r eb5a0daa2192 B0 |
|
122 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
123 +++ b/B0 Thu Jan 01 00:00:00 1970 +0000 |
|
124 @@ -0,0 +1,1 @@ |
|
125 +B0 |
|
126 |
|
127 |
|
128 Check that debugobshistory on the second folded revision show only |
|
129 the revision with the target |
|
130 $ hg obslog --hidden 0dec01379d3b --patch |
|
131 x 0dec01379d3b (2) B0 |
|
132 rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
|
133 (No patch available, changesets rebased) |
|
134 |
|
135 Check that with all option, all changesets are shown |
|
136 $ hg obslog --hidden --all 0dec01379d3b --patch |
|
137 @ eb5a0daa2192 (3) C0 |
|
138 |\ |
|
139 x | 0dec01379d3b (2) B0 |
|
140 / rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
|
141 | (No patch available, changesets rebased) |
|
142 | |
|
143 x 471f378eab4c (1) A0 |
|
144 rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
|
145 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description |
|
146 --- a/changeset-description |
|
147 +++ b/changeset-description |
|
148 @@ -1,1 +1,1 @@ |
|
149 -A0 |
|
150 +C0 |
|
151 |
|
152 diff -r 471f378eab4c -r eb5a0daa2192 B0 |
|
153 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
154 +++ b/B0 Thu Jan 01 00:00:00 1970 +0000 |
|
155 @@ -0,0 +1,1 @@ |
|
156 +B0 |
|
157 |
|
158 |
|
159 Check that debugobshistory on the successor revision show a coherent |
|
160 graph |
|
161 $ hg obslog eb5a0daa2192 --patch |
|
162 @ eb5a0daa2192 (3) C0 |
|
163 |\ |
|
164 x | 0dec01379d3b (2) B0 |
|
165 / rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
|
166 | (No patch available, changesets rebased) |
|
167 | |
|
168 x 471f378eab4c (1) A0 |
|
169 rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
|
170 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description |
|
171 --- a/changeset-description |
|
172 +++ b/changeset-description |
|
173 @@ -1,1 +1,1 @@ |
|
174 -A0 |
|
175 +C0 |
|
176 |
|
177 diff -r 471f378eab4c -r eb5a0daa2192 B0 |
|
178 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
179 +++ b/B0 Thu Jan 01 00:00:00 1970 +0000 |
|
180 @@ -0,0 +1,1 @@ |
|
181 +B0 |
|
182 |
|
183 |
|
184 $ hg obslog eb5a0daa2192 --no-graph -Tjson | python -m json.tool |
|
185 [ |
|
186 { |
|
187 "markers": [], |
|
188 "node": "eb5a0daa2192", |
|
189 "rev": 3, |
|
190 "shortdescription": "C0" |
|
191 }, |
|
192 { |
|
193 "markers": [ |
|
194 { |
|
195 "date": [ |
|
196 *, (glob) |
|
197 0 (glob) |
|
198 ], |
|
199 "effect": [ |
|
200 "description", |
|
201 "content" |
|
202 ], |
|
203 "operation": "fold", |
|
204 "succnodes": [ |
|
205 "eb5a0daa2192" |
|
206 ], |
|
207 "user": "test", |
|
208 "verb": "rewritten" |
|
209 } |
|
210 ], |
|
211 "node": "471f378eab4c", |
|
212 "rev": 1, |
|
213 "shortdescription": "A0" |
|
214 }, |
|
215 { |
|
216 "markers": [ |
|
217 { |
|
218 "date": [ |
|
219 *, (glob) |
|
220 0 (glob) |
|
221 ], |
|
222 "effect": [ |
|
223 "description", |
|
224 "parent", |
|
225 "content" |
|
226 ], |
|
227 "operation": "fold", |
|
228 "succnodes": [ |
|
229 "eb5a0daa2192" |
|
230 ], |
|
231 "user": "test", |
|
232 "verb": "rewritten" |
|
233 } |
|
234 ], |
|
235 "node": "0dec01379d3b", |
|
236 "rev": 2, |
|
237 "shortdescription": "B0" |
|
238 } |
|
239 ] |
|
240 $ hg update 471f378eab4c |
|
241 abort: hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192! |
|
242 (use --hidden to access hidden revisions) |
|
243 [255] |
|
244 $ hg update --hidden 'desc(A0)' |
|
245 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
246 updated to hidden changeset 471f378eab4c |
|
247 (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192) |
|
248 working directory parent is obsolete! (471f378eab4c) |
|
249 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
|
250 $ hg update 0dec01379d3b |
|
251 abort: hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192! |
|
252 (use --hidden to access hidden revisions) |
|
253 [255] |
|
254 $ hg update --hidden 'desc(B0)' |
|
255 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
256 updated to hidden changeset 0dec01379d3b |
|
257 (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192) |
|
258 working directory parent is obsolete! (0dec01379d3b) |
|
259 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
|
260 |
25 |
261 Test output with divergence |
26 Test output with divergence |
262 =========================== |
27 =========================== |
263 |
28 |
264 Test setup |
29 Test setup |