/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/send.py

  • Committer: Jelmer Vernooij
  • Date: 2019-01-13 18:59:26 UTC
  • mto: This revision was merged to the branch mainline in revision 7250.
  • Revision ID: jelmer@jelmer.uk-20190113185926-m11b4z1ygh5c4tfb
Fix test.

Show diffs side-by-side

added added

removed removed

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