/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
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
5086.3.3 by Jelmer Vernooij
Allow merge directives to output multiple patch files.
17
import os
4367.1.2 by Jelmer Vernooij
Move send command to a separate file, move send format registry out of cmd_send.
18
import time
19
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
20
from . import (
6207.3.3 by jelmer at samba
Fix tests and the like.
21
    controldir,
4367.1.2 by Jelmer Vernooij
Move send command to a separate file, move send format registry out of cmd_send.
22
    errors,
23
    osutils,
24
    registry,
25
    trace,
26
    )
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
27
from .i18n import gettext
28
from .branch import (
4367.1.3 by Jelmer Vernooij
Move cmd_{send,bundle_revisions} back to bzrlib.builtins per Ians request.
29
    Branch,
30
    )
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
31
from .revision import (
4367.1.3 by Jelmer Vernooij
Move cmd_{send,bundle_revisions} back to bzrlib.builtins per Ians request.
32
    NULL_REVISION,
33
    )
4367.1.2 by Jelmer Vernooij
Move send command to a separate file, move send format registry out of cmd_send.
34
35
36
format_registry = registry.Registry()
37
38
6365.1.3 by Jelmer Vernooij
Pass local target branch along to merge directive handlers.
39
def send(target_branch, revision, public_branch, remember,
40
         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.
41
         to_file, strict=None):
6437.16.1 by Jelmer Vernooij
Fix 'bzr send' in treeless branches.
42
    possible_transports = []
6207.3.3 by jelmer at samba
Fix tests and the like.
43
    tree, branch = controldir.ControlDir.open_containing_tree_or_branch(
6437.16.1 by Jelmer Vernooij
Fix 'bzr send' in treeless branches.
44
        from_, possible_transports=possible_transports)[:2]
4367.1.3 by Jelmer Vernooij
Move cmd_{send,bundle_revisions} back to bzrlib.builtins per Ians request.
45
    # we may need to write data into branch's repository to calculate
46
    # the data to send.
7356.1.2 by Jelmer Vernooij
Use ExitStack in more places.
47
    with branch.lock_write():
4367.1.3 by Jelmer Vernooij
Move cmd_{send,bundle_revisions} back to bzrlib.builtins per Ians request.
48
        if output is None:
6449.5.1 by Jelmer Vernooij
Migrate mail_client to config stacks.
49
            config_stack = branch.get_config_stack()
4367.1.3 by Jelmer Vernooij
Move cmd_{send,bundle_revisions} back to bzrlib.builtins per Ians request.
50
            if mail_to is None:
6449.5.1 by Jelmer Vernooij
Migrate mail_client to config stacks.
51
                mail_to = config_stack.get('submit_to')
52
            mail_client = config_stack.get('mail_client')(config_stack)
4367.1.3 by Jelmer Vernooij
Move cmd_{send,bundle_revisions} back to bzrlib.builtins per Ians request.
53
            if (not getattr(mail_client, 'supports_body', False)
7143.15.2 by Jelmer Vernooij
Run autopep8.
54
                    and body is not None):
7490.61.1 by Jelmer Vernooij
Rename BzrCommandError to CommandError.
55
                raise errors.CommandError(gettext(
6138.3.7 by Jonathan Riddell
add gettext() to BzrCommandError uses
56
                    '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.
57
                    mail_client.__class__.__name__)
6365.1.3 by Jelmer Vernooij
Pass local target branch along to merge directive handlers.
58
        if remember and target_branch is None:
7490.61.1 by Jelmer Vernooij
Rename BzrCommandError to CommandError.
59
            raise errors.CommandError(gettext(
6138.3.7 by Jonathan Riddell
add gettext() to BzrCommandError uses
60
                '--remember requires a branch to be specified.'))
6365.1.3 by Jelmer Vernooij
Pass local target branch along to merge directive handlers.
61
        stored_target_branch = branch.get_submit_branch()
62
        remembered_target_branch = None
63
        if target_branch is None:
64
            target_branch = stored_target_branch
65
            remembered_target_branch = "submit"
4367.1.3 by Jelmer Vernooij
Move cmd_{send,bundle_revisions} back to bzrlib.builtins per Ians request.
66
        else:
5861.1.4 by Vincent Ladeuil
Fix send --no-remember when no location is set.
67
            # 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.
68
            if remember or (
69
                    remember is None and stored_target_branch is None):
70
                branch.set_submit_branch(target_branch)
71
        if target_branch is None:
72
            target_branch = branch.get_parent()
73
            remembered_target_branch = "parent"
74
        if target_branch is None:
7490.61.1 by Jelmer Vernooij
Rename BzrCommandError to CommandError.
75
            raise errors.CommandError(gettext('No submit branch known or'
7143.15.2 by Jelmer Vernooij
Run autopep8.
76
                                                 ' specified'))
6365.1.3 by Jelmer Vernooij
Pass local target branch along to merge directive handlers.
77
        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
78
            trace.note(gettext('Using saved {0} location "{1}" to determine '
7143.15.2 by Jelmer Vernooij
Run autopep8.
79
                               'what changes to submit.').format(
80
                remembered_target_branch,
81
                target_branch))
4367.1.3 by Jelmer Vernooij
Move cmd_{send,bundle_revisions} back to bzrlib.builtins per Ians request.
82
6365.1.3 by Jelmer Vernooij
Pass local target branch along to merge directive handlers.
83
        submit_branch = Branch.open(target_branch,
7143.15.2 by Jelmer Vernooij
Run autopep8.
84
                                    possible_transports=possible_transports)
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
85
        possible_transports.append(submit_branch.controldir.root_transport)
4367.1.5 by Jelmer Vernooij
merge bzr.dev.
86
        if mail_to is None or format is None:
87
            if mail_to is None:
6421.3.1 by Vincent Ladeuil
Migrate more branch options to config stacks.
88
                mail_to = submit_branch.get_config_stack().get(
89
                    'child_submit_to')
4367.1.5 by Jelmer Vernooij
merge bzr.dev.
90
            if format is None:
6365.1.3 by Jelmer Vernooij
Pass local target branch along to merge directive handlers.
91
                formatname = submit_branch.get_child_submit_format()
4367.1.5 by Jelmer Vernooij
merge bzr.dev.
92
                try:
93
                    format = format_registry.get(formatname)
94
                except KeyError:
7490.61.1 by Jelmer Vernooij
Rename BzrCommandError to CommandError.
95
                    raise errors.CommandError(
6421.3.1 by Vincent Ladeuil
Migrate more branch options to config stacks.
96
                        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.
97
98
        stored_public_branch = branch.get_public_branch()
99
        if public_branch is None:
100
            public_branch = stored_public_branch
5861.1.4 by Vincent Ladeuil
Fix send --no-remember when no location is set.
101
        # Remembers if asked explicitly or no previous location is set
102
        elif (remember
103
              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.
104
            branch.set_public_branch(public_branch)
105
        if no_bundle and public_branch is None:
7490.61.1 by Jelmer Vernooij
Rename BzrCommandError to CommandError.
106
            raise errors.CommandError(gettext('No public branch specified or'
7143.15.2 by Jelmer Vernooij
Run autopep8.
107
                                                 ' known'))
4367.1.3 by Jelmer Vernooij
Move cmd_{send,bundle_revisions} back to bzrlib.builtins per Ians request.
108
        base_revision_id = None
109
        revision_id = None
110
        if revision is not None:
111
            if len(revision) > 2:
7490.61.1 by Jelmer Vernooij
Rename BzrCommandError to CommandError.
112
                raise errors.CommandError(gettext('bzr send takes '
7143.15.2 by Jelmer Vernooij
Run autopep8.
113
                                                     'at most two one revision identifiers'))
4367.1.3 by Jelmer Vernooij
Move cmd_{send,bundle_revisions} back to bzrlib.builtins per Ians request.
114
            revision_id = revision[-1].as_revision_id(branch)
115
            if len(revision) == 2:
116
                base_revision_id = revision[0].as_revision_id(branch)
117
        if revision_id is None:
5147.2.2 by Vincent Ladeuil
Fix bug #519319 by defaulting to a warning for dirty trees.
118
            if tree is not None:
5171.2.2 by Vincent Ladeuil
Explain that the uncommitted changes are not processed when
119
                tree.check_changed_or_out_of_date(
120
                    strict, 'send_strict',
121
                    more_error='Use --no-strict to force the send.',
122
                    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.
123
            revision_id = branch.last_revision()
124
        if revision_id == NULL_REVISION:
7490.61.1 by Jelmer Vernooij
Rename BzrCommandError to CommandError.
125
            raise errors.CommandError(gettext('No revisions to submit.'))
4367.1.3 by Jelmer Vernooij
Move cmd_{send,bundle_revisions} back to bzrlib.builtins per Ians request.
126
        if format is None:
127
            format = format_registry.get()
6365.1.3 by Jelmer Vernooij
Pass local target branch along to merge directive handlers.
128
        directive = format(branch, revision_id, target_branch,
7143.15.2 by Jelmer Vernooij
Run autopep8.
129
                           public_branch, no_patch, no_bundle, message, base_revision_id,
130
                           submit_branch)
4367.1.2 by Jelmer Vernooij
Move send command to a separate file, move send format registry out of cmd_send.
131
        if output is None:
4367.1.3 by Jelmer Vernooij
Move cmd_{send,bundle_revisions} back to bzrlib.builtins per Ians request.
132
            directive.compose_merge_request(mail_client, mail_to, body,
133
                                            branch, tree)
134
        else:
5086.3.3 by Jelmer Vernooij
Allow merge directives to output multiple patch files.
135
            if directive.multiple_output_files:
136
                if output == '-':
7490.61.1 by Jelmer Vernooij
Rename BzrCommandError to CommandError.
137
                    raise errors.CommandError(gettext('- not supported for '
7143.15.2 by Jelmer Vernooij
Run autopep8.
138
                                                         'merge directives that use more than one output file.'))
5086.3.3 by Jelmer Vernooij
Allow merge directives to output multiple patch files.
139
                if not os.path.exists(output):
6619.3.14 by Jelmer Vernooij
Convert some octal numbers to new notations.
140
                    os.mkdir(output, 0o755)
5086.3.3 by Jelmer Vernooij
Allow merge directives to output multiple patch files.
141
                for (filename, lines) in directive.to_files():
142
                    path = os.path.join(output, filename)
7356.1.5 by Jelmer Vernooij
Use more ExitStacks.
143
                    with open(path, 'wb') as outfile:
5086.3.3 by Jelmer Vernooij
Allow merge directives to output multiple patch files.
144
                        outfile.writelines(lines)
4367.1.3 by Jelmer Vernooij
Move cmd_{send,bundle_revisions} back to bzrlib.builtins per Ians request.
145
            else:
5086.3.3 by Jelmer Vernooij
Allow merge directives to output multiple patch files.
146
                if output == '-':
147
                    outfile = to_file
148
                else:
149
                    outfile = open(output, 'wb')
150
                try:
151
                    outfile.writelines(directive.to_lines())
152
                finally:
153
                    if outfile is not to_file:
154
                        outfile.close()
4367.1.2 by Jelmer Vernooij
Move send command to a separate file, move send format registry out of cmd_send.
155
156
6365.1.3 by Jelmer Vernooij
Pass local target branch along to merge directive handlers.
157
def _send_4(branch, revision_id, target_branch, public_branch,
158
            no_patch, no_bundle, message,
159
            base_revision_id, local_target_branch=None):
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
160
    from breezy import merge_directive
4367.1.2 by Jelmer Vernooij
Move send command to a separate file, move send format registry out of cmd_send.
161
    return merge_directive.MergeDirective2.from_objects(
162
        branch.repository, revision_id, time.time(),
6365.1.3 by Jelmer Vernooij
Pass local target branch along to merge directive handlers.
163
        osutils.local_time_offset(), target_branch,
164
        public_branch=public_branch,
165
        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.
166
        include_bundle=not no_bundle, message=message,
6365.1.3 by Jelmer Vernooij
Pass local target branch along to merge directive handlers.
167
        base_revision_id=base_revision_id,
168
        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.
169
170
171
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.
172
              no_patch, no_bundle, message,
173
              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.
174
    if not no_bundle:
175
        if not no_patch:
176
            patch_type = 'bundle'
177
        else:
7490.61.1 by Jelmer Vernooij
Rename BzrCommandError to CommandError.
178
            raise errors.CommandError(gettext('Format 0.9 does not'
7143.15.2 by Jelmer Vernooij
Run autopep8.
179
                                                 ' 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.
180
    else:
181
        if not no_patch:
182
            patch_type = 'diff'
183
        else:
184
            patch_type = None
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
185
    from breezy import merge_directive
4367.1.2 by Jelmer Vernooij
Move send command to a separate file, move send format registry out of cmd_send.
186
    return merge_directive.MergeDirective.from_objects(
187
        branch.repository, revision_id, time.time(),
188
        osutils.local_time_offset(), submit_branch,
189
        public_branch=public_branch, patch_type=patch_type,
6365.1.3 by Jelmer Vernooij
Pass local target branch along to merge directive handlers.
190
        message=message, local_target_branch=local_target_branch)
191
192
193
format_registry.register('4',
7143.15.2 by Jelmer Vernooij
Run autopep8.
194
                         _send_4, 'Bundle format 4, Merge Directive 2 (default)')
4367.1.2 by Jelmer Vernooij
Move send command to a separate file, move send format registry out of cmd_send.
195
format_registry.register('0.9',
7143.15.2 by Jelmer Vernooij
Run autopep8.
196
                         _send_0_9, 'Bundle format 0.9, Merge Directive 1')
4367.1.2 by Jelmer Vernooij
Move send command to a separate file, move send format registry out of cmd_send.
197
format_registry.default_key = '4'