← 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-02-20 12:19:29 UTC
  • mfrom: (6437.23.11 2.5)
  • mto: (6581.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 6582.
  • Revision ID: jelmer@samba.org-20120220121929-7ni2psvjoatm1yp4
Merge bzr/2.5.

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