← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/send.py

  • Committer: Jelmer Vernooij
  • Date: 2011-04-09 22:14:24 UTC
  • mfrom: (5777.4.2 mutableinventorytree)
  • mto: This revision was merged to the branch mainline in revision 5787.
  • Revision ID: jelmer@samba.org-20110409221424-a2air35exbz50hi8
Mergemutableinventorytree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/send.py
19
19
import time
20
20
 
21
21
from bzrlib import (
22
 
    controldir,
 
22
    bzrdir,
23
23
    errors,
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
    )
40
39
def send(submit_branch, revision, public_branch, remember, format,
41
40
         no_bundle, no_patch, output, from_, mail_to, message, body,
42
41
         to_file, strict=None):
43
 
    tree, branch = controldir.ControlDir.open_containing_tree_or_branch(
44
 
        from_)[: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
45
    branch.lock_write()
53
51
            mail_client = config.get_mail_client()
54
52
            if (not getattr(mail_client, 'supports_body', False)
55
53
                and body is not None):
56
 
                raise errors.BzrCommandError(gettext(
57
 
                    'Mail client "%s" does not support specifying body') %
 
54
                raise errors.BzrCommandError(
 
55
                    'Mail client "%s" does not support specifying body' %
58
56
                    mail_client.__class__.__name__)
59
57
        if remember and submit_branch is None:
60
 
            raise errors.BzrCommandError(gettext(
61
 
                '--remember requires a branch to be specified.'))
 
58
            raise errors.BzrCommandError(
 
59
                '--remember requires a branch to be specified.')
62
60
        stored_submit_branch = branch.get_submit_branch()
63
61
        remembered_submit_branch = None
64
62
        if submit_branch is None:
65
63
            submit_branch = stored_submit_branch
66
64
            remembered_submit_branch = "submit"
67
65
        else:
68
 
            # Remembers if asked explicitly or no previous location is set
69
 
            if remember or (remember is None and stored_submit_branch is None):
 
66
            if stored_submit_branch is None or remember:
70
67
                branch.set_submit_branch(submit_branch)
71
68
        if submit_branch is None:
72
69
            submit_branch = branch.get_parent()
73
70
            remembered_submit_branch = "parent"
74
71
        if submit_branch is None:
75
 
            raise errors.BzrCommandError(gettext('No submit branch known or'
76
 
                                         ' specified'))
 
72
            raise errors.BzrCommandError('No submit branch known or'
 
73
                                         ' specified')
77
74
        if remembered_submit_branch is not None:
78
 
            trace.note(gettext('Using saved {0} location "{1}" to determine '
79
 
                       'what changes to submit.').format(
80
 
                                    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)
81
78
 
82
79
        if mail_to is None or format is None:
83
80
            # TODO: jam 20090716 we open the submit_branch here, but we *don't*
92
89
                try:
93
90
                    format = format_registry.get(formatname)
94
91
                except KeyError:
95
 
                    raise errors.BzrCommandError(gettext("No such send format '%s'.") % 
 
92
                    raise errors.BzrCommandError("No such send format '%s'." % 
96
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.BzrCommandError(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.BzrCommandError(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.BzrCommandError(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
123
        directive = format(branch, revision_id, submit_branch,
133
128
        else:
134
129
            if directive.multiple_output_files:
135
130
                if output == '-':
136
 
                    raise errors.BzrCommandError(gettext('- not supported for '
137
 
                        '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.')
138
133
                if not os.path.exists(output):
139
134
                    os.mkdir(output, 0755)
140
135
                for (filename, lines) in directive.to_files():
175
170
        if not no_patch:
176
171
            patch_type = 'bundle'
177
172
        else:
178
 
            raise errors.BzrCommandError(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'