64 |
64 |
65 Actual test |
65 Actual test |
66 ----------- |
66 ----------- |
67 |
67 |
68 Check that obslog on the public revision shows both public (diverged) and draft (divergent) revisions |
68 Check that obslog on the public revision shows both public (diverged) and draft (divergent) revisions |
69 $ hg obslog --hidden 471f378eab4c --patch |
69 $ hg obslog --hidden 471f378eab4c --patch --no-origin |
70 @ 471f378eab4c (1) A0 |
70 @ 471f378eab4c (1) A0 |
71 reworded(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
71 reworded(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
72 diff -r 471f378eab4c -r fdf9bde5129a changeset-description |
72 diff -r 471f378eab4c -r fdf9bde5129a changeset-description |
73 --- a/changeset-description |
73 --- a/changeset-description |
74 +++ b/changeset-description |
74 +++ b/changeset-description |
120 ], |
133 ], |
121 "node": "471f378eab4c5e25f6c77f785b27c936efb22874", |
134 "node": "471f378eab4c5e25f6c77f785b27c936efb22874", |
122 "shortdescription": "A0" |
135 "shortdescription": "A0" |
123 } |
136 } |
124 ] |
137 ] |
|
138 $ hg obslog --hidden 471f378eab4c --no-graph -Tjson | python -m json.tool |
|
139 [ |
|
140 { |
|
141 "markers": [], |
|
142 "node": "471f378eab4c5e25f6c77f785b27c936efb22874", |
|
143 "shortdescription": "A0" |
|
144 } |
|
145 ] |
125 Check that obslog on the draft (divergent) revision also shows public (diverged) revision |
146 Check that obslog on the draft (divergent) revision also shows public (diverged) revision |
126 $ hg obslog fdf9bde5129a --patch |
147 $ hg obslog fdf9bde5129a --patch |
127 * fdf9bde5129a (2) A1 |
148 * fdf9bde5129a (2) A1 |
128 | |
149 | reworded(description) from 471f378eab4c using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
129 @ 471f378eab4c (1) A0 |
150 | diff -r 471f378eab4c -r fdf9bde5129a changeset-description |
130 reworded(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
151 | --- a/changeset-description |
131 diff -r 471f378eab4c -r fdf9bde5129a changeset-description |
152 | +++ b/changeset-description |
132 --- a/changeset-description |
153 | @@ -1,1 +1,1 @@ |
133 +++ b/changeset-description |
154 | -A0 |
134 @@ -1,1 +1,1 @@ |
155 | +A1 |
135 -A0 |
156 | |
136 +A1 |
157 | |
137 |
158 @ 471f378eab4c (1) A0 |
138 |
159 |
139 |
160 |
140 Check that all option shows all of them |
161 Check that all option shows all of them |
141 $ hg obslog fdf9bde5129a -a --patch |
162 $ hg obslog fdf9bde5129a -a --patch |
142 * fdf9bde5129a (2) A1 |
163 * fdf9bde5129a (2) A1 |
143 | |
164 | reworded(description) from 471f378eab4c using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
144 @ 471f378eab4c (1) A0 |
165 | diff -r 471f378eab4c -r fdf9bde5129a changeset-description |
145 reworded(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
166 | --- a/changeset-description |
146 diff -r 471f378eab4c -r fdf9bde5129a changeset-description |
167 | +++ b/changeset-description |
147 --- a/changeset-description |
168 | @@ -1,1 +1,1 @@ |
148 +++ b/changeset-description |
169 | -A0 |
149 @@ -1,1 +1,1 @@ |
170 | +A1 |
150 -A0 |
171 | |
151 +A1 |
172 | |
152 |
173 @ 471f378eab4c (1) A0 |
153 |
174 |
154 Check that obslog on the both draft (divergent) and public (diverged) revisions shows a coherent graph |
175 Check that obslog on the both draft (divergent) and public (diverged) revisions shows a coherent graph |
155 $ hg obslog 'fdf9bde5129a+471f378eab4c' --patch |
176 $ hg obslog 'fdf9bde5129a+471f378eab4c' --patch |
156 * fdf9bde5129a (2) A1 |
177 * fdf9bde5129a (2) A1 |
157 | |
178 | reworded(description) from 471f378eab4c using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
158 @ 471f378eab4c (1) A0 |
179 | diff -r 471f378eab4c -r fdf9bde5129a changeset-description |
159 reworded(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
180 | --- a/changeset-description |
160 diff -r 471f378eab4c -r fdf9bde5129a changeset-description |
181 | +++ b/changeset-description |
161 --- a/changeset-description |
182 | @@ -1,1 +1,1 @@ |
162 +++ b/changeset-description |
183 | -A0 |
163 @@ -1,1 +1,1 @@ |
184 | +A1 |
164 -A0 |
185 | |
165 +A1 |
186 | |
166 |
187 @ 471f378eab4c (1) A0 |
167 |
188 |
168 $ hg obslog 'fdf9bde5129a+471f378eab4c' --no-graph -Tjson | python -m json.tool |
189 $ hg obslog 'fdf9bde5129a+471f378eab4c' --no-graph --no-origin -Tjson | python -m json.tool |
169 [ |
190 [ |
170 { |
191 { |
171 "markers": [], |
192 "markers": [], |
172 "node": "fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e", |
193 "node": "fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e", |
173 "shortdescription": "A1" |
194 "shortdescription": "A1" |
198 ], |
219 ], |
199 "node": "471f378eab4c5e25f6c77f785b27c936efb22874", |
220 "node": "471f378eab4c5e25f6c77f785b27c936efb22874", |
200 "shortdescription": "A0" |
221 "shortdescription": "A0" |
201 } |
222 } |
202 ] |
223 ] |
|
224 $ hg obslog 'fdf9bde5129a+471f378eab4c' --no-graph -Tjson | python -m json.tool |
|
225 [ |
|
226 { |
|
227 "markers": [ |
|
228 { |
|
229 "dates": [ |
|
230 [ |
|
231 0.0, |
|
232 0 |
|
233 ] |
|
234 ], |
|
235 "effects": [ |
|
236 "description" |
|
237 ], |
|
238 "operations": [ |
|
239 "amend" |
|
240 ], |
|
241 "prednodes": [ |
|
242 "471f378eab4c5e25f6c77f785b27c936efb22874" |
|
243 ], |
|
244 "users": [ |
|
245 "test" |
|
246 ], |
|
247 "verb": "reworded" |
|
248 } |
|
249 ], |
|
250 "node": "fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e", |
|
251 "shortdescription": "A1" |
|
252 }, |
|
253 { |
|
254 "markers": [], |
|
255 "node": "471f378eab4c5e25f6c77f785b27c936efb22874", |
|
256 "shortdescription": "A0" |
|
257 } |
|
258 ] |
203 $ hg update 471f378eab4c |
259 $ hg update 471f378eab4c |
204 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
260 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
205 $ hg update --hidden 'desc(A0)' |
261 $ hg update --hidden 'desc(A0)' |
206 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
262 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |