Rev 5621: (jelmer) Allow cat-revision to be used in a tree-less branch. (Jelmer in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 5621 [merge]
revision-id: pqm at pqm.ubuntu.com-20110119174343-5fjuep0qguh4qu1h
parent: pqm at pqm.ubuntu.com-20110119065626-z6yj3e3xcfhg5jmv
parent: jelmer at samba.org-20110118235451-ak2heb58unsa5d68
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2011-01-19 17:43:43 +0000
message:
  (jelmer) Allow cat-revision to be used in a tree-less branch. (Jelmer
   Vernooij)
modified:
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/tests/blackbox/test_cat_revision.py test_cat_revision.py-20070410204634-fq8mnld5l5aza9e2-1
  doc/en/release-notes/bzr-2.4.txt bzr2.4.txt-20110114053217-k7ym9jfz243fddjm-1
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py	2011-01-18 22:30:23 +0000
+++ b/bzrlib/builtins.py	2011-01-19 17:43:43 +0000
@@ -328,7 +328,8 @@
         if revision_id is None and revision is None:
             raise errors.BzrCommandError('You must supply either'
                                          ' --revision or a revision_id')
-        b = WorkingTree.open_containing(directory)[0].branch
+
+        b = bzrdir.BzrDir.open_containing_tree_or_branch(directory)[1]
 
         revisions = b.repository.revisions
         if revisions is None:

=== modified file 'bzrlib/tests/blackbox/test_cat_revision.py'
--- a/bzrlib/tests/blackbox/test_cat_revision.py	2010-06-23 08:19:28 +0000
+++ b/bzrlib/tests/blackbox/test_cat_revision.py	2011-01-18 23:54:51 +0000
@@ -68,3 +68,11 @@
         output, errors = self.run_bzr(['cat-revision', '-d', 'a', u'abcd'])
         self.assertContainsRe(output, 'This revision')
         self.assertEqual('', errors)
+
+    def test_cat_tree_less_branch(self):
+        tree = self.make_branch_and_tree('.')
+        tree.commit('This revision', rev_id='abcd')
+        tree.bzrdir.destroy_workingtree()
+        output, errors = self.run_bzr(['cat-revision', '-d', 'a', u'abcd'])
+        self.assertContainsRe(output, 'This revision')
+        self.assertEqual('', errors)

=== modified file 'doc/en/release-notes/bzr-2.4.txt'
--- a/doc/en/release-notes/bzr-2.4.txt	2011-01-19 06:13:58 +0000
+++ b/doc/en/release-notes/bzr-2.4.txt	2011-01-19 17:43:43 +0000
@@ -29,6 +29,8 @@
 .. Improvements to existing commands, especially improved performance 
    or memory usage, or better results.
 
+* ``bzr cat-revision`` no longer requires a working tree. (Jelmer Vernooij, #704405)
+
 Bug Fixes
 *********