← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/foreign.py

  • Committer: Patch Queue Manager
  • Date: 2011-10-06 08:34:03 UTC
  • mfrom: (6191.2.1 843900-url-nameerror)
  • Revision ID: pqm@pqm.ubuntu.com-20111006083403-jnsw0exlirg01aed
(mbp) error message without traceback on invalid ubuntu/debian url (bug
 843900) (Martin Pool)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/foreign.py
283
283
    def run(self, location=None, remember=False, directory=None,
284
284
            no_rebase=False, strict=None):
285
285
        from bzrlib import urlutils
286
 
        from bzrlib.controldir import ControlDir
 
286
        from bzrlib.bzrdir import BzrDir
287
287
        from bzrlib.errors import BzrCommandError, NoWorkingTree
288
288
        from bzrlib.workingtree import WorkingTree
289
289
 
311
311
                       gettext("Using saved location: %s\n") % display_url)
312
312
                location = stored_loc
313
313
 
314
 
        controldir = ControlDir.open(location)
315
 
        target_branch = controldir.open_branch()
 
314
        bzrdir = BzrDir.open(location)
 
315
        target_branch = bzrdir.open_branch()
316
316
        target_branch.lock_write()
317
317
        try:
318
318
            try: