← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/send.py

  • Committer: Andrew Bennetts
  • Date: 2009-07-27 08:02:52 UTC
  • mto: This revision was merged to the branch mainline in revision 4573.
  • Revision ID: andrew.bennetts@canonical.com-20090727080252-1r4s9oqwlkzgywx7
Fix trivial bug in _vfs_set_tags_bytes.

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,
63
63
            submit_branch = stored_submit_branch
64
64
            remembered_submit_branch = "submit"
65
65
        else:
66
 
            # Remembers if asked explicitly or no previous location is set
67
 
            if remember or (remember is None and stored_submit_branch is None):
 
66
            if stored_submit_branch is None or remember:
68
67
                branch.set_submit_branch(submit_branch)
69
68
        if submit_branch is None:
70
69
            submit_branch = branch.get_parent()
78
77
                       submit_branch)
79
78
 
80
79
        if mail_to is None or format is None:
81
 
            # TODO: jam 20090716 we open the submit_branch here, but we *don't*
82
 
            #       pass it down into the format creation, so it will have to
83
 
            #       open it again
84
80
            submit_br = Branch.open(submit_branch)
85
81
            submit_config = submit_br.get_config()
86
82
            if mail_to is None:
96
92
        stored_public_branch = branch.get_public_branch()
97
93
        if public_branch is None:
98
94
            public_branch = stored_public_branch
99
 
        # Remembers if asked explicitly or no previous location is set
100
 
        elif (remember
101
 
              or (remember is None and stored_public_branch is None)):
 
95
        elif stored_public_branch is None or remember:
102
96
            branch.set_public_branch(public_branch)
103
97
        if no_bundle and public_branch is None:
104
98
            raise errors.BzrCommandError('No public branch specified or'
113
107
            if len(revision) == 2:
114
108
                base_revision_id = revision[0].as_revision_id(branch)
115
109
        if revision_id is None:
116
 
            if tree is not None:
117
 
                tree.check_changed_or_out_of_date(
118
 
                    strict, 'send_strict',
119
 
                    more_error='Use --no-strict to force the send.',
120
 
                    more_warning='Uncommitted changes will not be sent.')
 
110
            if strict is None:
 
111
                strict = branch.get_config(
 
112
                    ).get_user_option_as_bool('send_strict')
 
113
            if strict is None: strict = True # default value
 
114
            if strict and tree is not None:
 
115
                if (tree.has_changes(tree.basis_tree())
 
116
                    or len(tree.get_parent_ids()) > 1):
 
117
                    raise errors.UncommittedChanges(
 
118
                        tree, more='Use --no-strict to force the send.')
 
119
                if tree.last_revision() != tree.branch.last_revision():
 
120
                    # The tree has lost sync with its branch, there is little
 
121
                    # chance that the user is aware of it but he can still force
 
122
                    # the push with --no-strict
 
123
                    raise errors.OutOfDateTree(
 
124
                        tree, more='Use --no-strict to force the send.')
121
125
            revision_id = branch.last_revision()
122
126
        if revision_id == NULL_REVISION:
123
127
            raise errors.BzrCommandError('No revisions to submit.')
124
128
        if format is None:
 
129
            # TODO: Query submit branch for its preferred format
125
130
            format = format_registry.get()
126
131
        directive = format(branch, revision_id, submit_branch,
127
132
            public_branch, no_patch, no_bundle, message, base_revision_id)
129
134
            directive.compose_merge_request(mail_client, mail_to, body,
130
135
                                            branch, tree)
131
136
        else:
132
 
            if directive.multiple_output_files:
133
 
                if output == '-':
134
 
                    raise errors.BzrCommandError('- not supported for '
135
 
                        'merge directives that use more than one output file.')
136
 
                if not os.path.exists(output):
137
 
                    os.mkdir(output, 0755)
138
 
                for (filename, lines) in directive.to_files():
139
 
                    path = os.path.join(output, filename)
140
 
                    outfile = open(path, 'wb')
141
 
                    try:
142
 
                        outfile.writelines(lines)
143
 
                    finally:
144
 
                        outfile.close()
 
137
            if output == '-':
 
138
                outfile = to_file
145
139
            else:
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()
 
140
                outfile = open(output, 'wb')
 
141
            try:
 
142
                outfile.writelines(directive.to_lines())
 
143
            finally:
 
144
                if outfile is not to_file:
 
145
                    outfile.close()
155
146
    finally:
156
147
        branch.unlock()
157
148
 
158
149
 
159
150
def _send_4(branch, revision_id, submit_branch, public_branch,
160
151
            no_patch, no_bundle, message, base_revision_id):
161
 
    from bzrlib import merge_directive
162
152
    return merge_directive.MergeDirective2.from_objects(
163
153
        branch.repository, revision_id, time.time(),
164
154
        osutils.local_time_offset(), submit_branch,
180
170
            patch_type = 'diff'
181
171
        else:
182
172
            patch_type = None
183
 
    from bzrlib import merge_directive
184
173
    return merge_directive.MergeDirective.from_objects(
185
174
        branch.repository, revision_id, time.time(),
186
175
        osutils.local_time_offset(), submit_branch,