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 optparse
import OptionParser
, make_option
21 from stgit
.commands
.common
import *
22 from stgit
.utils
import *
23 from stgit
import stack
, git
26 help = 'integrate a GNU diff patch into the current patch'
27 usage
= """%prog [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."""
34 options
= [make_option('-t', '--threeway',
35 help = 'perform a three-way merge with the current patch',
36 action
= 'store_true'),
37 make_option('-n', '--norefresh',
38 help = 'do not refresh the current patch',
39 action
= 'store_true')]
42 def func(parser
, options
, args
):
43 """Integrate a GNU diff patch into the current patch
46 parser
.error('incorrect number of arguments')
50 check_head_top_equal()
57 current
= crt_series
.get_current()
59 raise CmdException
, 'No patches applied'
62 print 'Folding patch "%s"...' % filename
,
64 print 'Folding patch from stdin...',
68 crt_patch
= crt_series
.get_patch(current
)
69 bottom
= crt_patch
.get_bottom()
70 top
= crt_patch
.get_top()
73 git
.apply_patch(filename
)
74 fold_head
= crt_series
.refresh_patch(commit_only
= True)
77 git
.merge(bottom
, top
, fold_head
)
79 git
.apply_patch(filename
)
81 # no merge conflicts at this point, exception would have been raised
82 modified
= git
.local_changes()
84 if not options
.norefresh
and modified
:
85 crt_series
.refresh_patch()
90 print 'done (unchanged)'