~bzr-pqm/bzr/bzr.dev

5017.2.4 by Martin Pool
Move or remove some unconditionally loaded code
1
# Copyright (C) 2009, 2010 Canonical Ltd
4367.1.2 by Jelmer Vernooij
Move send command to a separate file, move send format registry out of cmd_send.
2
#
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
#
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
#
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
6379.6.3 by Jelmer Vernooij
Use absolute_import.
17
from __future__ import absolute_import
4367.1.2 by Jelmer Vernooij
Move send command to a separate file, move send format registry out of cmd_send.
18
5086.3.3 by Jelmer Vernooij
Allow merge directives to output multiple patch files.
19
import os
4367.1.2 by Jelmer Vernooij
Move send command to a separate file, move send format registry out of cmd_send.
20
import time
21
22
from bzrlib import (
6207.3.3 by jelmer at samba
Fix tests and the like.
23
    controldir,
4367.1.2 by Jelmer Vernooij
Move send command to a separate file, move send format registry out of cmd_send.
24
    errors,
25
    osutils,
26
    registry,
27
    trace,
28
    )
6138.3.5 by Jonathan Riddell
make the test suite pass
29
from bzrlib.i18n import gettext
4367.1.3 by Jelmer Vernooij
Move cmd_{send,bundle_revisions} back to bzrlib.builtins per Ians request.
30
from bzrlib.branch import (
31
    Branch,
32
    )
33
from bzrlib.revision import (
34
    NULL_REVISION,
35
    )
4367.1.2 by Jelmer Vernooij
Move send command to a separate file, move send format registry out of cmd_send.
36
37
38
format_registry = registry.Registry()
39
40
6365.1.3 by Jelmer Vernooij
Pass local target branch along to merge directive handlers.
41
def send(target_branch, revision, public_branch, remember,
42
         format, no_bundle, no_patch, output, from_, mail_to, message, body,
4464.3.4 by Vincent Ladeuil
Fix bug #206577 by adding a --strict option to send.
43
         to_file, strict=None):
6207.3.3 by jelmer at samba
Fix tests and the like.
44
    tree, branch = controldir.ControlDir.open_containing_tree_or_branch(
45
        from_)[:2]
6365.1.3 by Jelmer Vernooij
Pass local target branch along to merge directive handlers.
46
    possible_transports = [tree.bzrdir.transport, branch.bzrdir.transport]
4367.1.3 by Jelmer Vernooij
Move cmd_{send,bundle_revisions} back to bzrlib.builtins per Ians request.
47
    # we may need to write data into branch's repository to calculate
48
    # the data to send.
49
    branch.lock_write()
50
    try:
51
        if output is None:
52
            if mail_to is None:
6421.3.1 by Vincent Ladeuil
Migrate more branch options to config stacks.
53
                mail_to = branch.get_config_stack().get('submit_to')
54
            mail_client = branch.get_config().get_mail_client()
4367.1.3 by Jelmer Vernooij
Move cmd_{send,bundle_revisions} back to bzrlib.builtins per Ians request.
55
            if (not getattr(mail_client, 'supports_body', False)
56
                and body is not None):
6138.3.7 by Jonathan Riddell
add gettext() to BzrCommandError uses
57
                raise errors.BzrCommandError(gettext(
58
                    'Mail client "%s" does not support specifying body') %
4367.1.3 by Jelmer Vernooij
Move cmd_{send,bundle_revisions} back to bzrlib.builtins per Ians request.
59
                    mail_client.__class__.__name__)
6365.1.3 by Jelmer Vernooij
Pass local target branch along to merge directive handlers.
60
        if remember and target_branch is None:
6138.3.7 by Jonathan Riddell
add gettext() to BzrCommandError uses
61
            raise errors.BzrCommandError(gettext(
62
                '--remember requires a branch to be specified.'))
6365.1.3 by Jelmer Vernooij
Pass local target branch along to merge directive handlers.
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"
4367.1.3 by Jelmer Vernooij
Move cmd_{send,bundle_revisions} back to bzrlib.builtins per Ians request.
68
        else:
5861.1.4 by Vincent Ladeuil
Fix send --no-remember when no location is set.
69
            # Remembers if asked explicitly or no previous location is set
6365.1.3 by Jelmer Vernooij
Pass local target branch along to merge directive handlers.
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:
6138.3.7 by Jonathan Riddell
add gettext() to BzrCommandError uses
77
            raise errors.BzrCommandError(gettext('No submit branch known or'
78
                                         ' specified'))
6365.1.3 by Jelmer Vernooij
Pass local target branch along to merge directive handlers.
79
        if remembered_target_branch is not None:
6147.1.1 by Jonathan Riddell
use .format() instead of % for string formatting where there are multiple formats in one string to allow for translations
80
            trace.note(gettext('Using saved {0} location "{1}" to determine '
81
                       'what changes to submit.').format(
6365.1.3 by Jelmer Vernooij
Pass local target branch along to merge directive handlers.
82
                                    remembered_target_branch,
83
                                    target_branch))
4367.1.3 by Jelmer Vernooij
Move cmd_{send,bundle_revisions} back to bzrlib.builtins per Ians request.
84
6365.1.3 by Jelmer Vernooij
Pass local target branch along to merge directive handlers.
85
        submit_branch = Branch.open(target_branch,
86
            possible_transports=possible_transports)
87
        possible_transports.append(submit_branch.bzrdir.root_transport)
4367.1.5 by Jelmer Vernooij
merge bzr.dev.
88
        if mail_to is None or format is None:
89
            if mail_to is None:
6421.3.1 by Vincent Ladeuil
Migrate more branch options to config stacks.
90
                mail_to = submit_branch.get_config_stack().get(
91
                    'child_submit_to')
4367.1.5 by Jelmer Vernooij
merge bzr.dev.
92
            if format is None:
6365.1.3 by Jelmer Vernooij
Pass local target branch along to merge directive handlers.
93
                formatname = submit_branch.get_child_submit_format()
4367.1.5 by Jelmer Vernooij
merge bzr.dev.
94
                try:
95
                    format = format_registry.get(formatname)
96
                except KeyError:
6421.3.1 by Vincent Ladeuil
Migrate more branch options to config stacks.
97
                    raise errors.BzrCommandError(
98
                        gettext("No such send format '%s'.") % formatname)
4367.1.3 by Jelmer Vernooij
Move cmd_{send,bundle_revisions} back to bzrlib.builtins per Ians request.
99
100
        stored_public_branch = branch.get_public_branch()
101
        if public_branch is None:
102
            public_branch = stored_public_branch
5861.1.4 by Vincent Ladeuil
Fix send --no-remember when no location is set.
103
        # Remembers if asked explicitly or no previous location is set
104
        elif (remember
105
              or (remember is None and stored_public_branch is None)):
4367.1.3 by Jelmer Vernooij
Move cmd_{send,bundle_revisions} back to bzrlib.builtins per Ians request.
106
            branch.set_public_branch(public_branch)
107
        if no_bundle and public_branch is None:
6138.3.7 by Jonathan Riddell
add gettext() to BzrCommandError uses
108
            raise errors.BzrCommandError(gettext('No public branch specified or'
109
                                         ' known'))
4367.1.3 by Jelmer Vernooij
Move cmd_{send,bundle_revisions} back to bzrlib.builtins per Ians request.
110
        base_revision_id = None
111
        revision_id = None
112
        if revision is not None:
113
            if len(revision) > 2:
6138.3.7 by Jonathan Riddell
add gettext() to BzrCommandError uses
114
                raise errors.BzrCommandError(gettext('bzr send takes '
115
                    'at most two one revision identifiers'))
4367.1.3 by Jelmer Vernooij
Move cmd_{send,bundle_revisions} back to bzrlib.builtins per Ians request.
116
            revision_id = revision[-1].as_revision_id(branch)
117
            if len(revision) == 2:
118
                base_revision_id = revision[0].as_revision_id(branch)
119
        if revision_id is None:
5147.2.2 by Vincent Ladeuil
Fix bug #519319 by defaulting to a warning for dirty trees.
120
            if tree is not None:
5171.2.2 by Vincent Ladeuil
Explain that the uncommitted changes are not processed when
121
                tree.check_changed_or_out_of_date(
122
                    strict, 'send_strict',
123
                    more_error='Use --no-strict to force the send.',
124
                    more_warning='Uncommitted changes will not be sent.')
4367.1.3 by Jelmer Vernooij
Move cmd_{send,bundle_revisions} back to bzrlib.builtins per Ians request.
125
            revision_id = branch.last_revision()
126
        if revision_id == NULL_REVISION:
6138.3.7 by Jonathan Riddell
add gettext() to BzrCommandError uses
127
            raise errors.BzrCommandError(gettext('No revisions to submit.'))
4367.1.3 by Jelmer Vernooij
Move cmd_{send,bundle_revisions} back to bzrlib.builtins per Ians request.
128
        if format is None:
129
            format = format_registry.get()
6365.1.3 by Jelmer Vernooij
Pass local target branch along to merge directive handlers.
130
        directive = format(branch, revision_id, target_branch,
131
            public_branch, no_patch, no_bundle, message, base_revision_id,
132
            submit_branch)
4367.1.2 by Jelmer Vernooij
Move send command to a separate file, move send format registry out of cmd_send.
133
        if output is None:
4367.1.3 by Jelmer Vernooij
Move cmd_{send,bundle_revisions} back to bzrlib.builtins per Ians request.
134
            directive.compose_merge_request(mail_client, mail_to, body,
135
                                            branch, tree)
136
        else:
5086.3.3 by Jelmer Vernooij
Allow merge directives to output multiple patch files.
137
            if directive.multiple_output_files:
138
                if output == '-':
6138.3.7 by Jonathan Riddell
add gettext() to BzrCommandError uses
139
                    raise errors.BzrCommandError(gettext('- not supported for '
140
                        'merge directives that use more than one output file.'))
5086.3.3 by Jelmer Vernooij
Allow merge directives to output multiple patch files.
141
                if not os.path.exists(output):
142
                    os.mkdir(output, 0755)
143
                for (filename, lines) in directive.to_files():
144
                    path = os.path.join(output, filename)
145
                    outfile = open(path, 'wb')
146
                    try:
147
                        outfile.writelines(lines)
148
                    finally:
149
                        outfile.close()
4367.1.3 by Jelmer Vernooij
Move cmd_{send,bundle_revisions} back to bzrlib.builtins per Ians request.
150
            else:
5086.3.3 by Jelmer Vernooij
Allow merge directives to output multiple patch files.
151
                if output == '-':
152
                    outfile = to_file
153
                else:
154
                    outfile = open(output, 'wb')
155
                try:
156
                    outfile.writelines(directive.to_lines())
157
                finally:
158
                    if outfile is not to_file:
159
                        outfile.close()
4367.1.3 by Jelmer Vernooij
Move cmd_{send,bundle_revisions} back to bzrlib.builtins per Ians request.
160
    finally:
161
        branch.unlock()
4367.1.2 by Jelmer Vernooij
Move send command to a separate file, move send format registry out of cmd_send.
162
163
6365.1.3 by Jelmer Vernooij
Pass local target branch along to merge directive handlers.
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):
5017.2.4 by Martin Pool
Move or remove some unconditionally loaded code
167
    from bzrlib import merge_directive
4367.1.2 by Jelmer Vernooij
Move send command to a separate file, move send format registry out of cmd_send.
168
    return merge_directive.MergeDirective2.from_objects(
169
        branch.repository, revision_id, time.time(),
6365.1.3 by Jelmer Vernooij
Pass local target branch along to merge directive handlers.
170
        osutils.local_time_offset(), target_branch,
171
        public_branch=public_branch,
172
        include_patch=not no_patch,
4367.1.2 by Jelmer Vernooij
Move send command to a separate file, move send format registry out of cmd_send.
173
        include_bundle=not no_bundle, message=message,
6365.1.3 by Jelmer Vernooij
Pass local target branch along to merge directive handlers.
174
        base_revision_id=base_revision_id,
175
        local_target_branch=local_target_branch)
4367.1.2 by Jelmer Vernooij
Move send command to a separate file, move send format registry out of cmd_send.
176
177
178
def _send_0_9(branch, revision_id, submit_branch, public_branch,
6365.1.3 by Jelmer Vernooij
Pass local target branch along to merge directive handlers.
179
              no_patch, no_bundle, message,
180
              base_revision_id, local_target_branch=None):
4367.1.2 by Jelmer Vernooij
Move send command to a separate file, move send format registry out of cmd_send.
181
    if not no_bundle:
182
        if not no_patch:
183
            patch_type = 'bundle'
184
        else:
6138.3.7 by Jonathan Riddell
add gettext() to BzrCommandError uses
185
            raise errors.BzrCommandError(gettext('Format 0.9 does not'
186
                ' permit bundle with no patch'))
4367.1.2 by Jelmer Vernooij
Move send command to a separate file, move send format registry out of cmd_send.
187
    else:
188
        if not no_patch:
189
            patch_type = 'diff'
190
        else:
191
            patch_type = None
5017.2.4 by Martin Pool
Move or remove some unconditionally loaded code
192
    from bzrlib import merge_directive
4367.1.2 by Jelmer Vernooij
Move send command to a separate file, move send format registry out of cmd_send.
193
    return merge_directive.MergeDirective.from_objects(
194
        branch.repository, revision_id, time.time(),
195
        osutils.local_time_offset(), submit_branch,
196
        public_branch=public_branch, patch_type=patch_type,
6365.1.3 by Jelmer Vernooij
Pass local target branch along to merge directive handlers.
197
        message=message, local_target_branch=local_target_branch)
198
199
200
format_registry.register('4',
4367.1.2 by Jelmer Vernooij
Move send command to a separate file, move send format registry out of cmd_send.
201
    _send_4, 'Bundle format 4, Merge Directive 2 (default)')
202
format_registry.register('0.9',
203
    _send_0_9, 'Bundle format 0.9, Merge Directive 1')
204
format_registry.default_key = '4'