mdw@git.distorted.org.uk Git - stgit/blob - stgit/commands/rebase.py

   1 __copyright__ = """
   2 Copyright (C) 2005, Catalin Marinas <catalin.marinas@gmail.com>
   3
   4 This program is free software; you can redistribute it and/or modify
   5 it under the terms of the GNU General Public License version 2 as
   6 published by the Free Software Foundation.
   7
   8 This program is distributed in the hope that it will be useful,
   9 but WITHOUT ANY WARRANTY; without even the implied warranty of
  10 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  11 GNU General Public License for more details.
  12
  13 You should have received a copy of the GNU General Public License
  14 along with this program; if not, write to the Free Software
  15 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  16 """
  17
  18 import sys, os
  19 from optparse import OptionParser, make_option
  20
  21 from stgit.commands.common import *
  22 from stgit.utils import *
  23 from stgit import stack, git
  24
  25
  26 help = 'move the stack base to another point in history'
  27 usage = """%prog [options] <new-base-id>
  28
  29 Pop all patches from current stack, move the stack base to the given
  30 <new-base-id> and push the patches back."""
  31
  32 options = [make_option('-n', '--nopush',
  33                        help = 'do not push the patches back after rebasing',
  34                        action = 'store_true'),
  35            make_option('-m', '--merged',
  36                        help = 'check for patches merged upstream',
  37                        action = 'store_true')]
  38
  39 def func(parser, options, args):
  40     """Rebase the current stack
  41     """
  42     if len(args) != 1:
  43         parser.error('incorrect number of arguments')
  44
  45     if crt_series.get_protected():
  46         raise CmdException, 'This branch is protected. Rebase is not permitted'
  47
  48     check_local_changes()
  49     check_conflicts()
  50     check_head_top_equal()
  51
  52     # pop all patches
  53     applied = crt_series.get_applied()
  54     if len(applied) > 0:
  55         print 'Popping all applied patches...',
  56         sys.stdout.flush()
  57         crt_series.pop_patch(applied[0])
  58         print 'done'
  59
  60     print 'Rebasing to "%s"...' % args[0]
  61     git.reset(tree_id = git_id(args[0]))
  62
  63     # push the patches back
  64     if not options.nopush:
  65         push_patches(applied, options.merged)
  66
  67     print_crt_patch()