hgext/rebase.py

35700:a71316bfac87

    Returns 0 on success, 1 if nothing to rebase or there are
    unresolved conflicts.

    """
    inmemory = ui.configbool('rebase', 'experimental.inmemory')
    if opts.get('continue') or opts.get('abort'):
        # in-memory rebase is not compatible with resuming rebases.
        inmemory = False

    if inmemory:
        try:
            # in-memory merge doesn't support conflicts, so if we hit any, abort

35701:c5d220a621e7

    Returns 0 on success, 1 if nothing to rebase or there are
    unresolved conflicts.

    """
    inmemory = ui.configbool('rebase', 'experimental.inmemory')
    if (opts.get('continue') or opts.get('abort') or
        repo.currenttransaction() is not None):
        # in-memory rebase is not compatible with resuming rebases.
        # (Or if it is run within a transaction, since the restart logic can
        # fail the entire transaction.)
        inmemory = False

    if inmemory:
        try:
            # in-memory merge doesn't support conflicts, so if we hit any, abort