Rev 3146: Checkout uses branch tree as a fallback accelerator (abentley) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 3146
revision-id:pqm at pqm.ubuntu.com-20071228175832-9kboqtkemnuzzlab
parent: pqm at pqm.ubuntu.com-20071227150146-08nqv2gvo5e3i1n3
parent: abentley at panoramicfeedback.com-20071221154324-f4zh3umcv61mt68o
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-12-28 17:58:32 +0000
message:
  Checkout uses branch tree as a fallback accelerator (abentley)
modified:
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
    ------------------------------------------------------------
    revno: 3123.5.22
    revision-id:abentley at panoramicfeedback.com-20071221154324-f4zh3umcv61mt68o
    parent: abentley at panoramicfeedback.com-20071221153645-p0rvr1alvssg1rns
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: hardlinks
    timestamp: Fri 2007-12-21 10:43:24 -0500
    message:
      Change failing test to use another command, since checkout now uses trees
    modified:
      bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
    ------------------------------------------------------------
    revno: 3123.5.21
    revision-id:abentley at panoramicfeedback.com-20071221153645-p0rvr1alvssg1rns
    parent: abentley at panoramicfeedback.com-20071220171621-3vxsv714ux293ohl
    parent: pqm at pqm.ubuntu.com-20071221145325-erktp9le86ik56j1
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: hardlinks
    timestamp: Fri 2007-12-21 10:36:45 -0500
    message:
      Merge with bzr.dev
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
      bzrlib/tests/test_http.py      testhttp.py-20051018020158-b2eef6e867c514d9
      bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
      bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
      bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
      bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
      bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
      bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
    ------------------------------------------------------------
    revno: 3123.5.20
    revision-id:abentley at panoramicfeedback.com-20071220171621-3vxsv714ux293ohl
    parent: abentley at panoramicfeedback.com-20071220163852-it2m717w4dmabt4f
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: hardlinks
    timestamp: Thu 2007-12-20 12:16:21 -0500
    message:
      Checkout uses branch tree as a fallback accelerator
    modified:
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py	2007-12-26 21:13:53 +0000
+++ b/bzrlib/builtins.py	2007-12-28 17:58:32 +0000
@@ -956,10 +956,6 @@
 
     def run(self, branch_location=None, to_location=None, revision=None,
             lightweight=False, files_from=None):
-        if files_from is not None:
-            accelerator_tree = WorkingTree.open(files_from)
-        else:
-            accelerator_tree = None
         if revision is None:
             revision = [None]
         elif len(revision) > 1:
@@ -968,7 +964,10 @@
         if branch_location is None:
             branch_location = osutils.getcwd()
             to_location = branch_location
-        source = Branch.open(branch_location)
+        accelerator_tree, source = bzrdir.BzrDir.open_tree_or_branch(
+            branch_location)
+        if files_from is not None:
+            accelerator_tree = WorkingTree.open(files_from)
         if len(revision) == 1 and revision[0] is not None:
             revision_id = _mod_revision.ensure_null(
                 revision[0].in_history(source)[1])

=== modified file 'bzrlib/tests/blackbox/test_upgrade.py'
--- a/bzrlib/tests/blackbox/test_upgrade.py	2007-06-27 19:13:50 +0000
+++ b/bzrlib/tests/blackbox/test_upgrade.py	2007-12-21 15:43:24 +0000
@@ -196,6 +196,6 @@
         # the actual workingtree, not when we only open a bzrdir that contains
         # an old workngtree
         self.run_bzr('init --knit a')
-        out, err = self.run_bzr('checkout a b')
+        out, err = self.run_bzr('revno a')
         if err.find('upgrade') > -1:
             self.fail("message shouldn't suggest upgrade:\n%s" % err)