← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/send.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-08-17 18:13:57 UTC
  • mfrom: (5268.7.29 transport-segments)
  • Revision ID: pqm@pqm.ubuntu.com-20110817181357-y5q5eth1hk8bl3om
(jelmer) Allow specifying the colocated branch to use in the branch URL,
 and retrieving the branch name using ControlDir._get_selected_branch.
 (Jelmer Vernooij)

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
21
20
 
22
21
from bzrlib import (
23
 
    controldir,
 
22
    bzrdir,
24
23
    errors,
25
24
    osutils,
26
25
    registry,
27
26
    trace,
28
27
    )
29
 
from bzrlib.i18n import gettext
30
28
from bzrlib.branch import (
31
29
    Branch,
32
30
    )
38
36
format_registry = registry.Registry()
39
37
 
40
38
 
41
 
def send(target_branch, revision, public_branch, remember,
42
 
         format, no_bundle, no_patch, output, from_, mail_to, message, body,
 
39
def send(submit_branch, revision, public_branch, remember, format,
 
40
         no_bundle, no_patch, output, from_, mail_to, message, body,
43
41
         to_file, strict=None):
44
 
    possible_transports = []
45
 
    tree, branch = controldir.ControlDir.open_containing_tree_or_branch(
46
 
        from_, possible_transports=possible_transports)[:2]
 
42
    tree, branch = bzrdir.BzrDir.open_containing_tree_or_branch(from_)[:2]
47
43
    # we may need to write data into branch's repository to calculate
48
44
    # the data to send.
49
45
    branch.lock_write()
50
46
    try:
51
47
        if output is None:
52
 
            config_stack = branch.get_config_stack()
 
48
            config = branch.get_config()
53
49
            if mail_to is None:
54
 
                mail_to = config_stack.get('submit_to')
55
 
            mail_client = config_stack.get('mail_client')(config_stack)
 
50
                mail_to = config.get_user_option('submit_to')
 
51
            mail_client = config.get_mail_client()
56
52
            if (not getattr(mail_client, 'supports_body', False)
57
53
                and body is not None):
58
 
                raise errors.BzrCommandError(gettext(
59
 
                    'Mail client "%s" does not support specifying body') %
 
54
                raise errors.BzrCommandError(
 
55
                    'Mail client "%s" does not support specifying body' %
60
56
                    mail_client.__class__.__name__)
61
 
        if remember and target_branch is None:
62
 
            raise errors.BzrCommandError(gettext(
63
 
                '--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"
 
57
        if remember and submit_branch is None:
 
58
            raise errors.BzrCommandError(
 
59
                '--remember requires a branch to be specified.')
 
60
        stored_submit_branch = branch.get_submit_branch()
 
61
        remembered_submit_branch = None
 
62
        if submit_branch is None:
 
63
            submit_branch = stored_submit_branch
 
64
            remembered_submit_branch = "submit"
69
65
        else:
70
66
            # 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:
78
 
            raise errors.BzrCommandError(gettext('No submit branch known or'
79
 
                                         ' specified'))
80
 
        if remembered_target_branch is not None:
81
 
            trace.note(gettext('Using saved {0} location "{1}" to determine '
82
 
                       'what changes to submit.').format(
83
 
                                    remembered_target_branch,
84
 
                                    target_branch))
 
67
            if remember or (remember is None and stored_submit_branch is None):
 
68
                branch.set_submit_branch(submit_branch)
 
69
        if submit_branch is None:
 
70
            submit_branch = branch.get_parent()
 
71
            remembered_submit_branch = "parent"
 
72
        if submit_branch is None:
 
73
            raise errors.BzrCommandError('No submit branch known or'
 
74
                                         ' specified')
 
75
        if remembered_submit_branch is not None:
 
76
            trace.note('Using saved %s location "%s" to determine what '
 
77
                       'changes to submit.', remembered_submit_branch,
 
78
                       submit_branch)
85
79
 
86
 
        submit_branch = Branch.open(target_branch,
87
 
            possible_transports=possible_transports)
88
 
        possible_transports.append(submit_branch.bzrdir.root_transport)
89
80
        if mail_to is None or format is None:
 
81
            # TODO: jam 20090716 we open the submit_branch here, but we *don't*
 
82
            #       pass it down into the format creation, so it will have to
 
83
            #       open it again
 
84
            submit_br = Branch.open(submit_branch)
 
85
            submit_config = submit_br.get_config()
90
86
            if mail_to is None:
91
 
                mail_to = submit_branch.get_config_stack().get(
92
 
                    'child_submit_to')
 
87
                mail_to = submit_config.get_user_option("child_submit_to")
93
88
            if format is None:
94
 
                formatname = submit_branch.get_child_submit_format()
 
89
                formatname = submit_br.get_child_submit_format()
95
90
                try:
96
91
                    format = format_registry.get(formatname)
97
92
                except KeyError:
98
 
                    raise errors.BzrCommandError(
99
 
                        gettext("No such send format '%s'.") % formatname)
 
93
                    raise errors.BzrCommandError("No such send format '%s'." % 
 
94
                                                 formatname)
100
95
 
101
96
        stored_public_branch = branch.get_public_branch()
102
97
        if public_branch is None:
106
101
              or (remember is None and stored_public_branch is None)):
107
102
            branch.set_public_branch(public_branch)
108
103
        if no_bundle and public_branch is None:
109
 
            raise errors.BzrCommandError(gettext('No public branch specified or'
110
 
                                         ' known'))
 
104
            raise errors.BzrCommandError('No public branch specified or'
 
105
                                         ' known')
111
106
        base_revision_id = None
112
107
        revision_id = None
113
108
        if revision is not None:
114
109
            if len(revision) > 2:
115
 
                raise errors.BzrCommandError(gettext('bzr send takes '
116
 
                    'at most two one revision identifiers'))
 
110
                raise errors.BzrCommandError('bzr send takes '
 
111
                    'at most two one revision identifiers')
117
112
            revision_id = revision[-1].as_revision_id(branch)
118
113
            if len(revision) == 2:
119
114
                base_revision_id = revision[0].as_revision_id(branch)
125
120
                    more_warning='Uncommitted changes will not be sent.')
126
121
            revision_id = branch.last_revision()
127
122
        if revision_id == NULL_REVISION:
128
 
            raise errors.BzrCommandError(gettext('No revisions to submit.'))
 
123
            raise errors.BzrCommandError('No revisions to submit.')
129
124
        if format is None:
130
125
            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)
 
126
        directive = format(branch, revision_id, submit_branch,
 
127
            public_branch, no_patch, no_bundle, message, base_revision_id)
134
128
        if output is None:
135
129
            directive.compose_merge_request(mail_client, mail_to, body,
136
130
                                            branch, tree)
137
131
        else:
138
132
            if directive.multiple_output_files:
139
133
                if output == '-':
140
 
                    raise errors.BzrCommandError(gettext('- not supported for '
141
 
                        'merge directives that use more than one output file.'))
 
134
                    raise errors.BzrCommandError('- not supported for '
 
135
                        'merge directives that use more than one output file.')
142
136
                if not os.path.exists(output):
143
137
                    os.mkdir(output, 0755)
144
138
                for (filename, lines) in directive.to_files():
162
156
        branch.unlock()
163
157
 
164
158
 
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):
 
159
def _send_4(branch, revision_id, submit_branch, public_branch,
 
160
            no_patch, no_bundle, message, base_revision_id):
168
161
    from bzrlib import merge_directive
169
162
    return merge_directive.MergeDirective2.from_objects(
170
163
        branch.repository, revision_id, time.time(),
171
 
        osutils.local_time_offset(), target_branch,
172
 
        public_branch=public_branch,
173
 
        include_patch=not no_patch,
 
164
        osutils.local_time_offset(), submit_branch,
 
165
        public_branch=public_branch, include_patch=not no_patch,
174
166
        include_bundle=not no_bundle, message=message,
175
 
        base_revision_id=base_revision_id,
176
 
        local_target_branch=local_target_branch)
 
167
        base_revision_id=base_revision_id)
177
168
 
178
169
 
179
170
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):
 
171
              no_patch, no_bundle, message, base_revision_id):
182
172
    if not no_bundle:
183
173
        if not no_patch:
184
174
            patch_type = 'bundle'
185
175
        else:
186
 
            raise errors.BzrCommandError(gettext('Format 0.9 does not'
187
 
                ' permit bundle with no patch'))
 
176
            raise errors.BzrCommandError('Format 0.9 does not'
 
177
                ' permit bundle with no patch')
188
178
    else:
189
179
        if not no_patch:
190
180
            patch_type = 'diff'
195
185
        branch.repository, revision_id, time.time(),
196
186
        osutils.local_time_offset(), submit_branch,
197
187
        public_branch=public_branch, patch_type=patch_type,
198
 
        message=message, local_target_branch=local_target_branch)
199
 
 
200
 
 
201
 
format_registry.register('4',
 
188
        message=message)
 
189
 
 
190
 
 
191
format_registry.register('4', 
202
192
    _send_4, 'Bundle format 4, Merge Directive 2 (default)')
203
193
format_registry.register('0.9',
204
194
    _send_0_9, 'Bundle format 0.9, Merge Directive 1')