91 @@ -1,1 +1,1 @@ |
90 @@ -1,1 +1,1 @@ |
92 -A0 |
91 -A0 |
93 +A1 |
92 +A1 |
94 |
93 |
95 |
94 |
96 $ hg obslog --hidden 471f378eab4c --no-graph -Tjson | python -m json.tool |
95 $ hg obslog --hidden --all 471f378eab4c --patch |
|
96 * fdf9bde5129a (2) A1 |
|
97 | reworded(description) from 471f378eab4c using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
|
98 | diff -r 471f378eab4c -r fdf9bde5129a changeset-description |
|
99 | --- a/changeset-description |
|
100 | +++ b/changeset-description |
|
101 | @@ -1,1 +1,1 @@ |
|
102 | -A0 |
|
103 | +A1 |
|
104 | |
|
105 | |
|
106 @ 471f378eab4c (1) A0 |
|
107 |
|
108 $ hg obslog --hidden 471f378eab4c --no-graph --no-origin -Tjson | python -m json.tool |
97 [ |
109 [ |
98 { |
110 { |
99 "markers": [ |
111 "markers": [ |
100 { |
112 { |
101 "date": [ |
113 "dates": [ |
102 *, (glob) |
114 [ |
103 0 |
115 *, (glob) |
|
116 0 |
|
117 ] |
104 ], |
118 ], |
105 "effects": [ |
119 "effects": [ |
106 "description" |
120 "description" |
107 ], |
121 ], |
108 "operation": "amend", |
122 "operations": [ |
|
123 "amend" |
|
124 ], |
109 "succnodes": [ |
125 "succnodes": [ |
110 "fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e" |
126 "fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e" |
111 ], |
127 ], |
112 "user": "test", |
128 "users": [ |
|
129 "test" |
|
130 ], |
113 "verb": "reworded" |
131 "verb": "reworded" |
114 } |
132 } |
115 ], |
133 ], |
116 "node": "471f378eab4c5e25f6c77f785b27c936efb22874", |
134 "node": "471f378eab4c5e25f6c77f785b27c936efb22874", |
117 "shortdescription": "A0" |
135 "shortdescription": "A0" |
118 } |
136 } |
119 ] |
137 ] |
120 Check that debugobshistory on the first diverged revision show the revision |
138 $ hg obslog --hidden 471f378eab4c --no-graph -Tjson | python -m json.tool |
121 and the diverent one |
139 [ |
|
140 { |
|
141 "markers": [], |
|
142 "node": "471f378eab4c5e25f6c77f785b27c936efb22874", |
|
143 "shortdescription": "A0" |
|
144 } |
|
145 ] |
|
146 Check that obslog on the draft (divergent) revision also shows public (diverged) revision |
122 $ hg obslog fdf9bde5129a --patch |
147 $ hg obslog fdf9bde5129a --patch |
123 * fdf9bde5129a (2) A1 |
148 * fdf9bde5129a (2) A1 |
124 | |
149 | reworded(description) from 471f378eab4c using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
125 @ 471f378eab4c (1) A0 |
150 | diff -r 471f378eab4c -r fdf9bde5129a changeset-description |
126 reworded(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
151 | --- a/changeset-description |
127 diff -r 471f378eab4c -r fdf9bde5129a changeset-description |
152 | +++ b/changeset-description |
128 --- a/changeset-description |
153 | @@ -1,1 +1,1 @@ |
129 +++ b/changeset-description |
154 | -A0 |
130 @@ -1,1 +1,1 @@ |
155 | +A1 |
131 -A0 |
156 | |
132 +A1 |
157 | |
133 |
158 @ 471f378eab4c (1) A0 |
134 |
159 |
135 |
160 |
136 Check that all option show all of them |
161 Check that all option shows all of them |
137 $ hg obslog fdf9bde5129a -a --patch |
162 $ hg obslog fdf9bde5129a -a --patch |
138 * fdf9bde5129a (2) A1 |
163 * fdf9bde5129a (2) A1 |
139 | |
164 | reworded(description) from 471f378eab4c using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
140 @ 471f378eab4c (1) A0 |
165 | diff -r 471f378eab4c -r fdf9bde5129a changeset-description |
141 reworded(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
166 | --- a/changeset-description |
142 diff -r 471f378eab4c -r fdf9bde5129a changeset-description |
167 | +++ b/changeset-description |
143 --- a/changeset-description |
168 | @@ -1,1 +1,1 @@ |
144 +++ b/changeset-description |
169 | -A0 |
145 @@ -1,1 +1,1 @@ |
170 | +A1 |
146 -A0 |
171 | |
147 +A1 |
172 | |
148 |
173 @ 471f378eab4c (1) A0 |
149 |
174 |
150 Check that debugobshistory on the second diverged revision show the revision |
175 Check that obslog on the both draft (divergent) and public (diverged) revisions shows a coherent graph |
151 and the diverent one |
176 $ hg obslog 'fdf9bde5129a+471f378eab4c' --patch |
152 $ hg obslog fdf9bde5129a --patch |
177 * fdf9bde5129a (2) A1 |
153 * fdf9bde5129a (2) A1 |
178 | reworded(description) from 471f378eab4c using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
154 | |
179 | diff -r 471f378eab4c -r fdf9bde5129a changeset-description |
155 @ 471f378eab4c (1) A0 |
180 | --- a/changeset-description |
156 reworded(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
181 | +++ b/changeset-description |
157 diff -r 471f378eab4c -r fdf9bde5129a changeset-description |
182 | @@ -1,1 +1,1 @@ |
158 --- a/changeset-description |
183 | -A0 |
159 +++ b/changeset-description |
184 | +A1 |
160 @@ -1,1 +1,1 @@ |
185 | |
161 -A0 |
186 | |
162 +A1 |
187 @ 471f378eab4c (1) A0 |
163 |
188 |
164 |
189 $ hg obslog 'fdf9bde5129a+471f378eab4c' --no-graph --no-origin -Tjson | python -m json.tool |
165 Check that all option show all of them |
|
166 $ hg obslog fdf9bde5129a -a --patch |
|
167 * fdf9bde5129a (2) A1 |
|
168 | |
|
169 @ 471f378eab4c (1) A0 |
|
170 reworded(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
|
171 diff -r 471f378eab4c -r fdf9bde5129a changeset-description |
|
172 --- a/changeset-description |
|
173 +++ b/changeset-description |
|
174 @@ -1,1 +1,1 @@ |
|
175 -A0 |
|
176 +A1 |
|
177 |
|
178 |
|
179 Check that debugobshistory on the both diverged revision show a coherent |
|
180 graph |
|
181 $ hg obslog 'fdf9bde5129a+fdf9bde5129a' --patch |
|
182 * fdf9bde5129a (2) A1 |
|
183 | |
|
184 @ 471f378eab4c (1) A0 |
|
185 reworded(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
|
186 diff -r 471f378eab4c -r fdf9bde5129a changeset-description |
|
187 --- a/changeset-description |
|
188 +++ b/changeset-description |
|
189 @@ -1,1 +1,1 @@ |
|
190 -A0 |
|
191 +A1 |
|
192 |
|
193 |
|
194 $ hg obslog 'fdf9bde5129a+fdf9bde5129a' --no-graph -Tjson | python -m json.tool |
|
195 [ |
190 [ |
196 { |
191 { |
197 "markers": [], |
192 "markers": [], |
198 "node": "fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e", |
193 "node": "fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e", |
199 "shortdescription": "A1" |
194 "shortdescription": "A1" |
200 }, |
195 }, |
201 { |
196 { |
202 "markers": [ |
197 "markers": [ |
203 { |
198 { |
204 "date": [ |
199 "dates": [ |
205 0.0, |
200 [ |
206 0 |
201 0.0, |
|
202 0 |
|
203 ] |
207 ], |
204 ], |
208 "effects": [ |
205 "effects": [ |
209 "description" |
206 "description" |
210 ], |
207 ], |
211 "operation": "amend", |
208 "operations": [ |
|
209 "amend" |
|
210 ], |
212 "succnodes": [ |
211 "succnodes": [ |
213 "fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e" |
212 "fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e" |
214 ], |
213 ], |
215 "user": "test", |
214 "users": [ |
|
215 "test" |
|
216 ], |
216 "verb": "reworded" |
217 "verb": "reworded" |
217 } |
218 } |
218 ], |
219 ], |
|
220 "node": "471f378eab4c5e25f6c77f785b27c936efb22874", |
|
221 "shortdescription": "A0" |
|
222 } |
|
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": [], |
219 "node": "471f378eab4c5e25f6c77f785b27c936efb22874", |
255 "node": "471f378eab4c5e25f6c77f785b27c936efb22874", |
220 "shortdescription": "A0" |
256 "shortdescription": "A0" |
221 } |
257 } |
222 ] |
258 ] |
223 $ hg update 471f378eab4c |
259 $ hg update 471f378eab4c |