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
|
#!/usr/bin/python3
# Copyright (C) 2018-2022 Jelmer Vernooij <jelmer@jelmer.uk>
#
# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
"""Quilt patch refreshing."""
import os
import re
from typing import Optional
from debmutate.changelog import ChangelogEditor
from breezy.plugins.debian.changelog import debcommit
from breezy.commit import PointlessCommit
from breezy.tree import Tree
from breezy.plugins.quilt.quilt import (
QuiltError,
QuiltPatches,
)
class QuiltPatchPushFailure(Exception):
def __init__(self, patch_name, actual_error):
self.patch_name = patch_name
self.actual_error = actual_error
class QuiltPatchDoesNotApply(Exception):
def __init__(self, patch_name, error_lines):
self.patch_name = patch_name
self.error_lines = error_lines
def refresh_quilt_patches(
local_tree: Tree,
committer: Optional[str] = None,
subpath: str = "",
) -> None:
# TODO(jelmer):
# Find patch base branch.
# If it exists, rebase it onto the new upstream.
# And then run 'gbp pqm export' or similar
# If not:
# Refresh patches against the new upstream revision
patches = QuiltPatches(local_tree, os.path.join(subpath, "debian/patches"))
patches.upgrade()
for name in patches.unapplied():
try:
patches.push(name, refresh=True)
except QuiltError as e:
lines = e.stdout.splitlines()
m = re.match(
"Patch debian/patches/(.*) can be reverse-applied",
lines[-1])
if m:
assert m.group(1) == name
patches.delete(name, remove=True)
with ChangelogEditor(
local_tree.abspath(
os.path.join(subpath, 'debian/changelog'))
) as cl:
cl.add_entry(["Drop patch %s, present upstream." % name])
debcommit(
local_tree,
committer=committer,
subpath=subpath,
paths=[
"debian/patches/series",
"debian/patches/" + name,
"debian/changelog",
],
)
continue
m = re.match(
r"Patch debian/patches/(.*) does not apply "
r"\(enforce with -f\)", lines[-1])
if m:
assert m.group(1) == name
raise QuiltPatchDoesNotApply(name, e) from e
raise QuiltPatchPushFailure(name, e) from e
patches.pop_all()
try:
local_tree.commit(
"Refresh patches.", committer=committer, allow_pointless=False
)
except PointlessCommit:
pass
|
