← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/send.py

  • Committer: Jelmer Vernooij
  • Date: 2011-11-27 17:42:25 UTC
  • mto: This revision was merged to the branch mainline in revision 6311.
  • Revision ID: jelmer@samba.org-20111127174225-tspfeewl0gwxxumt
Add possible_transports in a couple more places.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/send.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
 
from __future__ import absolute_import
18
17
 
19
18
import os
20
19
import time
38
37
format_registry = registry.Registry()
39
38
 
40
39
 
41
 
def send(target_branch, revision, public_branch, remember,
42
 
         format, no_bundle, no_patch, output, from_, mail_to, message, body,
 
40
def send(submit_branch, revision, public_branch, remember, format,
 
41
         no_bundle, no_patch, output, from_, mail_to, message, body,
43
42
         to_file, strict=None):
44
 
    possible_transports = []
45
43
    tree, branch = controldir.ControlDir.open_containing_tree_or_branch(
46
 
        from_, possible_transports=possible_transports)[:2]
 
44
        from_)[:2]
47
45
    # we may need to write data into branch's repository to calculate
48
46
    # the data to send.
49
47
    branch.lock_write()
50
48
    try:
51
49
        if output is None:
52
 
            config_stack = branch.get_config_stack()
 
50
            config = branch.get_config()
53
51
            if mail_to is None:
54
 
                mail_to = config_stack.get('submit_to')
55
 
            mail_client = config_stack.get('mail_client')(config_stack)
 
52
                mail_to = config.get_user_option('submit_to')
 
53
            mail_client = config.get_mail_client()
56
54
            if (not getattr(mail_client, 'supports_body', False)
57
55
                and body is not None):
58
56
                raise errors.BzrCommandError(gettext(
59
57
                    'Mail client "%s" does not support specifying body') %
60
58
                    mail_client.__class__.__name__)
61
 
        if remember and target_branch is None:
 
59
        if remember and submit_branch is None:
62
60
            raise errors.BzrCommandError(gettext(
63
61
                '--remember requires a branch to be specified.'))
64
 
        stored_target_branch = branch.get_submit_branch()
65
 
        remembered_target_branch = None
66
 
        if target_branch is None:
67
 
            target_branch = stored_target_branch
68
 
            remembered_target_branch = "submit"
 
62
        stored_submit_branch = branch.get_submit_branch()
 
63
        remembered_submit_branch = None
 
64
        if submit_branch is None:
 
65
            submit_branch = stored_submit_branch
 
66
            remembered_submit_branch = "submit"
69
67
        else:
70
68
            # Remembers if asked explicitly or no previous location is set
71
 
            if remember or (
72
 
                    remember is None and stored_target_branch is None):
73
 
                branch.set_submit_branch(target_branch)
74
 
        if target_branch is None:
75
 
            target_branch = branch.get_parent()
76
 
            remembered_target_branch = "parent"
77
 
        if target_branch is None:
 
69
            if remember or (remember is None and stored_submit_branch is None):
 
70
                branch.set_submit_branch(submit_branch)
 
71
        if submit_branch is None:
 
72
            submit_branch = branch.get_parent()
 
73
            remembered_submit_branch = "parent"
 
74
        if submit_branch is None:
78
75
            raise errors.BzrCommandError(gettext('No submit branch known or'
79
76
                                         ' specified'))
80
 
        if remembered_target_branch is not None:
 
77
        if remembered_submit_branch is not None:
81
78
            trace.note(gettext('Using saved {0} location "{1}" to determine '
82
79
                       'what changes to submit.').format(
83
 
                                    remembered_target_branch,
84
 
                                    target_branch))
 
80
                                    remembered_submit_branch, submit_branch))
85
81
 
86
 
        submit_branch = Branch.open(target_branch,
87
 
            possible_transports=possible_transports)
88
 
        possible_transports.append(submit_branch.bzrdir.root_transport)
89
82
        if mail_to is None or format is None:
 
83
            # TODO: jam 20090716 we open the submit_branch here, but we *don't*
 
84
            #       pass it down into the format creation, so it will have to
 
85
            #       open it again
 
86
            submit_br = Branch.open(submit_branch)
 
87
            submit_config = submit_br.get_config()
90
88
            if mail_to is None:
91
 
                mail_to = submit_branch.get_config_stack().get(
92
 
                    'child_submit_to')
 
89
                mail_to = submit_config.get_user_option("child_submit_to")
93
90
            if format is None:
94
 
                formatname = submit_branch.get_child_submit_format()
 
91
                formatname = submit_br.get_child_submit_format()
95
92
                try:
96
93
                    format = format_registry.get(formatname)
97
94
                except KeyError:
98
 
                    raise errors.BzrCommandError(
99
 
                        gettext("No such send format '%s'.") % formatname)
 
95
                    raise errors.BzrCommandError(gettext("No such send format '%s'.") % 
 
96
                                                 formatname)
100
97
 
101
98
        stored_public_branch = branch.get_public_branch()
102
99
        if public_branch is None:
128
125
            raise errors.BzrCommandError(gettext('No revisions to submit.'))
129
126
        if format is None:
130
127
            format = format_registry.get()
131
 
        directive = format(branch, revision_id, target_branch,
132
 
            public_branch, no_patch, no_bundle, message, base_revision_id,
133
 
            submit_branch)
 
128
        directive = format(branch, revision_id, submit_branch,
 
129
            public_branch, no_patch, no_bundle, message, base_revision_id)
134
130
        if output is None:
135
131
            directive.compose_merge_request(mail_client, mail_to, body,
136
132
                                            branch, tree)
162
158
        branch.unlock()
163
159
 
164
160
 
165
 
def _send_4(branch, revision_id, target_branch, public_branch,
166
 
            no_patch, no_bundle, message,
167
 
            base_revision_id, local_target_branch=None):
 
161
def _send_4(branch, revision_id, submit_branch, public_branch,
 
162
            no_patch, no_bundle, message, base_revision_id):
168
163
    from bzrlib import merge_directive
169
164
    return merge_directive.MergeDirective2.from_objects(
170
165
        branch.repository, revision_id, time.time(),
171
 
        osutils.local_time_offset(), target_branch,
172
 
        public_branch=public_branch,
173
 
        include_patch=not no_patch,
 
166
        osutils.local_time_offset(), submit_branch,
 
167
        public_branch=public_branch, include_patch=not no_patch,
174
168
        include_bundle=not no_bundle, message=message,
175
 
        base_revision_id=base_revision_id,
176
 
        local_target_branch=local_target_branch)
 
169
        base_revision_id=base_revision_id)
177
170
 
178
171
 
179
172
def _send_0_9(branch, revision_id, submit_branch, public_branch,
180
 
              no_patch, no_bundle, message,
181
 
              base_revision_id, local_target_branch=None):
 
173
              no_patch, no_bundle, message, base_revision_id):
182
174
    if not no_bundle:
183
175
        if not no_patch:
184
176
            patch_type = 'bundle'
195
187
        branch.repository, revision_id, time.time(),
196
188
        osutils.local_time_offset(), submit_branch,
197
189
        public_branch=public_branch, patch_type=patch_type,
198
 
        message=message, local_target_branch=local_target_branch)
199
 
 
200
 
 
201
 
format_registry.register('4',
 
190
        message=message)
 
191
 
 
192
 
 
193
format_registry.register('4', 
202
194
    _send_4, 'Bundle format 4, Merge Directive 2 (default)')
203
195
format_registry.register('0.9',
204
196
    _send_0_9, 'Bundle format 0.9, Merge Directive 1')