mercurial/commands.py

12725:24f16c2c6d41

        if type == 'n':
            ui.status('node %s\n' % str(data))
            id, ps = data
            p1 = ps[0]
            if p1 != at:
                update(ui, repo, node=p1, clean=True)
                at = p1
            if repo.dirstate.branch() != atbranch:
                branch(ui, repo, atbranch, force=True)
            if len(ps) > 1:
                p2 = ps[1]

    if rev and node:
        raise util.Abort(_("please specify just one revision"))

    if not rev:
        rev = node

    if check and clean:
        raise util.Abort(_("cannot specify both -c/--check and -C/--clean"))

    if check:

12726:61c0df2b089a

        if type == 'n':
            ui.status('node %s\n' % str(data))
            id, ps = data
            p1 = ps[0]
            if p1 != at:
                update(ui, repo, node=str(p1), clean=True)
                at = p1
            if repo.dirstate.branch() != atbranch:
                branch(ui, repo, atbranch, force=True)
            if len(ps) > 1:
                p2 = ps[1]

    if rev and node:
        raise util.Abort(_("please specify just one revision"))

    if not rev:
        rev = node

    rev = cmdutil.revsingle(repo, rev, rev).rev()

    if check and clean:
        raise util.Abort(_("cannot specify both -c/--check and -C/--clean"))

    if check: