equal
deleted
inserted
replaced
143 | | |
143 | | |
144 | o changeset: 6:87d6d6676308 |
144 | o changeset: 6:87d6d6676308 |
145 | | bookmark: bar |
145 | | bookmark: bar |
146 | | remote bookmark: $TESTTMP/server2/bar |
146 | | remote bookmark: $TESTTMP/server2/bar |
147 | | remote bookmark: default/bar |
147 | | remote bookmark: default/bar |
|
148 | | hoisted name: bar |
148 | | user: test |
149 | | user: test |
149 | | date: Thu Jan 01 00:00:00 1970 +0000 |
150 | | date: Thu Jan 01 00:00:00 1970 +0000 |
150 | | summary: Added g |
151 | | summary: Added g |
151 | | |
152 | | |
152 | o changeset: 5:825660c69f0c |
153 | o changeset: 5:825660c69f0c |
161 | |
162 | |
162 o changeset: 3:62615734edd5 |
163 o changeset: 3:62615734edd5 |
163 | bookmark: foo |
164 | bookmark: foo |
164 | remote bookmark: $TESTTMP/server2/foo |
165 | remote bookmark: $TESTTMP/server2/foo |
165 | remote bookmark: default/foo |
166 | remote bookmark: default/foo |
|
167 | hoisted name: foo |
166 | user: test |
168 | user: test |
167 | date: Thu Jan 01 00:00:00 1970 +0000 |
169 | date: Thu Jan 01 00:00:00 1970 +0000 |
168 | summary: Added d |
170 | summary: Added d |
169 | |
171 | |
170 o changeset: 2:28ad74487de9 |
172 o changeset: 2:28ad74487de9 |
224 | |
226 | |
225 o 1:29becc82797a [] () |
227 o 1:29becc82797a [] () |
226 | |
228 | |
227 o 0:18d04c59bb5d [] () |
229 o 0:18d04c59bb5d [] () |
228 |
230 |
|
231 The `hoistednames` template keyword |
|
232 |
|
233 $ hg log -GT "{rev}:{node|short} ({hoistednames})" |
|
234 @ 8:3e1487808078 () |
|
235 | |
|
236 | o 7:ec2426147f0e () |
|
237 | | |
|
238 | o 6:87d6d6676308 (bar) |
|
239 | | |
|
240 | o 5:825660c69f0c () |
|
241 |/ |
|
242 o 4:aa98ab95a928 () |
|
243 | |
|
244 o 3:62615734edd5 (foo) |
|
245 | |
|
246 o 2:28ad74487de9 () |
|
247 | |
|
248 o 1:29becc82797a () |
|
249 | |
|
250 o 0:18d04c59bb5d () |
|
251 |
|
252 |
229 Testing the revsets provided by remotenames extension |
253 Testing the revsets provided by remotenames extension |
230 |
254 |
231 `remotenames` revset |
255 `remotenames` revset |
232 |
256 |
233 $ hg log -r "remotenames()" -GT "{rev}:{node|short} {remotenames}\n" |
257 $ hg log -r "remotenames()" -GT "{rev}:{node|short} {remotenames}\n" |
257 o 6:87d6d6676308 $TESTTMP/server2/bar default/bar |
281 o 6:87d6d6676308 $TESTTMP/server2/bar default/bar |
258 : |
282 : |
259 o 3:62615734edd5 $TESTTMP/server2/foo default/foo |
283 o 3:62615734edd5 $TESTTMP/server2/foo default/foo |
260 | |
284 | |
261 ~ |
285 ~ |
|
286 |
|
287 Updating to revision using hoisted name |
|
288 |
|
289 Deleting local bookmark to make sure we update to hoisted name only |
|
290 |
|
291 $ hg bookmark -d bar |
|
292 |
|
293 $ hg up bar |
|
294 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
295 |
|
296 $ hg log -r . |
|
297 changeset: 6:87d6d6676308 |
|
298 remote bookmark: $TESTTMP/server2/bar |
|
299 remote bookmark: default/bar |
|
300 hoisted name: bar |
|
301 user: test |
|
302 date: Thu Jan 01 00:00:00 1970 +0000 |
|
303 summary: Added g |
|
304 |
|
305 When both local bookmark and hoisted name exists but on different revs |
|
306 |
|
307 $ hg up 8 |
|
308 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
309 |
|
310 $ hg bookmark foo |
|
311 moving bookmark 'foo' forward from 62615734edd5 |
|
312 |
|
313 Local bookmark should take precedence over hoisted name |
|
314 |
|
315 $ hg up foo |
|
316 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
317 |
|
318 $ hg log -r . |
|
319 changeset: 8:3e1487808078 |
|
320 branch: wat |
|
321 bookmark: foo |
|
322 tag: tip |
|
323 remote branch: $TESTTMP/server2/wat |
|
324 remote branch: default/wat |
|
325 parent: 4:aa98ab95a928 |
|
326 user: test |
|
327 date: Thu Jan 01 00:00:00 1970 +0000 |
|
328 summary: added bar |
|
329 |