Rev 3946: Revert one test change, and the special case of logging all-of-mainline. in lp:///~jameinel/bzr/1.12-fix-short-log

[John Arbash Meinel]

At lp:///~jameinel/bzr/1.12-fix-short-log

------------------------------------------------------------
revno: 3946
revision-id: john at arbash-meinel.com-20090116223224-hspiby4drt1ng7uy
parent: john at arbash-meinel.com-20090116222734-9mgzsmtcvv9qr2mt
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.12-fix-short-log
timestamp: Fri 2009-01-16 16:32:24 -0600
message:
  Revert one test change, and the special case of logging all-of-mainline.
-------------- next part --------------
=== modified file 'bzrlib/log.py'
--- a/bzrlib/log.py	2009-01-16 22:16:14 +0000
+++ b/bzrlib/log.py	2009-01-16 22:32:24 +0000
@@ -230,12 +230,6 @@
 def calculate_view_revisions(branch, start_revision, end_revision, direction,
                              specific_fileid, generate_merge_revisions,
                              allow_single_merge_revision):
-    if (    not generate_merge_revisions
-        and start_revision is end_revision is None
-        and direction == 'reverse'
-        and specific_fileid is None):
-        return _linear_view_revisions(branch)
-
     mainline_revs, rev_nos, start_rev_id, end_rev_id = _get_mainline_revs(
         branch, start_revision, end_revision)
     if not mainline_revs:

=== modified file 'bzrlib/tests/test_log.py'
--- a/bzrlib/tests/test_log.py	2009-01-16 22:27:34 +0000
+++ b/bzrlib/tests/test_log.py	2009-01-16 22:32:24 +0000
@@ -301,8 +301,8 @@
         wt.commit('rev-merged', rev_id='rev-2a',
                   timestamp=1132586700, timezone=36000,
                   committer='Joe Foo <joe at foo.com>')
+        wt.set_parent_ids(['rev-1', 'rev-2a'])
         wt.branch.set_last_revision_info(1, 'rev-1')
-        wt.set_parent_ids(['rev-1', 'rev-2a'])
         wt.commit('rev-2', rev_id='rev-2b',
                   timestamp=1132586800, timezone=36000,
                   committer='Joe Foo <joe at foo.com>')