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
|
# merge_upstream.py -- Merge new upstream versions of packages.
# Copyright (C) 2007 Reinhard Tartler <siretart@tauware.de>
# 2007 James Westby <jw+debian@jameswestby.net>
# 2008-2019 Jelmer Vernooij <jelmer@samba.org>
#
# Code is also taken from bzrtools, which is
# (C) 2005, 2006, 2007 Aaron Bentley <aaron.bentley@utoronto.ca>
# (C) 2005, 2006 Canonical Limited.
# (C) 2006 Michael Ellerman.
# and distributed under the GPL, version 2 or later.
#
# This file is part of bzr-builddeb.
#
# bzr-builddeb 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.
#
# bzr-builddeb 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 bzr-builddeb; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
from __future__ import absolute_import
import os
import subprocess
import tempfile
from debian.changelog import Version
from ... import osutils
from ...revision import NULL_REVISION
from .errors import (
BzrError,
)
from .import_dsc import (
DistributionBranch,
DistributionBranchSet,
PreviousVersionTagMissing,
UpstreamAlreadyImported,
)
from .repack_tarball import repack_tarball
from .util import (
component_from_orig_tarball,
tarball_name,
FORMAT_3_0_QUILT,
FORMAT_3_0_NATIVE,
tree_get_source_format,
)
TAG_PREFIX = "upstream-"
class DchError(BzrError):
_fmt = 'There was an error using dch: %(error)s.'
def __init__(self, error):
BzrError.__init__(self, error=error)
def package_version(upstream_version, distribution_name, epoch=None):
"""Determine the package version for a new upstream.
:param upstream_version: Upstream version string
:param distribution_name: Distribution the package is for
:param epoch: Optional epoch
"""
if distribution_name == "ubuntu":
ret = Version("%s-0ubuntu1" % upstream_version)
else:
ret = Version("%s-1" % upstream_version)
ret.epoch = epoch
return ret
def upstream_merge_changelog_line(upstream_version):
"""Describe that a new upstream revision was merged.
This will either describe that a new upstream release or a new upstream
snapshot was merged.
:param upstream_version: Upstream version string
:return: Line string for use in changelog
"""
vcs_suffixes = ["~bzr", "+bzr", "~svn", "+svn", "~git", "+git", "-git"]
for vcs_suffix in vcs_suffixes:
if vcs_suffix in str(upstream_version):
entry_description = "New upstream snapshot."
break
else:
entry_description = "New upstream release."
return entry_description
# TODO(jelmer): Move into debmutate
def changelog_add_new_version(
tree, subpath, upstream_version, distribution_name, changelog,
package):
"""Add an entry to the changelog for a new version.
:param tree: WorkingTree in which the package lives
:param upstream_version: Upstream version to add
:param distribution_name: Distribution name (debian, ubuntu, ...)
:param changelog: Changelog object
:param package: Package name
"""
entry_description = upstream_merge_changelog_line(upstream_version)
if changelog is None:
epoch = None
else:
epoch = changelog.epoch
argv = ["dch", "-v",
str(package_version(upstream_version, distribution_name, epoch)),
"-D", "UNRELEASED", "--release-heuristic", "changelog",
"--package", package, entry_description]
if not tree.has_filename(osutils.pathjoin(subpath, 'debian')):
tree.mkdir(osutils.pathjoin(subpath, 'debian'))
cl_path = osutils.pathjoin(subpath, "debian/changelog")
create = (not tree.has_filename(cl_path))
if create:
argv.append("--create")
proc = subprocess.Popen(
argv, cwd=osutils.pathjoin(tree.basedir, subpath),
stdout=subprocess.PIPE, stderr=subprocess.PIPE)
(stdout, stderr) = proc.communicate()
if proc.returncode != 0:
raise DchError("Adding changelog entry failed: %s" % stderr)
if not tree.is_versioned(cl_path):
tree.add([cl_path])
def do_import(
tree, subpath, tarball_filenames, package, version,
current_version, upstream_branch, upstream_revisions, merge_type=None,
force=False, force_pristine_tar=False, committer=None,
files_excluded=None):
"""Import new tarballs.
Args:
tree: Working tree to operate in
tarball_filenames: List of tarball filenames as tuples with (path,
component)
package: Package name
version: New upstream version to merge
current_version: Current upstream version in tree
upstream_branch: Optional upstream branch to merge from
upstream_revisions: Dictionary mapping versions to upstream revisions
merge_type: Merge type
committer: Committer string to use
files_excluded: Files to exclude
"""
db = DistributionBranch(tree.branch, tree.branch, tree=tree)
dbs = DistributionBranchSet()
dbs.add_branch(db)
tarballs = [(p, component_from_orig_tarball(p, package, version), None)
for p in tarball_filenames]
with tempfile.TemporaryDirectory(
dir=os.path.join(db.tree.basedir, '..')) as tempdir:
if current_version is not None:
db._export_previous_upstream_tree(
package, current_version, tempdir)
else:
db.create_empty_upstream_tree(tempdir)
if db.pristine_upstream_source.has_version(package, version):
raise UpstreamAlreadyImported(version)
parents = {None: []}
if db.pristine_upstream_branch.last_revision() != NULL_REVISION:
parents = {None: [db.pristine_upstream_branch.last_revision()]}
return db.import_upstream_tarballs(
tarballs, package, version,
parents,
upstream_branch=upstream_branch,
upstream_revisions=upstream_revisions,
force_pristine_tar=force_pristine_tar,
committer=committer, files_excluded=files_excluded)
def do_merge(
tree, subpath, tarball_filenames, package, version,
current_version, upstream_branch, upstream_revisions, merge_type=None,
force=False, force_pristine_tar=False, committer=None,
files_excluded=None):
"""Actually execute a merge.
Args:
tree: Working tree to operate in
tarball_filenames: List of tarball filenames as tuples with (path,
component)
package: Package name
version: New upstream version to merge
current_version: Current upstream version in tree
upstream_branch: Optional upstream branch to merge from
upstream_revisions: Dictionary mapping versions to upstream revisions
merge_type: Merge type
committer: Committer string to use
files_excluded: Files to exclude
"""
db = DistributionBranch(tree.branch, tree.branch, tree=tree)
dbs = DistributionBranchSet()
dbs.add_branch(db)
tarballs = [(p, component_from_orig_tarball(p, package, version))
for p in tarball_filenames]
return db.merge_upstream(
tarballs, package, version, current_version,
upstream_branch=upstream_branch,
upstream_revisions=upstream_revisions,
merge_type=merge_type, force=force,
force_pristine_tar=force_pristine_tar,
committer=committer, files_excluded=files_excluded)
def fetch_tarball(package, version, orig_dir, locations, v3):
ret = []
format = None
for location in locations:
if v3:
if location.endswith(".tar.bz2") or location.endswith(".tbz2"):
format = "bz2"
elif location.endswith(".tar.xz"):
format = "xz"
dest_name = tarball_name(package, version, None, format=format)
tarball_filename = os.path.join(orig_dir, dest_name)
repack_tarball(location, dest_name, target_dir=orig_dir)
ret.append(tarball_filename)
return ret
def get_tarballs(orig_dir, tree, package, version, locations):
"""Retrieve upstream tarballs."""
source_format = tree_get_source_format(tree)
v3 = (source_format in [FORMAT_3_0_QUILT, FORMAT_3_0_NATIVE])
orig_dir = os.path.join(tree.basedir, orig_dir)
if not os.path.exists(orig_dir):
os.makedirs(orig_dir)
return fetch_tarball(package, version, orig_dir, locations, v3)
|
