comparison mercurial/commands.py @ 16232:877aea86fb73

merge with stable

16229:5cb2693e1a60

        haveheads = set(h.branch() for h in heads)
        if branches - haveheads:
            headless = ', '.join(b for b in branches - haveheads)
            msg = _('no open branch heads found on branches %s')
            if opts.get('rev'):
                msg += _(' (started at %s)' % opts['rev'])
            ui.warn((msg + '\n') % headless)

    if not heads:
        return 1

        else:
            if name == 'shortlist':
                msg = _('use "hg help" for the full list of commands '
                        'or "hg -v" for details')
            elif name and not full:
                msg = _('use "hg help %s" to show the full help text' % name)
            elif aliases:
                msg = _('use "hg -v help%s" to show builtin aliases and '
                        'global options') % (name and " " + name or "")
            else:
                msg = _('use "hg -v help %s" to show more info') % name

    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

16232:877aea86fb73

        haveheads = set(h.branch() for h in heads)
        if branches - haveheads:
            headless = ', '.join(b for b in branches - haveheads)
            msg = _('no open branch heads found on branches %s')
            if opts.get('rev'):
                msg += _(' (started at %s)') % opts['rev']
            ui.warn((msg + '\n') % headless)

    if not heads:
        return 1

        else:
            if name == 'shortlist':
                msg = _('use "hg help" for the full list of commands '
                        'or "hg -v" for details')
            elif name and not full:
                msg = _('use "hg help %s" to show the full help text') % name
            elif aliases:
                msg = _('use "hg -v help%s" to show builtin aliases and '
                        'global options') % (name and " " + name or "")
            else:
                msg = _('use "hg -v help %s" to show more info') % name

    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