← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/send.py

  • Committer: Patch Queue Manager
  • Date: 2012-01-28 13:24:39 UTC
  • mfrom: (6450.1.1 bzr.dev)
  • Revision ID: pqm@pqm.ubuntu.com-20120128132439-phvlss4cq7bf5rji
(jelmer) Merge the 2.5 branch. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/send.py
41
41
def send(target_branch, revision, public_branch, remember,
42
42
         format, no_bundle, no_patch, output, from_, mail_to, message, body,
43
43
         to_file, strict=None):
 
44
    possible_transports = []
44
45
    tree, branch = controldir.ControlDir.open_containing_tree_or_branch(
45
 
        from_)[:2]
46
 
    possible_transports = [tree.bzrdir.transport, branch.bzrdir.transport]
 
46
        from_, possible_transports=possible_transports)[:2]
47
47
    # we may need to write data into branch's repository to calculate
48
48
    # the data to send.
49
49
    branch.lock_write()