Infrastructure for current directory handling
[stgit] / stgit / commands / fold.py
CommitLineData
c14444b9
CM
1__copyright__ = """
2Copyright (C) 2005, Catalin Marinas <catalin.marinas@gmail.com>
3
4This program is free software; you can redistribute it and/or modify
5it under the terms of the GNU General Public License version 2 as
6published by the Free Software Foundation.
7
8This program is distributed in the hope that it will be useful,
9but WITHOUT ANY WARRANTY; without even the implied warranty of
10MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11GNU General Public License for more details.
12
13You should have received a copy of the GNU General Public License
14along with this program; if not, write to the Free Software
15Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
16"""
17
18import sys, os
19from optparse import OptionParser, make_option
20
21from stgit.commands.common import *
22from stgit.utils import *
5e888f30 23from stgit.out import *
c14444b9
CM
24from stgit import stack, git
25
26
27help = 'integrate a GNU diff patch into the current patch'
28usage = """%prog [options] [<file>]
29
30Apply the given GNU diff file (or the standard input) onto the top of
31the current patch. With the '--threeway' option, the patch is applied
d4b8d284 32onto the bottom of the current patch and a three-way merge is
84fcbc3b
CM
33performed with the current top. With the --base option, the patch is
34applied onto the specified base and a three-way merged is performed
35with the current top."""
c14444b9 36
6dd8fafa 37directory = DirectoryHasRepository()
c14444b9
CM
38options = [make_option('-t', '--threeway',
39 help = 'perform a three-way merge with the current patch',
40 action = 'store_true'),
84fcbc3b
CM
41 make_option('-b', '--base',
42 help = 'use BASE instead of HEAD applying the patch')]
c14444b9
CM
43
44
45def func(parser, options, args):
46 """Integrate a GNU diff patch into the current patch
47 """
48 if len(args) > 1:
49 parser.error('incorrect number of arguments')
50
51 check_local_changes()
52 check_conflicts()
53 check_head_top_equal()
54
55 if len(args) == 1:
56 filename = args[0]
57 else:
58 filename = None
59
60 current = crt_series.get_current()
61 if not current:
62 raise CmdException, 'No patches applied'
63
64 if filename:
0a01a6d0 65 if os.path.exists(filename):
27ac2b7e 66 out.start('Folding patch "%s"' % filename)
0a01a6d0
CM
67 else:
68 raise CmdException, 'No such file: %s' % filename
c14444b9 69 else:
27ac2b7e 70 out.start('Folding patch from stdin')
c14444b9
CM
71
72 if options.threeway:
73 crt_patch = crt_series.get_patch(current)
74 bottom = crt_patch.get_bottom()
6ef533bc 75 git.apply_patch(filename = filename, base = bottom)
84fcbc3b 76 elif options.base:
6ef533bc 77 git.apply_patch(filename = filename, base = git_id(options.base))
c14444b9 78 else:
6ef533bc 79 git.apply_patch(filename = filename)
c14444b9 80
27ac2b7e 81 out.done()