3 Copyright (C) 2005, Catalin Marinas <catalin.marinas@gmail.com>
5 This program is free software; you can redistribute it and/or modify
6 it under the terms of the GNU General Public License version 2 as
7 published by the Free Software Foundation.
9 This program is distributed in the hope that it will be useful,
10 but WITHOUT ANY WARRANTY; without even the implied warranty of
11 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 GNU General Public License for more details.
14 You should have received a copy of the GNU General Public License
15 along with this program; if not, write to the Free Software
16 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
20 from optparse
import OptionParser
, make_option
22 from stgit
.commands
.common
import *
23 from stgit
.utils
import *
24 from stgit
import stack
, git
25 from stgit
.config
import config
28 help = 'generate a new commit for the current patch'
29 usage
= """%prog [options]
31 Include the latest tree changes in the current patch. This command
32 generates a new GIT commit object with the patch details, the previous
33 one no longer being visible. The patch attributes like author,
34 committer and description can be changed with the command line
35 options. The '--force' option is useful when a commit object was
36 created with a different tool but the changes need to be included in
39 options
= [make_option('-f', '--force',
40 help = 'force the refresh even if HEAD and '\
42 action
= 'store_true'),
43 make_option('-e', '--edit',
44 help = 'invoke an editor for the patch '\
46 action
= 'store_true'),
47 make_option('-s', '--showpatch',
48 help = 'show the patch content in the editor buffer',
49 action
= 'store_true'),
50 make_option('-m', '--message',
51 help = 'use MESSAGE as the patch ' \
53 make_option('-a', '--author', metavar
= '"NAME <EMAIL>"',
54 help = 'use "NAME <EMAIL>" as the author details'),
55 make_option('--authname',
56 help = 'use AUTHNAME as the author name'),
57 make_option('--authemail',
58 help = 'use AUTHEMAIL as the author e-mail'),
59 make_option('--authdate',
60 help = 'use AUTHDATE as the author date'),
61 make_option('--commname',
62 help = 'use COMMNAME as the committer name'),
63 make_option('--commemail',
64 help = 'use COMMEMAIL as the committer ' \
68 def func(parser
, options
, args
):
70 parser
.error('incorrect number of arguments')
72 if config
.has_option('stgit', 'autoresolved'):
73 autoresolved
= config
.get('stgit', 'autoresolved')
77 if autoresolved
!= 'yes':
80 patch
= crt_series
.get_current()
82 raise CmdException
, 'No patches applied'
85 check_head_top_equal()
88 options
.authname
, options
.authemail
= name_email(options
.author
)
90 if git
.local_changes() \
91 or not crt_series
.head_top_equal() \
92 or options
.edit
or options
.message \
93 or options
.authname
or options
.authemail
or options
.authdate \
94 or options
.commname
or options
.commemail
:
95 print 'Refreshing patch "%s"...' % patch
,
98 if autoresolved
== 'yes':
100 crt_series
.refresh_patch(message
= options
.message
,
102 show_patch
= options
.showpatch
,
103 author_name
= options
.authname
,
104 author_email
= options
.authemail
,
105 author_date
= options
.authdate
,
106 committer_name
= options
.commname
,
107 committer_email
= options
.commemail
)
111 print 'Patch "%s" is already up to date' % patch