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 stgit.argparse import opt
  20 from stgit.commands.common import *
  21 from stgit.utils import *
  22 from stgit.out import *
  23 from stgit import argparse, stack, git
  24
  25 help = 'Integrate a GNU diff patch into the current patch'
  26 kind = 'patch'
  27 usage = ['[options] [--] [<file>]']
  28 description = """
  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 args = [argparse.files]
  37 options = [
  38     opt('-t', '--threeway', action = 'store_true',
  39         short = 'Perform a three-way merge with the current patch'),
  40     opt('-b', '--base', args = [argparse.commit],
  41         short = 'Use BASE instead of HEAD when applying the patch'),
  42     opt('-p', '--strip', type = 'int', metavar = 'N',
  43         short = 'Remove N leading slashes from diff paths (default 1)'),
  44     opt('--reject', action = 'store_true',
  45         short = 'Leave the rejected hunks in corresponding *.rej files')]
  46
  47 directory = DirectoryHasRepository(log = True)
  48
  49 def func(parser, options, args):
  50     """Integrate a GNU diff patch into the current patch
  51     """
  52     if len(args) > 1:
  53         parser.error('incorrect number of arguments')
  54
  55     check_local_changes()
  56     check_conflicts()
  57     check_head_top_equal(crt_series)
  58
  59     if len(args) == 1:
  60         filename = args[0]
  61     else:
  62         filename = None
  63
  64     current = crt_series.get_current()
  65     if not current:
  66         raise CmdException, 'No patches applied'
  67
  68     if filename:
  69         if os.path.exists(filename):
  70             out.start('Folding patch "%s"' % filename)
  71         else:
  72             raise CmdException, 'No such file: %s' % filename
  73     else:
  74         out.start('Folding patch from stdin')
  75
  76     if options.threeway:
  77         crt_patch = crt_series.get_patch(current)
  78         bottom = crt_patch.get_bottom()
  79         git.apply_patch(filename = filename, base = bottom,
  80                         strip = options.strip, reject = options.reject)
  81     elif options.base:
  82         git.apply_patch(filename = filename, reject = options.reject,
  83                         strip = options.strip,
  84                         base = git_id(crt_series, options.base))
  85     else:
  86         git.apply_patch(filename = filename, strip = options.strip,
  87                         reject = options.reject)
  88
  89     out.done()