equal
deleted
inserted
replaced
356 if not targetancestors: |
356 if not targetancestors: |
357 targetancestors = repo.changelog.ancestors([target], inclusive=True) |
357 targetancestors = repo.changelog.ancestors([target], inclusive=True) |
358 |
358 |
359 # Keep track of the current bookmarks in order to reset them later |
359 # Keep track of the current bookmarks in order to reset them later |
360 currentbookmarks = repo._bookmarks.copy() |
360 currentbookmarks = repo._bookmarks.copy() |
361 activebookmark = activebookmark or repo._bookmarkcurrent |
361 activebookmark = activebookmark or repo._activebookmark |
362 if activebookmark: |
362 if activebookmark: |
363 bookmarks.deactivate(repo) |
363 bookmarks.deactivate(repo) |
364 |
364 |
365 extrafn = _makeextrafn(extrafns) |
365 extrafn = _makeextrafn(extrafns) |
366 |
366 |
1050 if dest != repo['.'].rev(): |
1050 if dest != repo['.'].rev(): |
1051 # there was nothing to rebase we force an update |
1051 # there was nothing to rebase we force an update |
1052 hg.update(repo, dest) |
1052 hg.update(repo, dest) |
1053 if bookmarks.update(repo, [movemarkfrom], repo['.'].node()): |
1053 if bookmarks.update(repo, [movemarkfrom], repo['.'].node()): |
1054 ui.status(_("updating bookmark %s\n") |
1054 ui.status(_("updating bookmark %s\n") |
1055 % repo._bookmarkcurrent) |
1055 % repo._activebookmark) |
1056 else: |
1056 else: |
1057 if opts.get('tool'): |
1057 if opts.get('tool'): |
1058 raise util.Abort(_('--tool can only be used with --rebase')) |
1058 raise util.Abort(_('--tool can only be used with --rebase')) |
1059 orig(ui, repo, *args, **opts) |
1059 orig(ui, repo, *args, **opts) |
1060 |
1060 |