comparison mercurial/commands.py @ 22626:fb74a5833467

pull: gather all bookmark-pulling code together

Pulling bookmarks is done in two rounds. First we do a simple update, then we use
the content of the `bookmark` argument to possibly overwrite some bookmark
with their remote location.

The second step was not done right after the first one for some obscure reason.
We now perform them one after the other.

22625:62ab9ca90b36

                        "so a rev cannot be specified.")
                raise util.Abort(err)

        modheads = repo.pull(other, heads=revs, force=opts.get('force'))
        bookmarks.updatefromremote(ui, repo, remotebookmarks, source)
        if checkout:
            checkout = str(repo.changelog.rev(other.lookup(checkout)))
        repo._subtoppath = source
        try:
            ret = postincoming(ui, repo, modheads, opts.get('update'), checkout)

        finally:
            del repo._subtoppath

        # update specified bookmarks
        if opts.get('bookmark'):
            marks = repo._bookmarks
            for b in opts['bookmark']:
                # explicit pull overrides local bookmark if any
                ui.status(_("importing bookmark %s\n") % b)
                marks[b] = repo[remotebookmarks[b]].node()
            marks.write()
    finally:
        other.close()
    return ret

@command('^push',

22626:fb74a5833467

                        "so a rev cannot be specified.")
                raise util.Abort(err)

        modheads = repo.pull(other, heads=revs, force=opts.get('force'))
        bookmarks.updatefromremote(ui, repo, remotebookmarks, source)
        # update specified bookmarks
        if opts.get('bookmark'):
            marks = repo._bookmarks
            for b in opts['bookmark']:
                # explicit pull overrides local bookmark if any
                ui.status(_("importing bookmark %s\n") % b)
                marks[b] = repo[remotebookmarks[b]].node()
            marks.write()
        if checkout:
            checkout = str(repo.changelog.rev(other.lookup(checkout)))
        repo._subtoppath = source
        try:
            ret = postincoming(ui, repo, modheads, opts.get('update'), checkout)

        finally:
            del repo._subtoppath

    finally:
        other.close()
    return ret

@command('^push',