← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/send.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-08-13 14:20:03 UTC
  • mfrom: (4599.2.4 windows-installer)
  • Revision ID: pqm@pqm.ubuntu.com-20090813142003-3x748ymw3avzmme7
(jam) Updates to the windows installers.

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,
110
110
            if len(revision) == 2:
111
111
                base_revision_id = revision[0].as_revision_id(branch)
112
112
        if revision_id is None:
113
 
            if tree is not None:
114
 
                tree.check_changed_or_out_of_date(
115
 
                    strict, 'send_strict',
116
 
                    more_error='Use --no-strict to force the send.',
117
 
                    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(tree.basis_tree())
 
119
                    or len(tree.get_parent_ids()) > 1):
 
120
                    raise errors.UncommittedChanges(
 
121
                        tree, more='Use --no-strict to force the send.')
 
122
                if tree.last_revision() != tree.branch.last_revision():
 
123
                    # The tree has lost sync with its branch, there is little
 
124
                    # chance that the user is aware of it but he can still force
 
125
                    # the push with --no-strict
 
126
                    raise errors.OutOfDateTree(
 
127
                        tree, more='Use --no-strict to force the send.')
118
128
            revision_id = branch.last_revision()
119
129
        if revision_id == NULL_REVISION:
120
130
            raise errors.BzrCommandError('No revisions to submit.')
126
136
            directive.compose_merge_request(mail_client, mail_to, body,
127
137
                                            branch, tree)
128
138
        else:
129
 
            if directive.multiple_output_files:
130
 
                if output == '-':
131
 
                    raise errors.BzrCommandError('- not supported for '
132
 
                        'merge directives that use more than one output file.')
133
 
                if not os.path.exists(output):
134
 
                    os.mkdir(output, 0755)
135
 
                for (filename, lines) in directive.to_files():
136
 
                    path = os.path.join(output, filename)
137
 
                    outfile = open(path, 'wb')
138
 
                    try:
139
 
                        outfile.writelines(lines)
140
 
                    finally:
141
 
                        outfile.close()
 
139
            if output == '-':
 
140
                outfile = to_file
142
141
            else:
143
 
                if output == '-':
144
 
                    outfile = to_file
145
 
                else:
146
 
                    outfile = open(output, 'wb')
147
 
                try:
148
 
                    outfile.writelines(directive.to_lines())
149
 
                finally:
150
 
                    if outfile is not to_file:
151
 
                        outfile.close()
 
142
                outfile = open(output, 'wb')
 
143
            try:
 
144
                outfile.writelines(directive.to_lines())
 
145
            finally:
 
146
                if outfile is not to_file:
 
147
                    outfile.close()
152
148
    finally:
153
149
        branch.unlock()
154
150
 
155
151
 
156
152
def _send_4(branch, revision_id, submit_branch, public_branch,
157
153
            no_patch, no_bundle, message, base_revision_id):
158
 
    from bzrlib import merge_directive
159
154
    return merge_directive.MergeDirective2.from_objects(
160
155
        branch.repository, revision_id, time.time(),
161
156
        osutils.local_time_offset(), submit_branch,
177
172
            patch_type = 'diff'
178
173
        else:
179
174
            patch_type = None
180
 
    from bzrlib import merge_directive
181
175
    return merge_directive.MergeDirective.from_objects(
182
176
        branch.repository, revision_id, time.time(),
183
177
        osutils.local_time_offset(), submit_branch,