← 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: 2009-05-28 16:14:16 UTC
  • mfrom: (4387 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4389.
  • Revision ID: jelmer@samba.org-20090528161416-k7x0l8hwuk2kyvsf
merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/send.py
76
76
                       'changes to submit.', remembered_submit_branch,
77
77
                       submit_branch)
78
78
 
79
 
        if mail_to is None:
80
 
            submit_config = Branch.open(submit_branch).get_config()
81
 
            mail_to = submit_config.get_user_option("child_submit_to")
 
79
        if mail_to is None or format is None:
 
80
            submit_br = Branch.open(submit_branch)
 
81
            submit_config = submit_br.get_config()
 
82
            if mail_to is None:
 
83
                mail_to = submit_config.get_user_option("child_submit_to")
 
84
            if format is None:
 
85
                formatname = submit_br.get_child_submit_format()
 
86
                try:
 
87
                    format = format_registry.get(formatname)
 
88
                except KeyError:
 
89
                    raise errors.BzrCommandError("No such send format '%s'." % 
 
90
                                                 formatname)
82
91
 
83
92
        stored_public_branch = branch.get_public_branch()
84
93
        if public_branch is None: