← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/send.py

  • Committer: John Arbash Meinel
  • Date: 2010-01-05 04:30:07 UTC
  • mfrom: (4932 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4934.
  • Revision ID: john@arbash-meinel.com-20100105043007-ehgbldqd3q0gtyws
Merge bzr.dev, resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/send.py
1
 
# Copyright (C) 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2009 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
 
18
 
import os
19
18
import time
20
19
 
21
20
from bzrlib import (
22
21
    bzrdir,
23
22
    errors,
 
23
    merge_directive,
24
24
    osutils,
25
25
    registry,
26
26
    trace,
27
27
    )
28
 
from bzrlib.i18n import gettext
29
28
from bzrlib.branch import (
30
29
    Branch,
31
30
    )
52
51
            mail_client = config.get_mail_client()
53
52
            if (not getattr(mail_client, 'supports_body', False)
54
53
                and body is not None):
55
 
                raise errors.BzrCommandError(gettext(
56
 
                    'Mail client "%s" does not support specifying body') %
 
54
                raise errors.BzrCommandError(
 
55
                    'Mail client "%s" does not support specifying body' %
57
56
                    mail_client.__class__.__name__)
58
57
        if remember and submit_branch is None:
59
 
            raise errors.BzrCommandError(gettext(
60
 
                '--remember requires a branch to be specified.'))
 
58
            raise errors.BzrCommandError(
 
59
                '--remember requires a branch to be specified.')
61
60
        stored_submit_branch = branch.get_submit_branch()
62
61
        remembered_submit_branch = None
63
62
        if submit_branch is None:
64
63
            submit_branch = stored_submit_branch
65
64
            remembered_submit_branch = "submit"
66
65
        else:
67
 
            # Remembers if asked explicitly or no previous location is set
68
 
            if remember or (remember is None and stored_submit_branch is None):
 
66
            if stored_submit_branch is None or remember:
69
67
                branch.set_submit_branch(submit_branch)
70
68
        if submit_branch is None:
71
69
            submit_branch = branch.get_parent()
72
70
            remembered_submit_branch = "parent"
73
71
        if submit_branch is None:
74
 
            raise errors.BzrCommandError(gettext('No submit branch known or'
75
 
                                         ' specified'))
 
72
            raise errors.BzrCommandError('No submit branch known or'
 
73
                                         ' specified')
76
74
        if remembered_submit_branch is not None:
77
 
            trace.note(gettext('Using saved {0} location "{1}" to determine '
78
 
                       'what changes to submit.').format(
79
 
                                    remembered_submit_branch, submit_branch))
 
75
            trace.note('Using saved %s location "%s" to determine what '
 
76
                       'changes to submit.', remembered_submit_branch,
 
77
                       submit_branch)
80
78
 
81
79
        if mail_to is None or format is None:
82
80
            # TODO: jam 20090716 we open the submit_branch here, but we *don't*
91
89
                try:
92
90
                    format = format_registry.get(formatname)
93
91
                except KeyError:
94
 
                    raise errors.BzrCommandError(gettext("No such send format '%s'.") % 
 
92
                    raise errors.BzrCommandError("No such send format '%s'." % 
95
93
                                                 formatname)
96
94
 
97
95
        stored_public_branch = branch.get_public_branch()
98
96
        if public_branch is None:
99
97
            public_branch = stored_public_branch
100
 
        # Remembers if asked explicitly or no previous location is set
101
 
        elif (remember
102
 
              or (remember is None and stored_public_branch is None)):
 
98
        elif stored_public_branch is None or remember:
103
99
            branch.set_public_branch(public_branch)
104
100
        if no_bundle and public_branch is None:
105
 
            raise errors.BzrCommandError(gettext('No public branch specified or'
106
 
                                         ' known'))
 
101
            raise errors.BzrCommandError('No public branch specified or'
 
102
                                         ' known')
107
103
        base_revision_id = None
108
104
        revision_id = None
109
105
        if revision is not None:
110
106
            if len(revision) > 2:
111
 
                raise errors.BzrCommandError(gettext('bzr send takes '
112
 
                    'at most two one revision identifiers'))
 
107
                raise errors.BzrCommandError('bzr send takes '
 
108
                    'at most two one revision identifiers')
113
109
            revision_id = revision[-1].as_revision_id(branch)
114
110
            if len(revision) == 2:
115
111
                base_revision_id = revision[0].as_revision_id(branch)
116
112
        if revision_id is None:
117
 
            if tree is not None:
118
 
                tree.check_changed_or_out_of_date(
119
 
                    strict, 'send_strict',
120
 
                    more_error='Use --no-strict to force the send.',
121
 
                    more_warning='Uncommitted changes will not be sent.')
 
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.')
122
127
            revision_id = branch.last_revision()
123
128
        if revision_id == NULL_REVISION:
124
 
            raise errors.BzrCommandError(gettext('No revisions to submit.'))
 
129
            raise errors.BzrCommandError('No revisions to submit.')
125
130
        if format is None:
126
131
            format = format_registry.get()
127
132
        directive = format(branch, revision_id, submit_branch,
130
135
            directive.compose_merge_request(mail_client, mail_to, body,
131
136
                                            branch, tree)
132
137
        else:
133
 
            if directive.multiple_output_files:
134
 
                if output == '-':
135
 
                    raise errors.BzrCommandError(gettext('- not supported for '
136
 
                        'merge directives that use more than one output file.'))
137
 
                if not os.path.exists(output):
138
 
                    os.mkdir(output, 0755)
139
 
                for (filename, lines) in directive.to_files():
140
 
                    path = os.path.join(output, filename)
141
 
                    outfile = open(path, 'wb')
142
 
                    try:
143
 
                        outfile.writelines(lines)
144
 
                    finally:
145
 
                        outfile.close()
 
138
            if output == '-':
 
139
                outfile = to_file
146
140
            else:
147
 
                if output == '-':
148
 
                    outfile = to_file
149
 
                else:
150
 
                    outfile = open(output, 'wb')
151
 
                try:
152
 
                    outfile.writelines(directive.to_lines())
153
 
                finally:
154
 
                    if outfile is not to_file:
155
 
                        outfile.close()
 
141
                outfile = open(output, 'wb')
 
142
            try:
 
143
                outfile.writelines(directive.to_lines())
 
144
            finally:
 
145
                if outfile is not to_file:
 
146
                    outfile.close()
156
147
    finally:
157
148
        branch.unlock()
158
149
 
159
150
 
160
151
def _send_4(branch, revision_id, submit_branch, public_branch,
161
152
            no_patch, no_bundle, message, base_revision_id):
162
 
    from bzrlib import merge_directive
163
153
    return merge_directive.MergeDirective2.from_objects(
164
154
        branch.repository, revision_id, time.time(),
165
155
        osutils.local_time_offset(), submit_branch,
174
164
        if not no_patch:
175
165
            patch_type = 'bundle'
176
166
        else:
177
 
            raise errors.BzrCommandError(gettext('Format 0.9 does not'
178
 
                ' permit bundle with no patch'))
 
167
            raise errors.BzrCommandError('Format 0.9 does not'
 
168
                ' permit bundle with no patch')
179
169
    else:
180
170
        if not no_patch:
181
171
            patch_type = 'diff'
182
172
        else:
183
173
            patch_type = None
184
 
    from bzrlib import merge_directive
185
174
    return merge_directive.MergeDirective.from_objects(
186
175
        branch.repository, revision_id, time.time(),
187
176
        osutils.local_time_offset(), submit_branch,