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 = 'import a GNU diff file as a new patch'
27 usage
= """%prog [options] [<file>]
29 Create a new patch and apply the given GNU diff file (or the standard
30 input). By default, the file name is used as the patch name but this
31 can be overridden with the '--name' option. The patch can either be a
32 normal file with the description at the top or it can have standard
33 mail format, the Subject, From and Date headers being used for
34 generating the patch information.
36 The patch description has to be separated from the data with a '---'
39 options
= [make_option('-m', '--mail',
40 help = 'import the patch from a standard e-mail file',
41 action
= 'store_true'),
42 make_option('-n', '--name',
43 help = 'use NAME as the patch name'),
44 make_option('-t', '--strip',
45 help = 'strip numbering and extension from patch name',
46 action
= 'store_true'),
47 make_option('-s', '--series',
48 help = 'import a series of patches',
49 action
= 'store_true'),
50 make_option('-i', '--ignore',
51 help = 'ignore the applied patches in the series',
52 action
= 'store_true'),
53 make_option('--replace',
54 help = 'replace the unapplied patches in the series',
55 action
= 'store_true'),
56 make_option('-b', '--base',
57 help = 'use BASE instead of HEAD for file importing'),
58 make_option('-e', '--edit',
59 help = 'invoke an editor for the patch description',
60 action
= 'store_true'),
61 make_option('-p', '--showpatch',
62 help = 'show the patch content in the editor buffer',
63 action
= 'store_true'),
64 make_option('-a', '--author', metavar
= '"NAME <EMAIL>"',
65 help = 'use "NAME <EMAIL>" as the author details'),
66 make_option('--authname',
67 help = 'use AUTHNAME as the author name'),
68 make_option('--authemail',
69 help = 'use AUTHEMAIL as the author e-mail'),
70 make_option('--authdate',
71 help = 'use AUTHDATE as the author date'),
72 make_option('--commname',
73 help = 'use COMMNAME as the committer name'),
74 make_option('--commemail',
75 help = 'use COMMEMAIL as the committer e-mail')]
78 def __end_descr(line
):
79 return re
.match('---\s*$', line
) or re
.match('diff -', line
) or \
80 re
.match('Index: ', line
)
82 def __strip_patch_name(name
):
83 stripped
= re
.sub('^[0-9]+-(.*)$', '\g<1>', name
)
84 stripped
= re
.sub('^(.*)\.(diff|patch)$', '\g<1>', stripped
)
88 def __replace_slashes_with_dashes(name
):
89 stripped
= name
.replace('/', '-')
93 def __parse_description(descr
):
94 """Parse the patch description and return the new description and
95 author information (if any).
98 authname
= authemail
= authdate
= None
100 descr_lines
= [line
.rstrip() for line
in descr
.split('\n')]
102 raise CmdException
, "Empty patch description"
105 end
= len(descr_lines
)
107 # Parse the patch header
108 for pos
in range(0, end
):
109 if not descr_lines
[pos
]:
111 # check for a "From|Author:" line
112 if re
.match('\s*(?:from|author):\s+', descr_lines
[pos
], re
.I
):
113 auth
= re
.findall('^.*?:\s+(.*)$', descr_lines
[pos
])[0]
114 authname
, authemail
= name_email(auth
)
117 # check for a "Date:" line
118 if re
.match('\s*date:\s+', descr_lines
[pos
], re
.I
):
119 authdate
= re
.findall('^.*?:\s+(.*)$', descr_lines
[pos
])[0]
125 subject
= descr_lines
[pos
]
130 body
= reduce(lambda x
, y
: x
+ '\n' + y
, descr_lines
[lasthdr
:], '')
132 return (subject
+ body
, authname
, authemail
, authdate
)
134 def __parse_mail(filename
= None):
135 """Parse the input file in a mail format and return (description,
136 authname, authemail, authdate)
143 descr
= authname
= authemail
= authdate
= None
151 if re
.match('from:\s+', line
, re
.I
):
152 auth
= re
.findall('^.*?:\s+(.*)$', line
)[0]
153 authname
, authemail
= name_email(auth
)
154 elif re
.match('date:\s+', line
, re
.I
):
155 authdate
= re
.findall('^.*?:\s+(.*)$', line
)[0]
156 elif re
.match('subject:\s+', line
, re
.I
):
157 descr
= re
.findall('^.*?:\s+(.*)$', line
)[0]
162 # remove the '[*PATCH*]' expression in the subject
164 descr
= re
.findall('^(\[[^\s]*[Pp][Aa][Tt][Cc][Hh].*?\])?\s*(.*)$',
168 raise CmdException
, 'Subject: line not found'
170 # the rest of the patch description
175 if __end_descr(line
):
184 # parse the description for author information
185 descr
, descr_authname
, descr_authemail
, descr_authdate
= __parse_description(descr
)
187 authname
= descr_authname
189 authemail
= descr_authemail
191 authdate
= descr_authdate
193 return (descr
, authname
, authemail
, authdate
)
195 def __parse_patch(filename
= None):
196 """Parse the input file and return (description, authname,
210 if __end_descr(line
):
219 descr
, authname
, authemail
, authdate
= __parse_description(descr
)
221 # we don't yet have an agreed place for the creation date.
223 return (descr
, authname
, authemail
, authdate
)
225 def __import_patch(patch
, filename
, options
):
226 """Import a patch from a file or standard input
229 message
= author_name
= author_email
= author_date
= committer_name
= \
230 committer_email
= None
233 options
.authname
, options
.authemail
= name_email(options
.author
)
236 message
, author_name
, author_email
, author_date
= \
237 __parse_mail(filename
)
239 message
, author_name
, author_email
, author_date
= \
240 __parse_patch(filename
)
243 patch
= make_patch_name(message
)
245 raise CmdException
, 'Unknown patch name'
247 # refresh_patch() will invoke the editor in this case, with correct
252 # override the automatically parsed settings
254 author_name
= options
.authname
255 if options
.authemail
:
256 author_email
= options
.authemail
258 author_date
= options
.authdate
260 committer_name
= options
.commname
261 if options
.commemail
:
262 committer_email
= options
.commemail
264 if options
.replace
and patch
in crt_series
.get_unapplied():
265 crt_series
.delete_patch(patch
)
267 crt_series
.new_patch(patch
, message
= message
, can_edit
= False,
268 author_name
= author_name
,
269 author_email
= author_email
,
270 author_date
= author_date
,
271 committer_name
= committer_name
,
272 committer_email
= committer_email
)
274 print 'Importing patch "%s"...' % patch
,
278 git
.apply_patch(filename
, git_id(options
.base
))
280 git
.apply_patch(filename
)
282 crt_series
.refresh_patch(edit
= options
.edit
,
283 show_patch
= options
.showpatch
)
287 def __import_series(filename
, options
):
288 """Import a series of patches
290 applied
= crt_series
.get_applied()
294 patchdir
= os
.path
.dirname(filename
)
300 patch
= re
.sub('#.*$', '', line
).strip()
303 patchfile
= os
.path
.join(patchdir
, patch
)
306 patch
= __strip_patch_name(patch
)
307 patch
= __replace_slashes_with_dashes(patch
);
308 if options
.ignore
and patch
in applied
:
309 print 'Ignoring already applied patch "%s"' % patch
312 __import_patch(patch
, patchfile
, options
)
314 def func(parser
, options
, args
):
315 """Import a GNU diff file as a new patch
318 parser
.error('incorrect number of arguments')
320 check_local_changes()
322 check_head_top_equal()
330 __import_series(filename
, options
)
335 patch
= os
.path
.basename(filename
)
339 patch
= __strip_patch_name(patch
)
341 __import_patch(patch
, filename
, options
)