← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/send.py

  • Committer: Martin von Gagern
  • Date: 2011-06-01 12:53:56 UTC
  • mto: This revision was merged to the branch mainline in revision 6009.
  • Revision ID: martin.vgagern@gmx.net-20110601125356-lwozv2vecea6hxfz
Change from no_decorate to classify as name for the argument.

The command line switch remains as --no-classify, to keep backwards
compatibility.  Users are free to include --no-classify in an alias, and
still use --classify to change back.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/send.py
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
    )
52
51
            mail_client = config.get_mail_client()
53
52
            if (not getattr(mail_client, 'supports_body', False)
54
53
                and body is not None):
55
 
                raise errors.BzrCommandError(gettext(
56
 
                    'Mail client "%s" does not support specifying body') %
 
54
                raise errors.BzrCommandError(
 
55
                    'Mail client "%s" does not support specifying body' %
57
56
                    mail_client.__class__.__name__)
58
57
        if remember and submit_branch is None:
59
 
            raise errors.BzrCommandError(gettext(
60
 
                '--remember requires a branch to be specified.'))
 
58
            raise errors.BzrCommandError(
 
59
                '--remember requires a branch to be specified.')
61
60
        stored_submit_branch = branch.get_submit_branch()
62
61
        remembered_submit_branch = None
63
62
        if submit_branch is None:
71
70
            submit_branch = branch.get_parent()
72
71
            remembered_submit_branch = "parent"
73
72
        if submit_branch is None:
74
 
            raise errors.BzrCommandError(gettext('No submit branch known or'
75
 
                                         ' specified'))
 
73
            raise errors.BzrCommandError('No submit branch known or'
 
74
                                         ' specified')
76
75
        if remembered_submit_branch is not None:
77
 
            trace.note(gettext('Using saved {0} location "{1}" to determine '
78
 
                       'what changes to submit.').format(
79
 
                                    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)
80
79
 
81
80
        if mail_to is None or format is None:
82
81
            # TODO: jam 20090716 we open the submit_branch here, but we *don't*
91
90
                try:
92
91
                    format = format_registry.get(formatname)
93
92
                except KeyError:
94
 
                    raise errors.BzrCommandError(gettext("No such send format '%s'.") % 
 
93
                    raise errors.BzrCommandError("No such send format '%s'." % 
95
94
                                                 formatname)
96
95
 
97
96
        stored_public_branch = branch.get_public_branch()
102
101
              or (remember is None and stored_public_branch is None)):
103
102
            branch.set_public_branch(public_branch)
104
103
        if no_bundle and public_branch is None:
105
 
            raise errors.BzrCommandError(gettext('No public branch specified or'
106
 
                                         ' known'))
 
104
            raise errors.BzrCommandError('No public branch specified or'
 
105
                                         ' known')
107
106
        base_revision_id = None
108
107
        revision_id = None
109
108
        if revision is not None:
110
109
            if len(revision) > 2:
111
 
                raise errors.BzrCommandError(gettext('bzr send takes '
112
 
                    'at most two one revision identifiers'))
 
110
                raise errors.BzrCommandError('bzr send takes '
 
111
                    'at most two one revision identifiers')
113
112
            revision_id = revision[-1].as_revision_id(branch)
114
113
            if len(revision) == 2:
115
114
                base_revision_id = revision[0].as_revision_id(branch)
121
120
                    more_warning='Uncommitted changes will not be sent.')
122
121
            revision_id = branch.last_revision()
123
122
        if revision_id == NULL_REVISION:
124
 
            raise errors.BzrCommandError(gettext('No revisions to submit.'))
 
123
            raise errors.BzrCommandError('No revisions to submit.')
125
124
        if format is None:
126
125
            format = format_registry.get()
127
126
        directive = format(branch, revision_id, submit_branch,
132
131
        else:
133
132
            if directive.multiple_output_files:
134
133
                if output == '-':
135
 
                    raise errors.BzrCommandError(gettext('- not supported for '
136
 
                        '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.')
137
136
                if not os.path.exists(output):
138
137
                    os.mkdir(output, 0755)
139
138
                for (filename, lines) in directive.to_files():
174
173
        if not no_patch:
175
174
            patch_type = 'bundle'
176
175
        else:
177
 
            raise errors.BzrCommandError(gettext('Format 0.9 does not'
178
 
                ' permit bundle with no patch'))
 
176
            raise errors.BzrCommandError('Format 0.9 does not'
 
177
                ' permit bundle with no patch')
179
178
    else:
180
179
        if not no_patch:
181
180
            patch_type = 'diff'