1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
|
# vim: set fileencoding=utf-8 :
#
# (C) 2011 Guido Günther <agx@sigxcpu.org>
# (C) 2012 Intel Corporation <markus.lehtonen@linux.intel.com>
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
"""Common functionality for Debian and RPM patchqueue management"""
import re
import os
import subprocess
import datetime
import pwd
import socket
import time
from email.message import Message
from email.header import Header
from email.charset import Charset, QP
from gbp.git import GitRepositoryError
from gbp.git.modifier import GitModifier, GitTz
from gbp.errors import GbpError
import gbp.log
DEFAULT_PQ_BRANCH_NAME = "patch-queue/%(branch)s"
def pq_branch_match(branch, pq_fmt_str):
"""
Match branch name with pq branch name pattern
>>> pq_branch_match('patch-queue/foo', 'patch-queue/%(br)s').groupdict()
{'br': 'foo'}
>>> pq_branch_match('pq/foo/bar', 'pq/%(br)s/baz')
>>> pq_branch_match('pq/foo/bar', 'pq/%(br)s/bar').groupdict()
{'br': 'foo'}
>>> pq_branch_match('foo/bar/1.0/pq', 'foo/%(br)s/%(ver)s/pq').groupdict()
{'ver': '1.0', 'br': 'bar'}
"""
pq_re = '^%s$' % re.sub('%\(([a-z_\-]+)\)s', r'(?P<\1>\S+)', pq_fmt_str)
return re.match(pq_re, branch)
def is_pq_branch(branch, options):
"""
is branch a patch-queue branch?
>>> from optparse import OptionParser
>>> (opts, args) = OptionParser().parse_args([])
>>> is_pq_branch("foo", opts)
False
>>> is_pq_branch("patch-queue/foo", opts)
True
>>> opts.pq_branch = "%(branch)s/development"
>>> is_pq_branch("foo/development/bar", opts)
False
>>> is_pq_branch("bar/foo/development", opts)
True
>>> opts.pq_branch = "development"
>>> is_pq_branch("development", opts)
True
>>> opts.pq_branch = "my/%(branch)s/pq"
>>> is_pq_branch("my/foo/pqb", opts)
False
>>> is_pq_branch("my/foo/pq", opts)
True
>>> opts.pq_branch = "my/%(branch)s/%(version)s"
>>> is_pq_branch("my/foo", opts)
False
>>> is_pq_branch("my/foo/1.0", opts)
True
"""
pq_format_str = (options.pq_branch if hasattr(options, 'pq_branch')
else DEFAULT_PQ_BRANCH_NAME)
if pq_branch_match(branch, pq_format_str):
return True
return False
def pq_branch_name(branch, options, extra_keys=None):
"""
get the patch queue branch corresponding to branch
>>> from optparse import OptionParser
>>> (opts, args) = OptionParser().parse_args([])
>>> pq_branch_name("patch-queue/master", opts)
>>> pq_branch_name("foo", opts)
'patch-queue/foo'
>>> opts.pq_branch = "%(branch)s/development"
>>> pq_branch_name("foo", opts)
'foo/development'
>>> opts.pq_branch = "development"
>>> pq_branch_name("foo", opts)
'development'
>>> opts.pq_branch = "pq/%(branch)s/%(ver)s"
>>> pq_branch_name("foo", opts, {'ver': '1.0'})
'pq/foo/1.0'
"""
pq_format_str = (options.pq_branch if hasattr(options, 'pq_branch')
else DEFAULT_PQ_BRANCH_NAME)
format_fields = {'branch': branch}
if extra_keys:
format_fields.update(extra_keys)
if not is_pq_branch(branch, options):
return pq_format_str % format_fields
def pq_branch_base(pq_branch, options):
"""
Get the branch corresponding to the given patch queue branch.
Returns the packaging/debian branch if pq format string doesn't contain
'%(branch)s' key.
>>> from optparse import OptionParser
>>> (opts, args) = OptionParser().parse_args([])
>>> opts.packaging_branch = "packaging"
>>> pq_branch_base("patch-queue/master", opts)
'master'
>>> pq_branch_base("foo", opts)
>>> opts.pq_branch = "my/%(branch)s/development"
>>> pq_branch_base("foo/development", opts)
>>> pq_branch_base("my/foo/development/bar", opts)
>>> pq_branch_base("my/foo/development", opts)
'foo'
>>> opts.pq_branch = "development"
>>> pq_branch_base("foo/development", opts)
>>> pq_branch_base("development", opts)
'packaging'
"""
pq_format_str = (options.pq_branch if hasattr(options, 'pq_branch')
else DEFAULT_PQ_BRANCH_NAME)
m = pq_branch_match(pq_branch, pq_format_str)
if m:
if 'branch' in m.groupdict():
return m.group('branch')
return options.packaging_branch
def parse_gbp_commands(info, cmd_tag, noarg_cmds, arg_cmds):
"""Parse gbp commands from commit message"""
cmd_re = re.compile(r'^%s:\s*(?P<cmd>[a-z-]+)(\s+(?P<args>\S.*))?' %
cmd_tag, flags=re.I)
commands = {}
other_lines = []
for line in info['body'].splitlines():
match = re.match(cmd_re, line)
if match:
cmd = match.group('cmd').lower()
if arg_cmds and cmd in arg_cmds:
if match.group('args'):
commands[cmd] = match.group('args')
else:
gbp.log.warn("Ignoring gbp-command '%s' in commit %s: "
"missing cmd arguments" % (line, info['id']))
elif noarg_cmds and cmd in noarg_cmds:
commands[cmd] = match.group('args')
else:
gbp.log.warn("Ignoring unknown gbp-command '%s' in commit %s"
% (line, info['id']))
else:
other_lines.append(line)
return commands, other_lines
def patch_path_filter(file_status, exclude_regex=None):
"""
Create patch include paths, i.e. a "negation" of the exclude paths.
"""
if exclude_regex:
include_paths = []
for file_list in list(file_status.values()):
for fname in file_list:
if not re.match(exclude_regex, fname):
include_paths.append(fname)
else:
include_paths = ['.']
return include_paths
def write_patch_file(filename, commit_info, diff):
"""Write patch file"""
if not diff:
gbp.log.debug("I won't generate empty diff %s" % filename)
return None
try:
with open(filename, 'w') as patch:
msg = Message()
charset = Charset('utf-8')
charset.body_encoding = None
charset.header_encoding = QP
# Write headers
name = commit_info['author']['name']
email = commit_info['author']['email']
# Git compat: put name in quotes if special characters found
if re.search("[,.@()\[\]\\\:;]", name):
name = '"%s"' % name
from_header = Header(str(name, 'utf-8'), charset, 77, 'from')
from_header.append(str('<%s>' % email))
msg['From'] = from_header
date = commit_info['author'].datetime
datestr = date.strftime('%a, %-d %b %Y %H:%M:%S %z')
msg['Date'] = Header(str(datestr, 'utf-8'), charset, 77, 'date')
msg['Subject'] = Header(str(commit_info['subject'], 'utf-8'),
charset, 77, 'subject')
# Write message body
if commit_info['body']:
# Strip extra linefeeds
body = commit_info['body'].rstrip() + '\n'
try:
msg.set_payload(body.encode('ascii'))
except UnicodeDecodeError:
msg.set_payload(body, charset)
patch.write(msg.as_string(unixfrom=False))
# Write diff
patch.write('---\n')
patch.write(diff)
except IOError as err:
raise GbpError('Unable to create patch file: %s' % err)
return filename
def format_patch(outdir, repo, commit_info, series, numbered=True,
path_exclude_regex=None, topic=''):
"""Create patch of a single commit"""
# Determine filename and path
outdir = os.path.join(outdir, topic)
if not os.path.exists(outdir):
os.makedirs(outdir)
num_prefix = '%04d-' % (len(series) + 1)
suffix = '.patch'
base_maxlen = 63 - len(num_prefix) - len(suffix)
base = commit_info['patchname'][:base_maxlen]
filename = (num_prefix if numbered else '') + base + suffix
filepath = os.path.join(outdir, filename)
# Make sure that we don't overwrite existing patches in the series
if filepath in series:
presuffix = '-%d' % len(series)
base = base[:base_maxlen-len(presuffix)] + presuffix
filename = (num_prefix if numbered else '') + base + suffix
filepath = os.path.join(outdir, filename)
# Determine files to include
paths = patch_path_filter(commit_info['files'], path_exclude_regex)
# Finally, create the patch
patch = None
if paths:
diff = repo.diff('%s^!' % commit_info['id'], paths=paths, stat=80,
summary=True, text=True)
patch = write_patch_file(filepath, commit_info, diff)
if patch:
series.append(patch)
return patch
def format_diff(outdir, filename, repo, start, end, path_exclude_regex=None):
"""Create a patch of diff between two repository objects"""
info = {'author': get_author(repo)}
now = datetime.datetime.now().replace(tzinfo=GitTz(-time.timezone))
info['author'].set_date(now)
info['subject'] = "Raw diff %s..%s" % (start, end)
info['body'] = ("Raw diff between %s '%s' and\n%s '%s'\n" %
(repo.get_obj_type(start), start,
repo.get_obj_type(end), end))
if not filename:
filename = '%s-to-%s.diff' % (start, end)
filename = os.path.join(outdir, filename)
file_status = repo.diff_status(start, end)
paths = patch_path_filter(file_status, path_exclude_regex)
if paths:
diff = repo.diff(start, end, paths=paths, stat=80, summary=True,
text=True)
return write_patch_file(filename, info, diff)
return None
def get_author(repo):
"""Determine author name and email"""
author = GitModifier()
if repo:
author = repo.get_author_info()
passwd_data = pwd.getpwuid(os.getuid())
if not author.name:
# On some distros (Ubuntu, at least) the gecos field has it's own
# internal structure of comma-separated fields
author.name = passwd_data.pw_gecos.split(',')[0].strip()
if not author.name:
author.name = passwd_data.pw_name
if not author.email:
if 'EMAIL' in os.environ:
author.email = os.environ['EMAIL']
else:
author.email = "%s@%s" % (passwd_data.pw_name, socket.getfqdn())
return author
def get_maintainer_from_control(repo):
"""Get the maintainer from the control file"""
control = os.path.join(repo.path, 'debian', 'control')
cmd = 'sed -n -e \"s/Maintainer: \\+\\(.*\\)/\\1/p\" %s' % control
cmdout = subprocess.Popen(cmd, shell=True,
stdout=subprocess.PIPE).stdout.readlines()
if len(cmdout) > 0:
maintainer = cmdout[0].strip()
m = re.match('(?P<name>.*[^ ]) *<(?P<email>.*)>', maintainer)
if m:
return GitModifier(m.group('name'), m.group('email'))
return GitModifier()
def switch_to_pq_branch(repo, branch, options, name_keys=None):
"""
Switch to patch-queue branch if not already there, create it if it
doesn't exist yet
"""
if is_pq_branch(branch, options):
return
pq_branch = pq_branch_name(branch, options, name_keys)
if not repo.has_branch(pq_branch):
try:
repo.create_branch(pq_branch)
except GitRepositoryError:
raise GbpError("Cannot create patch-queue branch '%s'. "
"Try 'rebase' instead." % pq_branch)
gbp.log.info("Switching to '%s'" % pq_branch)
repo.set_branch(pq_branch)
def apply_single_patch(repo, branch, patch, fallback_author, options):
switch_to_pq_branch(repo, branch, options)
topic = None if not hasattr(options, 'topic') else options.topic
apply_and_commit_patch(repo, patch, fallback_author, topic)
def apply_and_commit_patch(repo, patch, fallback_author, topic=None):
"""apply a single patch 'patch', add topic 'topic' and commit it"""
author = {'name': patch.author,
'email': patch.email,
'date': patch.date }
patch_fn = os.path.basename(patch.path)
if not (author['name'] and author['email']):
if fallback_author and fallback_author['name']:
author = fallback_author
gbp.log.warn("Patch '%s' has no authorship information, using "
"'%s <%s>'" % (patch_fn, author['name'],
author['email']))
else:
gbp.log.warn("Patch '%s' has no authorship information" % patch_fn)
repo.apply_patch(patch.path, strip=patch.strip)
tree = repo.write_tree()
msg = "%s\n\n%s" % (patch.subject, patch.long_desc)
if topic:
msg += "\nGbp-Pq-Topic: %s" % topic
commit = repo.commit_tree(tree, msg, [repo.head], author=author)
repo.update_ref('HEAD', commit, msg="gbp-pq import %s" % patch.path)
def drop_pq(repo, branch, options, name_keys=None):
if is_pq_branch(branch, options):
gbp.log.err("On a patch-queue branch, can't drop it.")
raise GbpError
else:
pq_branch = pq_branch_name(branch, options, name_keys)
if repo.has_branch(pq_branch):
repo.delete_branch(pq_branch)
gbp.log.info("Dropped branch '%s'." % pq_branch)
else:
gbp.log.info("No patch queue branch found - doing nothing.")
|