Show More
@@ -169,7 +169,7 b' def listbookmarks(repo):' | |||||
169 | d = {} |
|
169 | d = {} | |
170 | for k, v in marks.iteritems(): |
|
170 | for k, v in marks.iteritems(): | |
171 | # don't expose local divergent bookmarks |
|
171 | # don't expose local divergent bookmarks | |
172 |
if '@' not in k |
|
172 | if '@' not in k or k.endswith('@'): | |
173 | d[k] = hex(v) |
|
173 | d[k] = hex(v) | |
174 | return d |
|
174 | return d | |
175 |
|
175 |
@@ -356,7 +356,7 b' def clone(ui, peeropts, source, dest=Non' | |||||
356 | if dircleanup: |
|
356 | if dircleanup: | |
357 | dircleanup.close() |
|
357 | dircleanup.close() | |
358 |
|
358 | |||
359 | # clone all bookmarks |
|
359 | # clone all bookmarks except divergent ones | |
360 | if destrepo.local() and srcrepo.capable("pushkey"): |
|
360 | if destrepo.local() and srcrepo.capable("pushkey"): | |
361 | rb = srcrepo.listkeys('bookmarks') |
|
361 | rb = srcrepo.listkeys('bookmarks') | |
362 | for k, n in rb.iteritems(): |
|
362 | for k, n in rb.iteritems(): |
@@ -269,18 +269,24 b' test rollback' | |||||
269 |
|
269 | |||
270 | test clone |
|
270 | test clone | |
271 |
|
271 | |||
|
272 | $ hg bookmark -r 2 -i @ | |||
|
273 | $ hg bookmark -r 2 -i a@ | |||
272 | $ hg bookmarks |
|
274 | $ hg bookmarks | |
|
275 | @ 2:db815d6d32e6 | |||
273 | X2 1:925d80f479bb |
|
276 | X2 1:925d80f479bb | |
274 | Y 2:db815d6d32e6 |
|
277 | Y 2:db815d6d32e6 | |
275 | * Z 2:db815d6d32e6 |
|
278 | * Z 2:db815d6d32e6 | |
|
279 | a@ 2:db815d6d32e6 | |||
276 | x y 2:db815d6d32e6 |
|
280 | x y 2:db815d6d32e6 | |
277 |
$ |
|
281 | $ hg clone . cloned-bookmarks | |
278 | updating to branch default |
|
282 | updating to branch default | |
279 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
283 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
280 | $ hg -R cloned-bookmarks bookmarks |
|
284 | $ hg -R cloned-bookmarks bookmarks | |
|
285 | @ 2:db815d6d32e6 | |||
281 | X2 1:925d80f479bb |
|
286 | X2 1:925d80f479bb | |
282 | Y 2:db815d6d32e6 |
|
287 | Y 2:db815d6d32e6 | |
283 | Z 2:db815d6d32e6 |
|
288 | Z 2:db815d6d32e6 | |
|
289 | a@ 2:db815d6d32e6 | |||
284 | x y 2:db815d6d32e6 |
|
290 | x y 2:db815d6d32e6 | |
285 |
|
291 | |||
286 | test clone with pull protocol |
|
292 | test clone with pull protocol | |
@@ -294,11 +300,16 b' test clone with pull protocol' | |||||
294 | updating to branch default |
|
300 | updating to branch default | |
295 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
301 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
296 | $ hg -R cloned-bookmarks-pull bookmarks |
|
302 | $ hg -R cloned-bookmarks-pull bookmarks | |
|
303 | @ 2:db815d6d32e6 | |||
297 | X2 1:925d80f479bb |
|
304 | X2 1:925d80f479bb | |
298 | Y 2:db815d6d32e6 |
|
305 | Y 2:db815d6d32e6 | |
299 | Z 2:db815d6d32e6 |
|
306 | Z 2:db815d6d32e6 | |
|
307 | a@ 2:db815d6d32e6 | |||
300 | x y 2:db815d6d32e6 |
|
308 | x y 2:db815d6d32e6 | |
301 |
|
309 | |||
|
310 | $ hg bookmark -d @ | |||
|
311 | $ hg bookmark -d a@ | |||
|
312 | ||||
302 | test clone with a specific revision |
|
313 | test clone with a specific revision | |
303 |
|
314 | |||
304 | $ hg clone -r 925d80 . cloned-bookmarks-rev |
|
315 | $ hg clone -r 925d80 . cloned-bookmarks-rev |
General Comments 0
You need to be logged in to leave comments.
Login now