Merge lp:~gagern/bzr/bug149270_RevisionSpec_branch_readonly into lp:bzr

[Martin von Gagern]

Deal with branch: revision specs in readonly transactions

In the case of a read-only transaction, as set up by commands like log or status, using a branch: revision specification used to raise ReadOnlyError. This should fix things at least for those two commands. As far as I can tell, diff still works as well.

There might be other commands that aren't prepared to deal with revision specifications naming their own branch, and will therefore fail. Bug reports should be filed for these, including steps for reproduction, suitable for new blackbox tests. So far I have found no such command.

[Martin Pool (mbp)]

That's good. It looks almost too simple, but if this does fix those bugs and doesn't break any fetch tests then I think we're good. Well done. Needs NEWS to merge.

review: Approve

[John A Meinel (jameinel)]

I did some manual testing to confirm, but things seem to work as expected.

I've put a version of this into my own branch to add the NEWS entry and submitted to pqm via email.
  lp:///~jameinel/bzr/other/gagern-bug149270_RevisionSpec_branch_readonly

review: Approve

[John A Meinel (jameinel)]

that should be:
  lp:///~jameinel/bzr/gagern-bug149270_RevisionSpec_branch_readonly

=== modified file 'bzrlib/revisionspec.py'
--- bzrlib/revisionspec.py	2010-02-17 17:11:16 +0000
+++ bzrlib/revisionspec.py	2010-06-25 08:19:26 +0000
@@ -813,8 +813,14 @@
         revision_b = other_branch.last_revision()
         if revision_b in (None, revision.NULL_REVISION):
             raise errors.NoCommits(other_branch)
-        # pull in the remote revisions so we can diff
-        branch.fetch(other_branch, revision_b)
+        if branch is None:
+            branch = other_branch
+        else:
+            try:
+                # pull in the remote revisions so we can diff
+                branch.fetch(other_branch, revision_b)
+            except errors.ReadOnlyError:
+                branch = other_branch
         try:
             revno = branch.revision_id_to_revno(revision_b)
         except errors.NoSuchRevision:
@@ -840,6 +846,12 @@
             raise errors.NoCommits(other_branch)
         return other_branch.repository.revision_tree(last_revision)
 
+    def needs_branch(self):
+        return False
+
+    def get_branch(self):
+        return self.spec
+
 
 
 class RevisionSpec_submit(RevisionSpec_ancestor):
 
=== modified file 'bzrlib/tests/blackbox/test_log.py'
--- bzrlib/tests/blackbox/test_log.py	2010-06-08 08:24:39 +0000
+++ bzrlib/tests/blackbox/test_log.py	2010-06-25 08:19:26 +0000
@@ -158,6 +158,19 @@
         self.make_linear_branch()
         self.assertLogRevnos(['-c1'], ['1'])
 
+    def test_branch_revspec(self):
+        foo = self.make_branch_and_tree('foo')
+        bar = self.make_branch_and_tree('bar')
+        self.build_tree(['foo/foo.txt', 'bar/bar.txt'])
+        foo.add('foo.txt')
+        bar.add('bar.txt')
+        foo.commit(message='foo')
+        bar.commit(message='bar')
+        self.run_bzr('log -r branch:../bar', working_dir='foo')
+        self.assertEqual([bar.branch.get_rev_id(1)],
+                         [r.rev.revision_id
+                          for r in self.get_captured_revisions()])
+
 
 class TestLogExcludeCommonAncestry(TestLogWithLogCatcher):