Add support for initializing a branch for stgit from Emacs.

[stgit] / stgit / commands / sink.py

__copyright__ = """
Copyright (C) 2007, Yann Dirson <ydirson@altern.org>

This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License version 2 as
published by the Free Software Foundation.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
"""

import sys, os
from optparse import OptionParser, make_option

from stgit.commands.common import *
from stgit.utils import *
from stgit import stack, git


help = 'send patches deeper down the stack'
usage = """%prog [-t <target patch>] [-n] [<patches>]

Pop all patches (or all patches including <target patch>), then
push the specified <patches> (the current patch by default), and
then push back into place the formerly-applied patches (unless -n
is also given)."""

directory = DirectoryGotoToplevel()
options = [make_option('-n', '--nopush',
                       help = 'do not push the patches back after sinking',
                       action = 'store_true'),
           make_option('-t', '--to', metavar = 'TARGET',
                       help = 'sink patches below TARGET patch')]

def func(parser, options, args):
    """Sink patches down the stack.
    """

    check_local_changes()
    check_conflicts()
    check_head_top_equal(crt_series)

    oldapplied = crt_series.get_applied()
    unapplied = crt_series.get_unapplied()
    all = oldapplied + unapplied

    if options.to and not options.to in oldapplied:
        raise CmdException('Cannot sink below %s, since it is not applied'
                           % options.to)

    if len(args) > 0:
        patches = parse_patches(args, all)
    else:
        current = crt_series.get_current()
        if not current:
            raise CmdException('No patch applied')
        patches = [current]

    before_patches = after_patches = []

    # pop necessary patches
    if oldapplied:
        if options.to:
            pop_idx = oldapplied.index(options.to)
        else:
            pop_idx = 0
        after_patches = [p for p in oldapplied[pop_idx:] if p not in patches]

        # find the deepest patch to pop
        sink_applied = [p for p in oldapplied if p in patches]
        if sink_applied:
            sinked_idx = oldapplied.index(sink_applied[0])
            if sinked_idx < pop_idx:
                # this is the case where sink brings patches forward
                before_patches = [p for p in oldapplied[sinked_idx:pop_idx]
                                  if p not in patches]
                pop_idx = sinked_idx

        crt_series.pop_patch(oldapplied[pop_idx])

    push_patches(crt_series, before_patches)
    push_patches(crt_series, patches)
    if not options.nopush:
        push_patches(crt_series, after_patches)