← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/send.py

  • Committer: Vincent Ladeuil
  • Date: 2011-09-27 11:48:50 UTC
  • mto: This revision was merged to the branch mainline in revision 6173.
  • Revision ID: v.ladeuil+lp@free.fr-20110927114850-338r2mns0138klv0
https://launchpad.net/bugs/860424
Global options respect their hidden attribute

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
 
    controldir,
 
22
    bzrdir,
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 = controldir.ControlDir.open_containing_tree_or_branch(
44
 
        from_)[:2]
 
43
    tree, branch = bzrdir.BzrDir.open_containing_tree_or_branch(from_)[:2]
45
44
    # we may need to write data into branch's repository to calculate
46
45
    # the data to send.
47
46
    branch.lock_write()