← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/send.py

  • Committer: Shannon Weyrick
  • Date: 2011-11-04 13:40:04 UTC
  • mfrom: (6238 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6256.
  • Revision ID: weyrick@mozek.us-20111104134004-033t2wqhc3ydzm0a
Merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/send.py
19
19
import time
20
20
 
21
21
from bzrlib import (
22
 
    bzrdir,
 
22
    controldir,
23
23
    errors,
24
24
    osutils,
25
25
    registry,
40
40
def send(submit_branch, revision, public_branch, remember, format,
41
41
         no_bundle, no_patch, output, from_, mail_to, message, body,
42
42
         to_file, strict=None):
43
 
    tree, branch = bzrdir.BzrDir.open_containing_tree_or_branch(from_)[:2]
 
43
    tree, branch = controldir.ControlDir.open_containing_tree_or_branch(
 
44
        from_)[:2]
44
45
    # we may need to write data into branch's repository to calculate
45
46
    # the data to send.
46
47
    branch.lock_write()