/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
1551.12.36 by Aaron Bentley
Fix failing tests
1
# Copyright (C) 2007 Canonical Ltd
2
#
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
#
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.
12
#
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
16
17
1551.12.26 by Aaron Bentley
Get email working, with optional message
18
from email import Message
1551.12.2 by Aaron Bentley
Got directives round-tripping, with bundles and everything
19
from StringIO import StringIO
20
21
from bzrlib import (
1551.12.5 by Aaron Bentley
Get MergeDirective.from_objects working
22
    branch as _mod_branch,
23
    diff,
1551.12.2 by Aaron Bentley
Got directives round-tripping, with bundles and everything
24
    errors,
1551.12.16 by Aaron Bentley
Enable signing merge directives
25
    gpg,
1551.12.5 by Aaron Bentley
Get MergeDirective.from_objects working
26
    revision as _mod_revision,
1551.12.2 by Aaron Bentley
Got directives round-tripping, with bundles and everything
27
    rio,
1551.12.5 by Aaron Bentley
Get MergeDirective.from_objects working
28
    testament,
1551.12.30 by Aaron Bentley
Use patch-style dates for timestamps in merge directives
29
    timestamp,
1551.12.2 by Aaron Bentley
Got directives round-tripping, with bundles and everything
30
    )
1551.14.4 by Aaron Bentley
Change bundle reader and merge directive to both be 'mergeables'
31
from bzrlib.bundle import (
32
    serializer as bundle_serializer,
33
    )
1551.12.2 by Aaron Bentley
Got directives round-tripping, with bundles and everything
34
35
36
class MergeDirective(object):
37
1551.12.38 by Aaron Bentley
Add docs for MergeDirective and RIO-patch functions
38
    """A request to perform a merge into a branch.
39
40
    Designed to be serialized and mailed.  It provides all the information
41
    needed to perform a merge automatically, by providing at minimum a revision
42
    bundle or the location of a branch.
43
44
    The serialization format is robust against certain common forms of
45
    deterioration caused by mailing.
46
47
    The format is also designed to be patch-compatible.  If the directive
48
    includes a diff or revision bundle, it should be possible to apply it
49
    directly using the standard patch program.
50
    """
51
1551.12.45 by Aaron Bentley
Change format marker to not experimental
52
    _format_string = 'Bazaar merge directive format 1'
1551.12.12 by Aaron Bentley
Add format header
53
1551.12.4 by Aaron Bentley
Add failing test
54
    def __init__(self, revision_id, testament_sha1, time, timezone,
1551.12.13 by Aaron Bentley
Rename fields
55
                 target_branch, patch=None, patch_type=None,
1551.12.26 by Aaron Bentley
Get email working, with optional message
56
                 source_branch=None, message=None):
1551.12.38 by Aaron Bentley
Add docs for MergeDirective and RIO-patch functions
57
        """Constructor.
58
59
        :param revision_id: The revision to merge
60
        :param testament_sha1: The sha1 of the testament of the revision to
61
            merge.
62
        :param time: The current POSIX timestamp time
63
        :param timezone: The timezone offset
64
        :param target_branch: The branch to apply the merge to
65
        :param patch: The text of a diff or bundle
66
        :param patch_type: None, "diff" or "bundle", depending on the contents
67
            of patch
68
        :param source_branch: A public location to merge the revision from
69
        :param message: The message to use when committing this merge
70
        """
1551.12.2 by Aaron Bentley
Got directives round-tripping, with bundles and everything
71
        assert patch_type in (None, 'diff', 'bundle')
1551.12.13 by Aaron Bentley
Rename fields
72
        if patch_type != 'bundle' and source_branch is None:
1551.12.2 by Aaron Bentley
Got directives round-tripping, with bundles and everything
73
            raise errors.NoMergeSource()
74
        if patch_type is not None and patch is None:
75
            raise errors.PatchMissing(patch_type)
1551.12.4 by Aaron Bentley
Add failing test
76
        self.revision_id = revision_id
1551.12.2 by Aaron Bentley
Got directives round-tripping, with bundles and everything
77
        self.testament_sha1 = testament_sha1
1551.12.3 by Aaron Bentley
Add timestamps to merge directives
78
        self.time = time
79
        self.timezone = timezone
1551.12.13 by Aaron Bentley
Rename fields
80
        self.target_branch = target_branch
1551.12.2 by Aaron Bentley
Got directives round-tripping, with bundles and everything
81
        self.patch = patch
82
        self.patch_type = patch_type
1551.12.13 by Aaron Bentley
Rename fields
83
        self.source_branch = source_branch
1551.12.26 by Aaron Bentley
Get email working, with optional message
84
        self.message = message
1551.12.2 by Aaron Bentley
Got directives round-tripping, with bundles and everything
85
1551.12.12 by Aaron Bentley
Add format header
86
    @classmethod
87
    def from_lines(klass, lines):
1551.12.38 by Aaron Bentley
Add docs for MergeDirective and RIO-patch functions
88
        """Deserialize a MergeRequest from an iterable of lines
89
90
        :param lines: An iterable of lines
91
        :return: a MergeRequest
92
        """
1551.12.51 by Aaron Bentley
Allow leading junk before merge directive header
93
        line_iter = iter(lines)
94
        for line in line_iter:
95
            if line.startswith('# ' + klass._format_string):
96
                break
97
        else:
1551.12.49 by Aaron Bentley
Proper error when deserializing junk
98
            raise errors.NotAMergeDirective(lines[0])
1551.12.2 by Aaron Bentley
Got directives round-tripping, with bundles and everything
99
        stanza = rio.read_patch_stanza(line_iter)
100
        patch_lines = list(line_iter)
101
        if len(patch_lines) == 0:
102
            patch = None
1551.12.53 by Aaron Bentley
Fix deserialization of merge directives with no patch
103
            patch_type = None
1551.12.2 by Aaron Bentley
Got directives round-tripping, with bundles and everything
104
        else:
105
            patch = ''.join(patch_lines)
1551.12.53 by Aaron Bentley
Fix deserialization of merge directives with no patch
106
            try:
107
                bundle_serializer.read_bundle(StringIO(patch))
108
            except errors.NotABundle:
109
                patch_type = 'diff'
110
            else:
111
                patch_type = 'bundle'
1551.12.30 by Aaron Bentley
Use patch-style dates for timestamps in merge directives
112
        time, timezone = timestamp.parse_patch_date(stanza.get('timestamp'))
1551.12.2 by Aaron Bentley
Got directives round-tripping, with bundles and everything
113
        kwargs = {}
1551.12.13 by Aaron Bentley
Rename fields
114
        for key in ('revision_id', 'testament_sha1', 'target_branch',
1551.12.26 by Aaron Bentley
Get email working, with optional message
115
                    'source_branch', 'message'):
1551.12.2 by Aaron Bentley
Got directives round-tripping, with bundles and everything
116
            try:
117
                kwargs[key] = stanza.get(key)
118
            except KeyError:
119
                pass
1551.12.54 by Aaron Bentley
Decoded revision ids are utf-8
120
        kwargs['revision_id'] = kwargs['revision_id'].encode('utf-8')
1551.12.3 by Aaron Bentley
Add timestamps to merge directives
121
        return MergeDirective(time=time, timezone=timezone,
122
                              patch_type=patch_type, patch=patch, **kwargs)
1551.12.2 by Aaron Bentley
Got directives round-tripping, with bundles and everything
123
124
    def to_lines(self):
1551.12.38 by Aaron Bentley
Add docs for MergeDirective and RIO-patch functions
125
        """Serialize as a list of lines
126
127
        :return: a list of lines
128
        """
1551.12.30 by Aaron Bentley
Use patch-style dates for timestamps in merge directives
129
        time_str = timestamp.format_patch_date(self.time, self.timezone)
130
        stanza = rio.Stanza(revision_id=self.revision_id, timestamp=time_str,
1551.12.13 by Aaron Bentley
Rename fields
131
                            target_branch=self.target_branch,
1551.12.2 by Aaron Bentley
Got directives round-tripping, with bundles and everything
132
                            testament_sha1=self.testament_sha1)
1551.12.26 by Aaron Bentley
Get email working, with optional message
133
        for key in ('source_branch', 'message'):
1551.12.2 by Aaron Bentley
Got directives round-tripping, with bundles and everything
134
            if self.__dict__[key] is not None:
135
                stanza.add(key, self.__dict__[key])
1551.12.12 by Aaron Bentley
Add format header
136
        lines = ['# ' + self._format_string + '\n']
137
        lines.extend(rio.to_patch_lines(stanza))
1551.12.2 by Aaron Bentley
Got directives round-tripping, with bundles and everything
138
        lines.append('# \n')
139
        if self.patch is not None:
140
            lines.extend(self.patch.splitlines(True))
141
        return lines
142
1551.12.16 by Aaron Bentley
Enable signing merge directives
143
    def to_signed(self, branch):
1551.12.38 by Aaron Bentley
Add docs for MergeDirective and RIO-patch functions
144
        """Serialize as a signed string.
145
146
        :param branch: The source branch, to get the signing strategy
147
        :return: a string
148
        """
1551.12.16 by Aaron Bentley
Enable signing merge directives
149
        my_gpg = gpg.GPGStrategy(branch.get_config())
150
        return my_gpg.sign(''.join(self.to_lines()))
151
1551.12.26 by Aaron Bentley
Get email working, with optional message
152
    def to_email(self, mail_to, branch, sign=False):
1551.12.38 by Aaron Bentley
Add docs for MergeDirective and RIO-patch functions
153
        """Serialize as an email message.
154
155
        :param mail_to: The address to mail the message to
156
        :param branch: The source branch, to get the signing strategy and
157
            source email address
158
        :param sign: If True, gpg-sign the email
159
        :return: an email message
160
        """
1551.12.26 by Aaron Bentley
Get email working, with optional message
161
        mail_from = branch.get_config().username()
162
        message = Message.Message()
163
        message['To'] = mail_to
164
        message['From'] = mail_from
165
        if self.message is not None:
166
            message['Subject'] = self.message
167
        else:
168
            revision = branch.repository.get_revision(self.revision_id)
169
            message['Subject'] = revision.message
170
        if sign:
171
            body = self.to_signed(branch)
172
        else:
173
            body = ''.join(self.to_lines())
174
        message.set_payload(body)
175
        return message
176
1551.12.2 by Aaron Bentley
Got directives round-tripping, with bundles and everything
177
    @classmethod
1551.12.5 by Aaron Bentley
Get MergeDirective.from_objects working
178
    def from_objects(klass, repository, revision_id, time, timezone,
1551.12.13 by Aaron Bentley
Rename fields
179
                 target_branch, patch_type='bundle',
1551.12.27 by Aaron Bentley
support custom message everywhere
180
                 local_target_branch=None, public_branch=None, message=None):
1551.12.38 by Aaron Bentley
Add docs for MergeDirective and RIO-patch functions
181
        """Generate a merge directive from various objects
182
183
        :param repository: The repository containing the revision
184
        :param revision_id: The revision to merge
185
        :param time: The POSIX timestamp of the date the request was issued.
186
        :param timezone: The timezone of the request
187
        :param target_branch: The url of the branch to merge into
188
        :param patch_type: 'bundle', 'diff' or None, depending on the type of
189
            patch desired.
190
        :param local_target_branch: a local copy of the target branch
191
        :param public_branch: location of a public branch containing the target
192
            revision.
193
        :param message: Message to use when committing the merge
194
        :return: The merge directive
195
196
        The public branch is always used if supplied.  If the patch_type is
197
        not 'bundle', the public branch must be supplied, and will be verified.
198
199
        If the message is not supplied, the message from revision_id will be
200
        used for the commit.
201
        """
1551.12.5 by Aaron Bentley
Get MergeDirective.from_objects working
202
        t = testament.StrictTestament3.from_revision(repository, revision_id)
1551.12.50 by Aaron Bentley
Use public location of submit branch if possible
203
        submit_branch = _mod_branch.Branch.open(target_branch)
204
        if submit_branch.get_public_branch() is not None:
205
            target_branch = submit_branch.get_public_branch()
1551.12.5 by Aaron Bentley
Get MergeDirective.from_objects working
206
        if patch_type is None:
207
            patch = None
1551.12.2 by Aaron Bentley
Got directives round-tripping, with bundles and everything
208
        else:
1551.12.5 by Aaron Bentley
Get MergeDirective.from_objects working
209
            submit_revision_id = submit_branch.last_revision()
210
            repository.fetch(submit_branch.repository, submit_revision_id)
211
            ancestor_id = _mod_revision.common_ancestor(revision_id,
212
                                                        submit_revision_id,
213
                                                        repository)
1551.12.39 by Aaron Bentley
Re-design patch handling to use a dict
214
            type_handler = {'bundle': klass._generate_bundle,
215
                            'diff': klass._generate_diff,
216
                            None: lambda x, y, z: None }
217
            patch = type_handler[patch_type](repository, revision_id,
218
                                             ancestor_id)
1551.12.5 by Aaron Bentley
Get MergeDirective.from_objects working
219
            if patch_type == 'bundle':
220
                s = StringIO()
221
                bundle_serializer.write_bundle(repository, revision_id,
222
                                               ancestor_id, s)
223
                patch = s.getvalue()
224
            elif patch_type == 'diff':
225
                patch = klass._generate_diff(repository, revision_id,
226
                                             ancestor_id)
1551.12.33 by Aaron Bentley
Take public_branch as a string, not object
227
1551.12.34 by Aaron Bentley
Check public branch only if not using a bundle
228
            if public_branch is not None and patch_type != 'bundle':
1551.12.33 by Aaron Bentley
Take public_branch as a string, not object
229
                public_branch_obj = _mod_branch.Branch.open(public_branch)
230
                if not public_branch_obj.repository.has_revision(revision_id):
231
                    raise errors.PublicBranchOutOfDate(public_branch,
232
                                                       revision_id)
233
1551.12.5 by Aaron Bentley
Get MergeDirective.from_objects working
234
        return MergeDirective(revision_id, t.as_sha1(), time, timezone,
1551.12.33 by Aaron Bentley
Take public_branch as a string, not object
235
                              target_branch, patch, patch_type, public_branch,
1551.12.27 by Aaron Bentley
support custom message everywhere
236
                              message)
1551.12.5 by Aaron Bentley
Get MergeDirective.from_objects working
237
238
    @staticmethod
239
    def _generate_diff(repository, revision_id, ancestor_id):
240
        tree_1 = repository.revision_tree(ancestor_id)
241
        tree_2 = repository.revision_tree(revision_id)
242
        s = StringIO()
1551.12.40 by Aaron Bentley
Do not show prefixes in diffs
243
        diff.show_diff_trees(tree_1, tree_2, s, old_label='', new_label='')
1551.12.5 by Aaron Bentley
Get MergeDirective.from_objects working
244
        return s.getvalue()
1551.12.39 by Aaron Bentley
Re-design patch handling to use a dict
245
246
    @staticmethod
247
    def _generate_bundle(repository, revision_id, ancestor_id):
248
        s = StringIO()
249
        bundle_serializer.write_bundle(repository, revision_id,
250
                                       ancestor_id, s)
251
        return s.getvalue()
1551.14.4 by Aaron Bentley
Change bundle reader and merge directive to both be 'mergeables'
252
1551.14.9 by Aaron Bentley
rename get_target_revision to install_revisions
253
    def install_revisions(self, target_repo):
254
        """Install revisions and return the target revision"""
1551.14.4 by Aaron Bentley
Change bundle reader and merge directive to both be 'mergeables'
255
        if not target_repo.has_revision(self.revision_id):
256
            if self.patch_type == 'bundle':
1551.14.9 by Aaron Bentley
rename get_target_revision to install_revisions
257
                info = bundle_serializer.read_bundle(StringIO(self.patch))
258
                # We don't use the bundle's target revision, because
259
                # MergeDirective.revision_id is authoritative.
260
                info.install_revisions(target_repo)
1551.14.4 by Aaron Bentley
Change bundle reader and merge directive to both be 'mergeables'
261
            else:
262
                source_branch = _mod_branch.Branch.open(self.source_branch)
263
                target_repo.fetch(source_branch.repository, self.revision_id)
264
        return self.revision_id