Commit | Line | Data |
---|---|---|
c14444b9 CM |
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 | |
575bbdae | 19 | from stgit.argparse import opt |
c14444b9 CM |
20 | from stgit.commands.common import * |
21 | from stgit.utils import * | |
5e888f30 | 22 | from stgit.out import * |
6c8a90e1 | 23 | from stgit import argparse, stack, git |
c14444b9 | 24 | |
575bbdae | 25 | help = 'Integrate a GNU diff patch into the current patch' |
33ff9cdd | 26 | kind = 'patch' |
575bbdae KH |
27 | usage = ['[options] [<file>]'] |
28 | description = """ | |
c14444b9 CM |
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 | |
d4b8d284 | 31 | onto the bottom of the current patch and a three-way merge is |
84fcbc3b CM |
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.""" | |
c14444b9 | 35 | |
6c8a90e1 | 36 | args = [argparse.files] |
575bbdae KH |
37 | options = [ |
38 | opt('-t', '--threeway', action = 'store_true', | |
39 | short = 'Perform a three-way merge with the current patch'), | |
6c8a90e1 | 40 | opt('-b', '--base', args = [argparse.commit], |
575bbdae | 41 | short = 'Use BASE instead of HEAD applying the patch')] |
c14444b9 | 42 | |
117ed129 | 43 | directory = DirectoryHasRepository(log = True) |
c14444b9 CM |
44 | |
45 | def 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() | |
6972fd6b | 53 | check_head_top_equal(crt_series) |
c14444b9 CM |
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: |
6972fd6b KH |
77 | git.apply_patch(filename = filename, |
78 | base = git_id(crt_series, options.base)) | |
c14444b9 | 79 | else: |
6ef533bc | 80 | git.apply_patch(filename = filename) |
c14444b9 | 81 | |
27ac2b7e | 82 | out.done() |