comparison mercurial/commands.py @ 9503:a23ee0208f77

Merge with main

9502:8d7d68dd91fd

        p2 = repo[node]
        common = p1.ancestor(p2)
        roots, heads = [common.node()], [p2.node()]
        displayer = cmdutil.show_changeset(ui, repo, opts)
        for node in repo.changelog.nodesbetween(roots=roots, heads=heads)[0]:
            displayer.show(repo[node])
        return 0

    return hg.merge(repo, node, force=opts.get('force'))

def outgoing(ui, repo, dest=None, **opts):

        raise util.Abort(_("please specify just one revision"))

    if not rev:
        rev = node

    if not clean and check:
        # we could use dirty() but we can ignore merge and branch trivia
        c = repo[None]
        if c.modified() or c.added() or c.removed():
            raise util.Abort(_("uncommitted local changes"))

9503:a23ee0208f77

        p2 = repo[node]
        common = p1.ancestor(p2)
        roots, heads = [common.node()], [p2.node()]
        displayer = cmdutil.show_changeset(ui, repo, opts)
        for node in repo.changelog.nodesbetween(roots=roots, heads=heads)[0]:
            if node not in roots:
                displayer.show(repo[node])
        return 0

    return hg.merge(repo, node, force=opts.get('force'))

def outgoing(ui, repo, dest=None, **opts):

        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:
        # we could use dirty() but we can ignore merge and branch trivia
        c = repo[None]
        if c.modified() or c.added() or c.removed():
            raise util.Abort(_("uncommitted local changes"))