comparison mercurial/commands.py @ 26642:70ac5f724fbd

update: also use 'destupdate' for pull and unbundle

Update can also be performed by 'hg pull --update' and 'hg unbundle'. We use the
destupdate function in these case too.

26641:5c57d01fe64e

def postincoming(ui, repo, modheads, optupdate, checkout):
    if modheads == 0:
        return
    if optupdate:
        checkout, movemarkfrom = bookmarks.calculateupdate(ui, repo, checkout)
        try:
            ret = hg.update(repo, checkout)
        except error.Abort as inst:
            ui.warn(_("not updating: %s\n") % str(inst))
            if inst.hint:
                ui.warn(_("(%s)\n") % inst.hint)

26642:70ac5f724fbd

def postincoming(ui, repo, modheads, optupdate, checkout):
    if modheads == 0:
        return
    if optupdate:
        try:
            brev = checkout
            movemarkfrom = None
            if not checkout:
                updata =  destutil.destupdate(repo)
                checkout, movemarkfrom, brev = updata
            ret = hg.update(repo, checkout)
        except error.Abort as inst:
            ui.warn(_("not updating: %s\n") % str(inst))
            if inst.hint:
                ui.warn(_("(%s)\n") % inst.hint)