2 Copyright (C) 2005, Catalin Marinas <catalin.marinas@gmail.com>
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.
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.
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
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
25 help = 'Integrate a GNU diff patch into the current patch'
27 usage
= ['[options] [<file>]']
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."""
36 args
= [argparse
.files
]
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 applying the patch')]
43 directory
= DirectoryHasRepository(log
= True)
45 def func(parser
, options
, args
):
46 """Integrate a GNU diff patch into the current patch
49 parser
.error('incorrect number of arguments')
53 check_head_top_equal(crt_series
)
60 current
= crt_series
.get_current()
62 raise CmdException
, 'No patches applied'
65 if os
.path
.exists(filename
):
66 out
.start('Folding patch "%s"' % filename
)
68 raise CmdException
, 'No such file: %s' % filename
70 out
.start('Folding patch from stdin')
73 crt_patch
= crt_series
.get_patch(current
)
74 bottom
= crt_patch
.get_bottom()
75 git
.apply_patch(filename
= filename
, base
= bottom
)
77 git
.apply_patch(filename
= filename
,
78 base
= git_id(crt_series
, options
.base
))
80 git
.apply_patch(filename
= filename
)