← 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: 2012-01-06 22:44:57 UTC
  • mfrom: (6436 +trunk)
  • mto: (6437.3.11 2.5)
  • mto: This revision was merged to the branch mainline in revision 6444.
  • Revision ID: jelmer@samba.org-20120106224457-re0pcy0fz31xob77
Merge bzr.dev.

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