← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/send.py

Merge lp:bzr.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/send.py
49
49
    branch.lock_write()
50
50
    try:
51
51
        if output is None:
 
52
            config_stack = branch.get_config_stack()
52
53
            if mail_to is None:
53
 
                mail_to = branch.get_config_stack().get('submit_to')
54
 
            mail_client = branch.get_config().get_mail_client()
 
54
                mail_to = config_stack.get('submit_to')
 
55
            mail_client = config_stack.get('mail_client')(config_stack)
55
56
            if (not getattr(mail_client, 'supports_body', False)
56
57
                and body is not None):
57
58
                raise errors.BzrCommandError(gettext(