comparison mercurial/commands.py @ 16019:eb85d5f89fef stable

bookmarks: move current bookmark on update -u and bare pull -u (issue3222)

Currently, this won't update when a #branch spec is in the URL

16018:ed9f40bc346f

def postincoming(ui, repo, modheads, optupdate, checkout):
    if modheads == 0:
        return
    if optupdate:
        try:
            return hg.update(repo, checkout)
        except util.Abort, inst:
            ui.warn(_("not updating: %s\n" % str(inst)))
            return 0
    if modheads > 1:
        currentbranchheads = len(repo.branchheads())
        if currentbranchheads == modheads:
            ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
        elif currentbranchheads > 1:

16019:eb85d5f89fef

def postincoming(ui, repo, modheads, optupdate, checkout):
    if modheads == 0:
        return
    if optupdate:
        movemarkfrom = repo['.'].node()
        try:
            ret = hg.update(repo, checkout)
        except util.Abort, inst:
            ui.warn(_("not updating: %s\n" % str(inst)))
            return 0
        if not ret and not checkout:
            if bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
                ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent)
        return ret
    if modheads > 1:
        currentbranchheads = len(repo.branchheads())
        if currentbranchheads == modheads:
            ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
        elif currentbranchheads > 1: