mdw@git.distorted.org.uk Git - stgit/blob - stgit/commands/fold.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 = 'integrate a GNU diff patch into the current patch'
  27 usage = """%prog [options] [<file>]
  28
  29 Apply the given GNU diff file (or the standard input) onto the top of
  30 the current patch. With the '--threeway' option, the patch is applied
  31 onto the bottom of the current patch and a three-way merge is
  32 performed with the current top. With the --base option, the patch is
  33 applied onto the specified base and a three-way merged is performed
  34 with the current top."""
  35
  36 options = [make_option('-t', '--threeway',
  37                        help = 'perform a three-way merge with the current patch',
  38                        action = 'store_true'),
  39            make_option('-b', '--base',
  40                        help = 'use BASE instead of HEAD applying the patch')]
  41
  42
  43 def func(parser, options, args):
  44     """Integrate a GNU diff patch into the current patch
  45     """
  46     if len(args) > 1:
  47         parser.error('incorrect number of arguments')
  48
  49     check_local_changes()
  50     check_conflicts()
  51     check_head_top_equal()
  52
  53     if len(args) == 1:
  54         filename = args[0]
  55     else:
  56         filename = None
  57
  58     current = crt_series.get_current()
  59     if not current:
  60         raise CmdException, 'No patches applied'
  61
  62     if filename:
  63         if os.path.exists(filename):
  64             print 'Folding patch "%s"...' % filename,
  65         else:
  66             raise CmdException, 'No such file: %s' % filename
  67     else:
  68         print 'Folding patch from stdin...',
  69     sys.stdout.flush()
  70
  71     if options.threeway:
  72         crt_patch = crt_series.get_patch(current)
  73         bottom = crt_patch.get_bottom()
  74         git.apply_patch(filename = filename, base = bottom)
  75     elif options.base:
  76         git.apply_patch(filename = filename, base = git_id(options.base))
  77     else:
  78         git.apply_patch(filename = filename)
  79
  80     print 'done'