← 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: 2012-01-05 16:03:11 UTC
  • mfrom: (6432 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6433.
  • Revision ID: jelmer@samba.org-20120105160311-12o5p67kin1v3zps
Merge bzr.dev.

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
from __future__ import absolute_import
17
18
 
18
19
import os
19
20
import time
48
49
    branch.lock_write()
49
50
    try:
50
51
        if output is None:
51
 
            config = branch.get_config()
52
52
            if mail_to is None:
53
 
                mail_to = config.get_user_option('submit_to')
54
 
            mail_client = config.get_mail_client()
 
53
                mail_to = branch.get_config_stack().get('submit_to')
 
54
            mail_client = branch.get_config().get_mail_client()
55
55
            if (not getattr(mail_client, 'supports_body', False)
56
56
                and body is not None):
57
57
                raise errors.BzrCommandError(gettext(
86
86
            possible_transports=possible_transports)
87
87
        possible_transports.append(submit_branch.bzrdir.root_transport)
88
88
        if mail_to is None or format is None:
89
 
            submit_config = submit_branch.get_config()
90
89
            if mail_to is None:
91
 
                mail_to = submit_config.get_user_option("child_submit_to")
 
90
                mail_to = submit_branch.get_config_stack().get(
 
91
                    'child_submit_to')
92
92
            if format is None:
93
93
                formatname = submit_branch.get_child_submit_format()
94
94
                try:
95
95
                    format = format_registry.get(formatname)
96
96
                except KeyError:
97
 
                    raise errors.BzrCommandError(gettext("No such send format '%s'.") % 
98
 
                                                 formatname)
 
97
                    raise errors.BzrCommandError(
 
98
                        gettext("No such send format '%s'.") % formatname)
99
99
 
100
100
        stored_public_branch = branch.get_public_branch()
101
101
        if public_branch is None: