409 |
409 |
410 if update: |
410 if update: |
411 if update is not True: |
411 if update is not True: |
412 checkout = srcpeer.lookup(update) |
412 checkout = srcpeer.lookup(update) |
413 uprev = None |
413 uprev = None |
|
414 status = None |
414 if checkout is not None: |
415 if checkout is not None: |
415 try: |
416 try: |
416 uprev = destrepo.lookup(checkout) |
417 uprev = destrepo.lookup(checkout) |
417 except error.RepoLookupError: |
418 except error.RepoLookupError: |
418 pass |
419 pass |
419 if uprev is None: |
420 if uprev is None: |
420 try: |
421 try: |
421 uprev = destrepo._bookmarks['@'] |
422 uprev = destrepo._bookmarks['@'] |
422 update = '@' |
423 update = '@' |
|
424 bn = destrepo[uprev].branch() |
|
425 if bn == 'default': |
|
426 status = _("updating to bookmark @\n") |
|
427 else: |
|
428 status = _("updating to bookmark @ on branch %s\n" |
|
429 % bn) |
423 except KeyError: |
430 except KeyError: |
424 try: |
431 try: |
425 uprev = destrepo.branchtip('default') |
432 uprev = destrepo.branchtip('default') |
426 except error.RepoLookupError: |
433 except error.RepoLookupError: |
427 uprev = destrepo.lookup('tip') |
434 uprev = destrepo.lookup('tip') |
428 bn = destrepo[uprev].branch() |
435 if not status: |
429 destrepo.ui.status(_("updating to branch %s\n") % bn) |
436 bn = destrepo[uprev].branch() |
|
437 status = _("updating to branch %s\n") % bn |
|
438 destrepo.ui.status(status) |
430 _update(destrepo, uprev) |
439 _update(destrepo, uprev) |
431 if update in destrepo._bookmarks: |
440 if update in destrepo._bookmarks: |
432 bookmarks.setcurrent(destrepo, update) |
441 bookmarks.setcurrent(destrepo, update) |
433 |
442 |
434 return srcpeer, destpeer |
443 return srcpeer, destpeer |