← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/send.py

  • Committer: Sidnei da Silva
  • Date: 2009-05-29 14:19:29 UTC
  • mto: (4531.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4532.
  • Revision ID: sidnei.da.silva@canonical.com-20090529141929-3heywbvj36po72a5
- Add initial config

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/send.py
1
 
# Copyright (C) 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2009 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
20
20
from bzrlib import (
21
21
    bzrdir,
22
22
    errors,
 
23
    merge_directive,
23
24
    osutils,
24
25
    registry,
25
26
    trace,
36
37
 
37
38
 
38
39
def send(submit_branch, revision, public_branch, remember, format,
39
 
         no_bundle, no_patch, output, from_, mail_to, message, body,
40
 
         to_file, strict=None):
 
40
         no_bundle, no_patch, output, from_, mail_to, message, body, 
 
41
         to_file):
41
42
    tree, branch = bzrdir.BzrDir.open_containing_tree_or_branch(from_)[:2]
42
43
    # we may need to write data into branch's repository to calculate
43
44
    # the data to send.
76
77
                       submit_branch)
77
78
 
78
79
        if mail_to is None or format is None:
79
 
            # TODO: jam 20090716 we open the submit_branch here, but we *don't*
80
 
            #       pass it down into the format creation, so it will have to
81
 
            #       open it again
82
80
            submit_br = Branch.open(submit_branch)
83
81
            submit_config = submit_br.get_config()
84
82
            if mail_to is None:
109
107
            if len(revision) == 2:
110
108
                base_revision_id = revision[0].as_revision_id(branch)
111
109
        if revision_id is None:
112
 
            if strict is None:
113
 
                strict = branch.get_config(
114
 
                    ).get_user_option_as_bool('send_strict')
115
 
            if strict is None: strict = True # default value
116
 
            if strict and tree is not None:
117
 
                if (tree.has_changes()):
118
 
                    raise errors.UncommittedChanges(
119
 
                        tree, more='Use --no-strict to force the send.')
120
 
                if tree.last_revision() != tree.branch.last_revision():
121
 
                    # The tree has lost sync with its branch, there is little
122
 
                    # chance that the user is aware of it but he can still force
123
 
                    # the send with --no-strict
124
 
                    raise errors.OutOfDateTree(
125
 
                        tree, more='Use --no-strict to force the send.')
126
110
            revision_id = branch.last_revision()
127
111
        if revision_id == NULL_REVISION:
128
112
            raise errors.BzrCommandError('No revisions to submit.')
129
113
        if format is None:
 
114
            # TODO: Query submit branch for its preferred format
130
115
            format = format_registry.get()
131
 
        directive = format(branch, revision_id, submit_branch,
 
116
        directive = format(branch, revision_id, submit_branch, 
132
117
            public_branch, no_patch, no_bundle, message, base_revision_id)
133
118
        if output is None:
134
119
            directive.compose_merge_request(mail_client, mail_to, body,
149
134
 
150
135
def _send_4(branch, revision_id, submit_branch, public_branch,
151
136
            no_patch, no_bundle, message, base_revision_id):
152
 
    from bzrlib import merge_directive
153
137
    return merge_directive.MergeDirective2.from_objects(
154
138
        branch.repository, revision_id, time.time(),
155
139
        osutils.local_time_offset(), submit_branch,
171
155
            patch_type = 'diff'
172
156
        else:
173
157
            patch_type = None
174
 
    from bzrlib import merge_directive
175
158
    return merge_directive.MergeDirective.from_objects(
176
159
        branch.repository, revision_id, time.time(),
177
160
        osutils.local_time_offset(), submit_branch,