← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge_directive.py

  • Committer: Danny van Heumen
  • Date: 2010-03-09 21:42:11 UTC
  • mto: (4634.139.5 2.0)
  • mto: This revision was merged to the branch mainline in revision 5160.
  • Revision ID: danny@dannyvanheumen.nl-20100309214211-iqh42x6qcikgd9p3
Reverted now-useless TODO list.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge_directive.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
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
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
 
18
18
from StringIO import StringIO
23
23
    diff,
24
24
    errors,
25
25
    gpg,
 
26
    hooks,
26
27
    registry,
27
28
    revision as _mod_revision,
28
29
    rio,
29
30
    testament,
30
31
    timestamp,
 
32
    trace,
31
33
    )
32
34
from bzrlib.bundle import (
33
35
    serializer as bundle_serializer,
35
37
from bzrlib.email_message import EmailMessage
36
38
 
37
39
 
 
40
class MergeRequestBodyParams(object):
 
41
    """Parameter object for the merge_request_body hook."""
 
42
 
 
43
    def __init__(self, body, orig_body, directive, to, basename, subject,
 
44
                 branch, tree=None):
 
45
        self.body = body
 
46
        self.orig_body = orig_body
 
47
        self.directive = directive
 
48
        self.branch = branch
 
49
        self.tree = tree
 
50
        self.to = to
 
51
        self.basename = basename
 
52
        self.subject = subject
 
53
 
 
54
 
 
55
class MergeDirectiveHooks(hooks.Hooks):
 
56
    """Hooks for MergeDirective classes."""
 
57
 
 
58
    def __init__(self):
 
59
        hooks.Hooks.__init__(self)
 
60
        self.create_hook(hooks.HookPoint('merge_request_body',
 
61
            "Called with a MergeRequestBodyParams when a body is needed for"
 
62
            " a merge request.  Callbacks must return a body.  If more"
 
63
            " than one callback is registered, the output of one callback is"
 
64
            " provided to the next.", (1, 15, 0), False))
 
65
 
 
66
 
38
67
class _BaseMergeDirective(object):
39
68
 
 
69
    hooks = MergeDirectiveHooks()
 
70
 
40
71
    def __init__(self, revision_id, testament_sha1, time, timezone,
41
72
                 target_branch, patch=None, source_branch=None, message=None,
42
73
                 bundle=None):
210
241
                except errors.RevisionNotPresent:
211
242
                    # At least one dependency isn't present.  Try installing
212
243
                    # missing revisions from the submit branch
213
 
                    submit_branch = _mod_branch.Branch.open(self.target_branch)
 
244
                    try:
 
245
                        submit_branch = \
 
246
                            _mod_branch.Branch.open(self.target_branch)
 
247
                    except errors.NotBranchError:
 
248
                        raise errors.TargetNotBranch(self.target_branch)
214
249
                    missing_revisions = []
215
250
                    bundle_revisions = set(r.revision_id for r in
216
251
                                           info.real_revisions)
236
271
                target_repo.fetch(source_branch.repository, self.revision_id)
237
272
        return self.revision_id
238
273
 
 
274
    def compose_merge_request(self, mail_client, to, body, branch, tree=None):
 
275
        """Compose a request to merge this directive.
 
276
 
 
277
        :param mail_client: The mail client to use for composing this request.
 
278
        :param to: The address to compose the request to.
 
279
        :param branch: The Branch that was used to produce this directive.
 
280
        :param tree: The Tree (if any) for the Branch used to produce this
 
281
            directive.
 
282
        """
 
283
        basename = self.get_disk_name(branch)
 
284
        subject = '[MERGE] '
 
285
        if self.message is not None:
 
286
            subject += self.message
 
287
        else:
 
288
            revision = branch.repository.get_revision(self.revision_id)
 
289
            subject += revision.get_summary()
 
290
        if getattr(mail_client, 'supports_body', False):
 
291
            orig_body = body
 
292
            for hook in self.hooks['merge_request_body']:
 
293
                params = MergeRequestBodyParams(body, orig_body, self,
 
294
                                                to, basename, subject, branch,
 
295
                                                tree)
 
296
                body = hook(params)
 
297
        elif len(self.hooks['merge_request_body']) > 0:
 
298
            trace.warning('Cannot run merge_request_body hooks because mail'
 
299
                          ' client %s does not support message bodies.',
 
300
                        mail_client.__class__.__name__)
 
301
        mail_client.compose_merge_request(to, subject,
 
302
                                          ''.join(self.to_lines()),
 
303
                                          basename, body)
 
304
 
239
305
 
240
306
class MergeDirective(_BaseMergeDirective):
241
307
 
516
582
                    revision_id):
517
583
                    raise errors.PublicBranchOutOfDate(public_branch,
518
584
                                                       revision_id)
 
585
            testament_sha1 = t.as_sha1()
519
586
        finally:
520
587
            for entry in reversed(locked):
521
588
                entry.unlock()
522
 
        return klass(revision_id, t.as_sha1(), time, timezone, target_branch,
523
 
            patch, public_branch, message, bundle, base_revision_id)
 
589
        return klass(revision_id, testament_sha1, time, timezone,
 
590
            target_branch, patch, public_branch, message, bundle,
 
591
            base_revision_id)
524
592
 
525
593
    def _verify_patch(self, repository):
526
594
        calculated_patch = self._generate_diff(repository, self.revision_id,
562
630
_format_registry = MergeDirectiveFormatRegistry()
563
631
_format_registry.register(MergeDirective)
564
632
_format_registry.register(MergeDirective2)
 
633
# 0.19 never existed.  It got renamed to 0.90.  But by that point, there were
 
634
# already merge directives in the wild that used 0.19. Registering with the old
 
635
# format string to retain compatibility with those merge directives.
565
636
_format_registry.register(MergeDirective2,
566
637
                          'Bazaar merge directive format 2 (Bazaar 0.19)')