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
|
# quilt.py -- Quilt patch handling
# Copyright (C) 2011 Canonical Ltd.
#
# 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
#
"""Quilt patch handling."""
from __future__ import absolute_import
import shutil
import tempfile
from bzrlib.mutabletree import MutableTree
from bzrlib.revisiontree import RevisionTree
from bzrlib import (
errors,
merge as _mod_merge,
trace,
)
from bzrlib.plugins.builddeb import gettext
from bzrlib.plugins.builddeb.quilt import (
quilt_applied,
quilt_unapplied,
quilt_pop,
quilt_pop_all,
quilt_push,
quilt_push_all,
quilt_series,
)
from bzrlib.plugins.builddeb.util import debuild_config
class NoUnapplyingMerger(_mod_merge.Merge3Merger):
_no_quilt_unapplying = True
def tree_unapply_patches(orig_tree, orig_branch=None, force=False):
"""Return a tree with patches unapplied.
:param orig_tree: Tree from which to unapply quilt patches
:param orig_branch: Related branch (optional)
:return: Tuple with tree and temp path.
The tree is a tree with unapplied patches; either a checkout of
tree or tree itself if there were no patches
"""
if orig_branch is None:
orig_branch = orig_tree.branch
applied_patches = quilt_applied(orig_tree)
if not applied_patches:
# No quilt patches
return orig_tree, None
target_dir = tempfile.mkdtemp()
try:
if isinstance(orig_tree, MutableTree):
tree = orig_branch.create_checkout(target_dir, lightweight=True,
revision_id=orig_tree.last_revision(), accelerator_tree=orig_tree)
merger = _mod_merge.Merger.from_uncommitted(tree, orig_tree)
merger.merge_type = NoUnapplyingMerger
merger.do_merge()
elif isinstance(orig_tree, RevisionTree):
tree = orig_branch.create_checkout(target_dir, lightweight=True,
accelerator_tree=orig_tree, revision_id=orig_tree.get_revision_id())
else:
trace.mutter("Not sure how to create copy of %r", orig_tree)
shutil.rmtree(target_dir)
return orig_tree, None
trace.mutter("Applying quilt patches for %r in %s", orig_tree, target_dir)
quilt_pop_all(working_dir=tree.basedir, force=force)
return tree, target_dir
except:
shutil.rmtree(target_dir)
raise
def post_process_quilt_patches(tree, old_patches, policy):
"""(Un)apply patches after a merge.
:param tree: Working tree to work in
:param old_patches: List of patches applied before the operation (usually a merge)
"""
new_patches = quilt_series(tree)
applied_patches = quilt_applied(tree)
if policy == "applied":
to_apply = []
for p in new_patches:
if p in old_patches:
continue
if not p in applied_patches:
to_apply.append(p)
if to_apply == []:
return
trace.note(gettext("Applying %d quilt patches."), to_apply)
for p in to_apply:
quilt_push(tree.basedir, p)
elif policy == "unapplied":
to_unapply = []
for p in new_patches:
if p in old_patches:
continue
if p in applied_patches:
to_unapply.append(p)
if to_unapply == []:
return
trace.note(gettext("Unapplying %d quilt patches."), to_unapply)
for p in to_unapply:
quilt_pop(tree.basedir, p)
def start_commit_quilt_patches(tree):
config = debuild_config(tree, False)
policy = config.quilt_commit_policy
applied_patches = quilt_applied(tree)
unapplied_patches = quilt_unapplied(tree.basedir)
if policy is None:
# No policy set - just warn about having both applied and unapplied
# patches.
if applied_patches and unapplied_patches:
trace.warning(
gettext("Committing with %d patches applied and %d patches unapplied."),
len(applied_patches), len(unapplied_patches))
elif policy == "applied":
quilt_push_all(tree.basedir)
elif policy == "unapplied":
quilt_pop_all(tree.basedir)
else:
raise errors.BzrError("Invalid setting %r for quilt-commit-policy" %
policy)
|