Rev 3547: (jam) 'bzr testament' doesn't use a WT, in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 3547
revision-id:pqm at pqm.ubuntu.com-20080717020235-hkwh9o7zfxqj6v1u
parent: pqm at pqm.ubuntu.com-20080717012714-2r0f796ecqr1hkrx
parent: john at arbash-meinel.com-20080713164334-eu5xwg1046zxyz03
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-07-17 03:02:35 +0100
message:
  (jam) 'bzr testament' doesn't use a WT,
  	so it shouldn't try to open one
modified:
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
    ------------------------------------------------------------
    revno: 3530.2.1
    revision-id:john at arbash-meinel.com-20080713164334-eu5xwg1046zxyz03
    parent: pqm at pqm.ubuntu.com-20080707230506-82h5w03vc72dyf1a
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Sun 2008-07-13 11:43:34 -0500
    message:
      'bzr testament' should just open the branch
    modified:
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py	2008-07-16 18:14:23 +0000
+++ b/bzrlib/builtins.py	2008-07-17 02:02:35 +0000
@@ -3407,7 +3407,10 @@
             testament_class = StrictTestament
         else:
             testament_class = Testament
-        b = WorkingTree.open_containing(branch)[0].branch
+        if branch == '.':
+            b = Branch.open_containing(branch)[0]
+        else:
+            b = Branch.open(branch)
         b.lock_read()
         try:
             if revision is None: