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