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

[Martin von Gagern]

Make the log command take its branch from the RevisionInfo.

This makes the bzr log builtin take the branch from the RevisionInfo, thereby allowing things like "bzr log -r -1:some/branch"

[John A Meinel (jameinel)]

sent to pqm by email

[John A Meinel (jameinel)]

This is failing in PQM. With this traceback:
  File "/home/pqm/bzr-pqm-workdir/home/+trunk/bzrlib/cleanup.py", line 134, in run_simple
    return _do_with_cleanups(
  File "/home/pqm/bzr-pqm-workdir/home/+trunk/bzrlib/cleanup.py", line 165, in _do_with_cleanups
    result = func(*args, **kwargs)
  File "/home/pqm/bzr-pqm-workdir/home/+trunk/bzrlib/commands.py", line 1126, in ignore_pipe
    result = func(*args, **kwargs)
  File "/home/pqm/bzr-pqm-workdir/home/+trunk/bzrlib/builtins.py", line 2364, in run
    b = rev1.branch
AttributeError: 'NoneType' object has no attribute 'branch'
------------

It would seem that plain 'bzr log' is failing because there is no start revision.

This would hint towards:
 if rev1 is not None:
   b = rev1.branch

Or something like that. You might also want to do:
  if rev1 is not None and rev1.branch is not None:
    b = rev1.branch

I also think we're supposed to do something about a 'has_branch()' check.

review: Needs Fixing

Unmerged revisions

5320. By Martin von Gagern on 2010-06-28

Merge branch from bug 149270.

That branch has already been approved, and the blackbox tests from both
branches would conflict. Now they can both be merged into bzr.dev.

5319. By Martin von Gagern on 2010-06-25

Make the log command take its branch from the RevisionInfo.

This allows bzr log to operate with dwim revspecs that provide their own
branch although RevisionSpec_dwim doesn't override get_branch. Therefore
things like the "bzr log -r -1:some/branch" now start to work, as ensured by
the test case.

They will still fail if the current dir doesn't have an associated bzr
branch, though, as it will still attempt to open a branch for the current
directory to be passed to the dwim revspec. In those cases, specifying the
prefix as in "-r revno:-1:some/branch" would be a possible workaround.

=== modified file 'bzrlib/builtins.py'
--- bzrlib/builtins.py	2010-06-17 08:53:15 +0000
+++ bzrlib/builtins.py	2010-06-29 07:18:30 +0000
@@ -2361,6 +2361,7 @@
             b = dir.open_branch()
             self.add_cleanup(b.lock_read().unlock)
             rev1, rev2 = _get_revision_range(revision, b, self.name())
+            b = rev1.branch
 
         # Decide on the type of delta & diff filtering to use
         # TODO: add an --all-files option to make this configurable & consistent

=== modified file 'bzrlib/tests/blackbox/test_log.py'
--- bzrlib/tests/blackbox/test_log.py	2010-06-25 08:01:24 +0000
+++ bzrlib/tests/blackbox/test_log.py	2010-06-29 07:18:30 +0000
@@ -171,6 +171,19 @@
                          [r.rev.revision_id
                           for r in self.get_captured_revisions()])
 
+    def test_dwim_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 1:../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):