← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/send.py

  • Committer: Martin Packman
  • Date: 2012-01-05 09:50:04 UTC
  • mfrom: (6424 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6426.
  • Revision ID: martin.packman@canonical.com-20120105095004-mia9xb7y0efmto0v
Merge bzr.dev to resolve conflicts in bzrlib.builtins

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
    tree, branch = controldir.ControlDir.open_containing_tree_or_branch(
 
45
        from_)[:2]
 
46
    possible_transports = [tree.bzrdir.transport, branch.bzrdir.transport]
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()
51
55
            mail_client = config.get_mail_client()
52
56
            if (not getattr(mail_client, 'supports_body', False)
53
57
                and body is not None):
54
 
                raise errors.BzrCommandError(
55
 
                    'Mail client "%s" does not support specifying body' %
 
58
                raise errors.BzrCommandError(gettext(
 
59
                    'Mail client "%s" does not support specifying body') %
56
60
                    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"
 
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"
65
69
        else:
66
70
            # 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)
 
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))
79
85
 
 
86
        submit_branch = Branch.open(target_branch,
 
87
            possible_transports=possible_transports)
 
88
        possible_transports.append(submit_branch.bzrdir.root_transport)
80
89
        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
            submit_config = submit_branch.get_config()
86
91
            if mail_to is None:
87
92
                mail_to = submit_config.get_user_option("child_submit_to")
88
93
            if format is None:
89
 
                formatname = submit_br.get_child_submit_format()
 
94
                formatname = submit_branch.get_child_submit_format()
90
95
                try:
91
96
                    format = format_registry.get(formatname)
92
97
                except KeyError:
93
 
                    raise errors.BzrCommandError("No such send format '%s'." % 
 
98
                    raise errors.BzrCommandError(gettext("No such send format '%s'.") % 
94
99
                                                 formatname)
95
100
 
96
101
        stored_public_branch = branch.get_public_branch()
101
106
              or (remember is None and stored_public_branch is None)):
102
107
            branch.set_public_branch(public_branch)
103
108
        if no_bundle and public_branch is None:
104
 
            raise errors.BzrCommandError('No public branch specified or'
105
 
                                         ' known')
 
109
            raise errors.BzrCommandError(gettext('No public branch specified or'
 
110
                                         ' known'))
106
111
        base_revision_id = None
107
112
        revision_id = None
108
113
        if revision is not None:
109
114
            if len(revision) > 2:
110
 
                raise errors.BzrCommandError('bzr send takes '
111
 
                    'at most two one revision identifiers')
 
115
                raise errors.BzrCommandError(gettext('bzr send takes '
 
116
                    'at most two one revision identifiers'))
112
117
            revision_id = revision[-1].as_revision_id(branch)
113
118
            if len(revision) == 2:
114
119
                base_revision_id = revision[0].as_revision_id(branch)
120
125
                    more_warning='Uncommitted changes will not be sent.')
121
126
            revision_id = branch.last_revision()
122
127
        if revision_id == NULL_REVISION:
123
 
            raise errors.BzrCommandError('No revisions to submit.')
 
128
            raise errors.BzrCommandError(gettext('No revisions to submit.'))
124
129
        if format is None:
125
130
            format = format_registry.get()
126
 
        directive = format(branch, revision_id, submit_branch,
127
 
            public_branch, no_patch, no_bundle, message, base_revision_id)
 
131
        directive = format(branch, revision_id, target_branch,
 
132
            public_branch, no_patch, no_bundle, message, base_revision_id,
 
133
            submit_branch)
128
134
        if output is None:
129
135
            directive.compose_merge_request(mail_client, mail_to, body,
130
136
                                            branch, tree)
131
137
        else:
132
138
            if directive.multiple_output_files:
133
139
                if output == '-':
134
 
                    raise errors.BzrCommandError('- not supported for '
135
 
                        'merge directives that use more than one output file.')
 
140
                    raise errors.BzrCommandError(gettext('- not supported for '
 
141
                        'merge directives that use more than one output file.'))
136
142
                if not os.path.exists(output):
137
143
                    os.mkdir(output, 0755)
138
144
                for (filename, lines) in directive.to_files():
156
162
        branch.unlock()
157
163
 
158
164
 
159
 
def _send_4(branch, revision_id, submit_branch, public_branch,
160
 
            no_patch, no_bundle, message, base_revision_id):
 
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
168
    from bzrlib import merge_directive
162
169
    return merge_directive.MergeDirective2.from_objects(
163
170
        branch.repository, revision_id, time.time(),
164
 
        osutils.local_time_offset(), submit_branch,
165
 
        public_branch=public_branch, include_patch=not no_patch,
 
171
        osutils.local_time_offset(), target_branch,
 
172
        public_branch=public_branch,
 
173
        include_patch=not no_patch,
166
174
        include_bundle=not no_bundle, message=message,
167
 
        base_revision_id=base_revision_id)
 
175
        base_revision_id=base_revision_id,
 
176
        local_target_branch=local_target_branch)
168
177
 
169
178
 
170
179
def _send_0_9(branch, revision_id, submit_branch, public_branch,
171
 
              no_patch, no_bundle, message, base_revision_id):
 
180
              no_patch, no_bundle, message,
 
181
              base_revision_id, local_target_branch=None):
172
182
    if not no_bundle:
173
183
        if not no_patch:
174
184
            patch_type = 'bundle'
175
185
        else:
176
 
            raise errors.BzrCommandError('Format 0.9 does not'
177
 
                ' permit bundle with no patch')
 
186
            raise errors.BzrCommandError(gettext('Format 0.9 does not'
 
187
                ' permit bundle with no patch'))
178
188
    else:
179
189
        if not no_patch:
180
190
            patch_type = 'diff'
185
195
        branch.repository, revision_id, time.time(),
186
196
        osutils.local_time_offset(), submit_branch,
187
197
        public_branch=public_branch, patch_type=patch_type,
188
 
        message=message)
189
 
 
190
 
 
191
 
format_registry.register('4', 
 
198
        message=message, local_target_branch=local_target_branch)
 
199
 
 
200
 
 
201
format_registry.register('4',
192
202
    _send_4, 'Bundle format 4, Merge Directive 2 (default)')
193
203
format_registry.register('0.9',
194
204
    _send_0_9, 'Bundle format 0.9, Merge Directive 1')