equal
deleted
inserted
replaced
1011 uprev = destrepo.lookup(update) |
1011 uprev = destrepo.lookup(update) |
1012 except error.RepoLookupError: |
1012 except error.RepoLookupError: |
1013 pass |
1013 pass |
1014 if uprev is None: |
1014 if uprev is None: |
1015 try: |
1015 try: |
1016 uprev = destrepo._bookmarks[b'@'] |
1016 if destrepo._activebookmark: |
1017 update = b'@' |
1017 uprev = destrepo.lookup(destrepo._activebookmark) |
|
1018 update = destrepo._activebookmark |
|
1019 else: |
|
1020 uprev = destrepo._bookmarks[b'@'] |
|
1021 update = b'@' |
1018 bn = destrepo[uprev].branch() |
1022 bn = destrepo[uprev].branch() |
1019 if bn == b'default': |
1023 if bn == b'default': |
1020 status = _(b"updating to bookmark @\n") |
1024 status = _(b"updating to bookmark %s\n" % update) |
1021 else: |
1025 else: |
1022 status = ( |
1026 status = ( |
1023 _(b"updating to bookmark @ on branch %s\n") % bn |
1027 _(b"updating to bookmark %s on branch %s\n") |
1024 ) |
1028 ) % (update, bn) |
1025 except KeyError: |
1029 except KeyError: |
1026 try: |
1030 try: |
1027 uprev = destrepo.branchtip(b'default') |
1031 uprev = destrepo.branchtip(b'default') |
1028 except error.RepoLookupError: |
1032 except error.RepoLookupError: |
1029 uprev = destrepo.lookup(b'tip') |
1033 uprev = destrepo.lookup(b'tip') |