← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/send.py

  • Committer: Vincent Ladeuil
  • Date: 2011-06-15 11:36:05 UTC
  • mto: This revision was merged to the branch mainline in revision 5975.
  • Revision ID: v.ladeuil+lp@free.fr-20110615113605-p7zyyfry9wy1hquc
https://launchpad.net/bugs/788000
Make ContentConflict resolution more robust

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:
72
70
            submit_branch = branch.get_parent()
73
71
            remembered_submit_branch = "parent"
74
72
        if submit_branch is None:
75
 
            raise errors.BzrCommandError(gettext('No submit branch known or'
76
 
                                         ' specified'))
 
73
            raise errors.BzrCommandError('No submit branch known or'
 
74
                                         ' specified')
77
75
        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))
 
76
            trace.note('Using saved %s location "%s" to determine what '
 
77
                       'changes to submit.', remembered_submit_branch,
 
78
                       submit_branch)
81
79
 
82
80
        if mail_to is None or format is None:
83
81
            # TODO: jam 20090716 we open the submit_branch here, but we *don't*
92
90
                try:
93
91
                    format = format_registry.get(formatname)
94
92
                except KeyError:
95
 
                    raise errors.BzrCommandError(gettext("No such send format '%s'.") % 
 
93
                    raise errors.BzrCommandError("No such send format '%s'." % 
96
94
                                                 formatname)
97
95
 
98
96
        stored_public_branch = branch.get_public_branch()
103
101
              or (remember is None and stored_public_branch is None)):
104
102
            branch.set_public_branch(public_branch)
105
103
        if no_bundle and public_branch is None:
106
 
            raise errors.BzrCommandError(gettext('No public branch specified or'
107
 
                                         ' known'))
 
104
            raise errors.BzrCommandError('No public branch specified or'
 
105
                                         ' known')
108
106
        base_revision_id = None
109
107
        revision_id = None
110
108
        if revision is not None:
111
109
            if len(revision) > 2:
112
 
                raise errors.BzrCommandError(gettext('bzr send takes '
113
 
                    'at most two one revision identifiers'))
 
110
                raise errors.BzrCommandError('bzr send takes '
 
111
                    'at most two one revision identifiers')
114
112
            revision_id = revision[-1].as_revision_id(branch)
115
113
            if len(revision) == 2:
116
114
                base_revision_id = revision[0].as_revision_id(branch)
122
120
                    more_warning='Uncommitted changes will not be sent.')
123
121
            revision_id = branch.last_revision()
124
122
        if revision_id == NULL_REVISION:
125
 
            raise errors.BzrCommandError(gettext('No revisions to submit.'))
 
123
            raise errors.BzrCommandError('No revisions to submit.')
126
124
        if format is None:
127
125
            format = format_registry.get()
128
126
        directive = format(branch, revision_id, submit_branch,
133
131
        else:
134
132
            if directive.multiple_output_files:
135
133
                if output == '-':
136
 
                    raise errors.BzrCommandError(gettext('- not supported for '
137
 
                        'merge directives that use more than one output file.'))
 
134
                    raise errors.BzrCommandError('- not supported for '
 
135
                        'merge directives that use more than one output file.')
138
136
                if not os.path.exists(output):
139
137
                    os.mkdir(output, 0755)
140
138
                for (filename, lines) in directive.to_files():
175
173
        if not no_patch:
176
174
            patch_type = 'bundle'
177
175
        else:
178
 
            raise errors.BzrCommandError(gettext('Format 0.9 does not'
179
 
                ' permit bundle with no patch'))
 
176
            raise errors.BzrCommandError('Format 0.9 does not'
 
177
                ' permit bundle with no patch')
180
178
    else:
181
179
        if not no_patch:
182
180
            patch_type = 'diff'