/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/send.py

  • Committer: Vincent Ladeuil
  • Date: 2010-07-07 11:21:19 UTC
  • mto: (5193.7.1 unify-confs)
  • mto: This revision was merged to the branch mainline in revision 5349.
  • Revision ID: v.ladeuil+lp@free.fr-20100707112119-jwyh312df41w6l0o
Revert previous change as I can't reproduce the related problem anymore.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/send.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
 
17
 
17
18
import os
18
19
import time
19
20
 
20
 
from . import (
21
 
    controldir,
 
21
from bzrlib import (
 
22
    bzrdir,
22
23
    errors,
23
24
    osutils,
24
25
    registry,
25
26
    trace,
26
27
    )
27
 
from .i18n import gettext
28
 
from .branch import (
 
28
from bzrlib.branch import (
29
29
    Branch,
30
30
    )
31
 
from .revision import (
 
31
from bzrlib.revision import (
32
32
    NULL_REVISION,
33
33
    )
34
34
 
36
36
format_registry = registry.Registry()
37
37
 
38
38
 
39
 
def send(target_branch, revision, public_branch, remember,
40
 
         format, no_bundle, no_patch, output, from_, mail_to, message, body,
 
39
def send(submit_branch, revision, public_branch, remember, format,
 
40
         no_bundle, no_patch, output, from_, mail_to, message, body,
41
41
         to_file, strict=None):
42
 
    possible_transports = []
43
 
    tree, branch = controldir.ControlDir.open_containing_tree_or_branch(
44
 
        from_, possible_transports=possible_transports)[:2]
 
42
    tree, branch = bzrdir.BzrDir.open_containing_tree_or_branch(from_)[:2]
45
43
    # we may need to write data into branch's repository to calculate
46
44
    # the data to send.
47
 
    with branch.lock_write():
 
45
    branch.lock_write()
 
46
    try:
48
47
        if output is None:
49
 
            config_stack = branch.get_config_stack()
 
48
            config = branch.get_config()
50
49
            if mail_to is None:
51
 
                mail_to = config_stack.get('submit_to')
52
 
            mail_client = config_stack.get('mail_client')(config_stack)
 
50
                mail_to = config.get_user_option('submit_to')
 
51
            mail_client = config.get_mail_client()
53
52
            if (not getattr(mail_client, 'supports_body', False)
54
 
                    and body is not None):
55
 
                raise errors.CommandError(gettext(
56
 
                    'Mail client "%s" does not support specifying body') %
 
53
                and body is not None):
 
54
                raise errors.BzrCommandError(
 
55
                    'Mail client "%s" does not support specifying body' %
57
56
                    mail_client.__class__.__name__)
58
 
        if remember and target_branch is None:
59
 
            raise errors.CommandError(gettext(
60
 
                '--remember requires a branch to be specified.'))
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"
 
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"
66
65
        else:
67
 
            # Remembers if asked explicitly or no previous location is set
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:
75
 
            raise errors.CommandError(gettext('No submit branch known or'
76
 
                                                 ' specified'))
77
 
        if remembered_target_branch is not None:
78
 
            trace.note(gettext('Using saved {0} location "{1}" to determine '
79
 
                               'what changes to submit.').format(
80
 
                remembered_target_branch,
81
 
                target_branch))
 
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)
82
78
 
83
 
        submit_branch = Branch.open(target_branch,
84
 
                                    possible_transports=possible_transports)
85
 
        possible_transports.append(submit_branch.controldir.root_transport)
86
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()
87
85
            if mail_to is None:
88
 
                mail_to = submit_branch.get_config_stack().get(
89
 
                    'child_submit_to')
 
86
                mail_to = submit_config.get_user_option("child_submit_to")
90
87
            if format is None:
91
 
                formatname = submit_branch.get_child_submit_format()
 
88
                formatname = submit_br.get_child_submit_format()
92
89
                try:
93
90
                    format = format_registry.get(formatname)
94
91
                except KeyError:
95
 
                    raise errors.CommandError(
96
 
                        gettext("No such send format '%s'.") % formatname)
 
92
                    raise errors.BzrCommandError("No such send format '%s'." % 
 
93
                                                 formatname)
97
94
 
98
95
        stored_public_branch = branch.get_public_branch()
99
96
        if public_branch is None:
100
97
            public_branch = stored_public_branch
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)):
 
98
        elif stored_public_branch is None or remember:
104
99
            branch.set_public_branch(public_branch)
105
100
        if no_bundle and public_branch is None:
106
 
            raise errors.CommandError(gettext('No public branch specified or'
107
 
                                                 ' known'))
 
101
            raise errors.BzrCommandError('No public branch specified or'
 
102
                                         ' known')
108
103
        base_revision_id = None
109
104
        revision_id = None
110
105
        if revision is not None:
111
106
            if len(revision) > 2:
112
 
                raise errors.CommandError(gettext('bzr send takes '
113
 
                                                     'at most two one revision identifiers'))
 
107
                raise errors.BzrCommandError('bzr send takes '
 
108
                    'at most two one revision identifiers')
114
109
            revision_id = revision[-1].as_revision_id(branch)
115
110
            if len(revision) == 2:
116
111
                base_revision_id = revision[0].as_revision_id(branch)
122
117
                    more_warning='Uncommitted changes will not be sent.')
123
118
            revision_id = branch.last_revision()
124
119
        if revision_id == NULL_REVISION:
125
 
            raise errors.CommandError(gettext('No revisions to submit.'))
 
120
            raise errors.BzrCommandError('No revisions to submit.')
126
121
        if format is None:
127
122
            format = format_registry.get()
128
 
        directive = format(branch, revision_id, target_branch,
129
 
                           public_branch, no_patch, no_bundle, message, base_revision_id,
130
 
                           submit_branch)
 
123
        directive = format(branch, revision_id, submit_branch,
 
124
            public_branch, no_patch, no_bundle, message, base_revision_id)
131
125
        if output is None:
132
126
            directive.compose_merge_request(mail_client, mail_to, body,
133
127
                                            branch, tree)
134
128
        else:
135
129
            if directive.multiple_output_files:
136
130
                if output == '-':
137
 
                    raise errors.CommandError(gettext('- not supported for '
138
 
                                                         'merge directives that use more than one output file.'))
 
131
                    raise errors.BzrCommandError('- not supported for '
 
132
                        'merge directives that use more than one output file.')
139
133
                if not os.path.exists(output):
140
 
                    os.mkdir(output, 0o755)
 
134
                    os.mkdir(output, 0755)
141
135
                for (filename, lines) in directive.to_files():
142
136
                    path = os.path.join(output, filename)
143
 
                    with open(path, 'wb') as outfile:
 
137
                    outfile = open(path, 'wb')
 
138
                    try:
144
139
                        outfile.writelines(lines)
 
140
                    finally:
 
141
                        outfile.close()
145
142
            else:
146
143
                if output == '-':
147
144
                    outfile = to_file
152
149
                finally:
153
150
                    if outfile is not to_file:
154
151
                        outfile.close()
155
 
 
156
 
 
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):
160
 
    from breezy import merge_directive
 
152
    finally:
 
153
        branch.unlock()
 
154
 
 
155
 
 
156
def _send_4(branch, revision_id, submit_branch, public_branch,
 
157
            no_patch, no_bundle, message, base_revision_id):
 
158
    from bzrlib import merge_directive
161
159
    return merge_directive.MergeDirective2.from_objects(
162
160
        branch.repository, revision_id, time.time(),
163
 
        osutils.local_time_offset(), target_branch,
164
 
        public_branch=public_branch,
165
 
        include_patch=not no_patch,
 
161
        osutils.local_time_offset(), submit_branch,
 
162
        public_branch=public_branch, include_patch=not no_patch,
166
163
        include_bundle=not no_bundle, message=message,
167
 
        base_revision_id=base_revision_id,
168
 
        local_target_branch=local_target_branch)
 
164
        base_revision_id=base_revision_id)
169
165
 
170
166
 
171
167
def _send_0_9(branch, revision_id, submit_branch, public_branch,
172
 
              no_patch, no_bundle, message,
173
 
              base_revision_id, local_target_branch=None):
 
168
              no_patch, no_bundle, message, base_revision_id):
174
169
    if not no_bundle:
175
170
        if not no_patch:
176
171
            patch_type = 'bundle'
177
172
        else:
178
 
            raise errors.CommandError(gettext('Format 0.9 does not'
179
 
                                                 ' permit bundle with no patch'))
 
173
            raise errors.BzrCommandError('Format 0.9 does not'
 
174
                ' permit bundle with no patch')
180
175
    else:
181
176
        if not no_patch:
182
177
            patch_type = 'diff'
183
178
        else:
184
179
            patch_type = None
185
 
    from breezy import merge_directive
 
180
    from bzrlib import merge_directive
186
181
    return merge_directive.MergeDirective.from_objects(
187
182
        branch.repository, revision_id, time.time(),
188
183
        osutils.local_time_offset(), submit_branch,
189
184
        public_branch=public_branch, patch_type=patch_type,
190
 
        message=message, local_target_branch=local_target_branch)
191
 
 
192
 
 
193
 
format_registry.register('4',
194
 
                         _send_4, 'Bundle format 4, Merge Directive 2 (default)')
 
185
        message=message)
 
186
 
 
187
 
 
188
format_registry.register('4', 
 
189
    _send_4, 'Bundle format 4, Merge Directive 2 (default)')
195
190
format_registry.register('0.9',
196
 
                         _send_0_9, 'Bundle format 0.9, Merge Directive 1')
 
191
    _send_0_9, 'Bundle format 0.9, Merge Directive 1')
197
192
format_registry.default_key = '4'