← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/send.py

  • Committer: Robert Collins
  • Date: 2010-04-08 04:34:03 UTC
  • mfrom: (5138 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5139.
  • Revision ID: robertc@robertcollins.net-20100408043403-56z0d07vdqrx7f3t
Update bugfix for 528114 to trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/send.py
 
1
# Copyright (C) 2009, 2010 Canonical Ltd
 
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
 
 
17
 
 
18
import os
 
19
import time
 
20
 
 
21
from bzrlib import (
 
22
    bzrdir,
 
23
    errors,
 
24
    osutils,
 
25
    registry,
 
26
    trace,
 
27
    )
 
28
from bzrlib.branch import (
 
29
    Branch,
 
30
    )
 
31
from bzrlib.revision import (
 
32
    NULL_REVISION,
 
33
    )
 
34
 
 
35
 
 
36
format_registry = registry.Registry()
 
37
 
 
38
 
 
39
def send(submit_branch, revision, public_branch, remember, format,
 
40
         no_bundle, no_patch, output, from_, mail_to, message, body,
 
41
         to_file, strict=None):
 
42
    tree, branch = bzrdir.BzrDir.open_containing_tree_or_branch(from_)[:2]
 
43
    # we may need to write data into branch's repository to calculate
 
44
    # the data to send.
 
45
    branch.lock_write()
 
46
    try:
 
47
        if output is None:
 
48
            config = branch.get_config()
 
49
            if mail_to is None:
 
50
                mail_to = config.get_user_option('submit_to')
 
51
            mail_client = config.get_mail_client()
 
52
            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' %
 
56
                    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"
 
65
        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)
 
78
 
 
79
        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
            if mail_to is None:
 
86
                mail_to = submit_config.get_user_option("child_submit_to")
 
87
            if format is None:
 
88
                formatname = submit_br.get_child_submit_format()
 
89
                try:
 
90
                    format = format_registry.get(formatname)
 
91
                except KeyError:
 
92
                    raise errors.BzrCommandError("No such send format '%s'." % 
 
93
                                                 formatname)
 
94
 
 
95
        stored_public_branch = branch.get_public_branch()
 
96
        if public_branch is None:
 
97
            public_branch = stored_public_branch
 
98
        elif stored_public_branch is None or remember:
 
99
            branch.set_public_branch(public_branch)
 
100
        if no_bundle and public_branch is None:
 
101
            raise errors.BzrCommandError('No public branch specified or'
 
102
                                         ' known')
 
103
        base_revision_id = None
 
104
        revision_id = None
 
105
        if revision is not None:
 
106
            if len(revision) > 2:
 
107
                raise errors.BzrCommandError('bzr send takes '
 
108
                    'at most two one revision identifiers')
 
109
            revision_id = revision[-1].as_revision_id(branch)
 
110
            if len(revision) == 2:
 
111
                base_revision_id = revision[0].as_revision_id(branch)
 
112
        if revision_id is None:
 
113
            if strict is None:
 
114
                strict = branch.get_config(
 
115
                    ).get_user_option_as_bool('send_strict')
 
116
            if strict is None: strict = True # default value
 
117
            if strict and tree is not None:
 
118
                if (tree.has_changes()):
 
119
                    raise errors.UncommittedChanges(
 
120
                        tree, more='Use --no-strict to force the send.')
 
121
                if tree.last_revision() != tree.branch.last_revision():
 
122
                    # The tree has lost sync with its branch, there is little
 
123
                    # chance that the user is aware of it but he can still force
 
124
                    # the send with --no-strict
 
125
                    raise errors.OutOfDateTree(
 
126
                        tree, more='Use --no-strict to force the send.')
 
127
            revision_id = branch.last_revision()
 
128
        if revision_id == NULL_REVISION:
 
129
            raise errors.BzrCommandError('No revisions to submit.')
 
130
        if format is None:
 
131
            format = format_registry.get()
 
132
        directive = format(branch, revision_id, submit_branch,
 
133
            public_branch, no_patch, no_bundle, message, base_revision_id)
 
134
        if output is None:
 
135
            directive.compose_merge_request(mail_client, mail_to, body,
 
136
                                            branch, tree)
 
137
        else:
 
138
            if directive.multiple_output_files:
 
139
                if output == '-':
 
140
                    raise errors.BzrCommandError('- not supported for '
 
141
                        'merge directives that use more than one output file.')
 
142
                if not os.path.exists(output):
 
143
                    os.mkdir(output, 0755)
 
144
                for (filename, lines) in directive.to_files():
 
145
                    path = os.path.join(output, filename)
 
146
                    outfile = open(path, 'wb')
 
147
                    try:
 
148
                        outfile.writelines(lines)
 
149
                    finally:
 
150
                        outfile.close()
 
151
            else:
 
152
                if output == '-':
 
153
                    outfile = to_file
 
154
                else:
 
155
                    outfile = open(output, 'wb')
 
156
                try:
 
157
                    outfile.writelines(directive.to_lines())
 
158
                finally:
 
159
                    if outfile is not to_file:
 
160
                        outfile.close()
 
161
    finally:
 
162
        branch.unlock()
 
163
 
 
164
 
 
165
def _send_4(branch, revision_id, submit_branch, public_branch,
 
166
            no_patch, no_bundle, message, base_revision_id):
 
167
    from bzrlib import merge_directive
 
168
    return merge_directive.MergeDirective2.from_objects(
 
169
        branch.repository, revision_id, time.time(),
 
170
        osutils.local_time_offset(), submit_branch,
 
171
        public_branch=public_branch, include_patch=not no_patch,
 
172
        include_bundle=not no_bundle, message=message,
 
173
        base_revision_id=base_revision_id)
 
174
 
 
175
 
 
176
def _send_0_9(branch, revision_id, submit_branch, public_branch,
 
177
              no_patch, no_bundle, message, base_revision_id):
 
178
    if not no_bundle:
 
179
        if not no_patch:
 
180
            patch_type = 'bundle'
 
181
        else:
 
182
            raise errors.BzrCommandError('Format 0.9 does not'
 
183
                ' permit bundle with no patch')
 
184
    else:
 
185
        if not no_patch:
 
186
            patch_type = 'diff'
 
187
        else:
 
188
            patch_type = None
 
189
    from bzrlib import merge_directive
 
190
    return merge_directive.MergeDirective.from_objects(
 
191
        branch.repository, revision_id, time.time(),
 
192
        osutils.local_time_offset(), submit_branch,
 
193
        public_branch=public_branch, patch_type=patch_type,
 
194
        message=message)
 
195
 
 
196
 
 
197
format_registry.register('4', 
 
198
    _send_4, 'Bundle format 4, Merge Directive 2 (default)')
 
199
format_registry.register('0.9',
 
200
    _send_0_9, 'Bundle format 0.9, Merge Directive 1')
 
201
format_registry.default_key = '4'