Rev 4220: fix when log advice re levels is given (Ian Clatworthy) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 4220
revision-id: pqm at pqm.ubuntu.com-20090331080348-o2ovsnu3xrrjxr88
parent: pqm at pqm.ubuntu.com-20090331055149-vjdpx8awxkxema5i
parent: ian.clatworthy at canonical.com-20090331071422-ly161f5svfrzec4l
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2009-03-31 09:03:48 +0100
message:
  fix when log advice re levels is given (Ian Clatworthy)
modified:
  bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
  bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
  bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
    ------------------------------------------------------------
    revno: 4219.1.1
    revision-id: ian.clatworthy at canonical.com-20090331071422-ly161f5svfrzec4l
    parent: pqm at pqm.ubuntu.com-20090331055149-vjdpx8awxkxema5i
    parent: ian.clatworthy at canonical.com-20090331005748-7x57as7n2v5rxbz5
    committer: Ian Clatworthy <ian.clatworthy at canonical.com>
    branch nick: ianc-integration
    timestamp: Tue 2009-03-31 17:14:22 +1000
    message:
      fix when log advice re levels is given (Ian Clatworthy)
    modified:
      bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
      bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
      bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
    ------------------------------------------------------------
    revno: 4217.2.1
    revision-id: ian.clatworthy at canonical.com-20090331005748-7x57as7n2v5rxbz5
    parent: pqm at pqm.ubuntu.com-20090330232934-wy5ynne0u2qlb0bu
    committer: Ian Clatworthy <ian.clatworthy at canonical.com>
    branch nick: bzr.log-mainline-by-default
    timestamp: Tue 2009-03-31 10:57:48 +1000
    message:
      fix log advice when the # of levels is implicit
    modified:
      bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
      bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
      bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
=== modified file 'bzrlib/log.py'
--- a/bzrlib/log.py	2009-03-30 05:47:29 +0000
+++ b/bzrlib/log.py	2009-03-31 00:57:48 +0000
@@ -1318,10 +1318,10 @@
         """Get the number of levels to display or 0 for all."""
         if getattr(self, 'supports_merge_revisions', False):
             if self.levels is None or self.levels == -1:
-                return self.preferred_levels
-            else:
-                return self.levels
-        return 1
+                self.levels = self.preferred_levels
+        else:
+            self.levels = 1
+        return self.levels
 
     def log_revision(self, revision):
         """Log a revision.

=== modified file 'bzrlib/tests/blackbox/test_log.py'
--- a/bzrlib/tests/blackbox/test_log.py	2009-03-30 05:47:29 +0000
+++ b/bzrlib/tests/blackbox/test_log.py	2009-03-31 00:57:48 +0000
@@ -607,6 +607,7 @@
       @@ -0,0 +1,1 @@
       +contents of parent/file2
 
+Use --levels 0 (or -n0) to see merged revisions.
 """)
 
     def test_log_show_diff_line(self):
@@ -644,6 +645,7 @@
       @@ -0,0 +1,1 @@
       +contents of parent/file2
 
+Use --levels 0 (or -n0) to see merged revisions.
 """)
         out,err = self.run_bzr('log -p --short file1')
         self.assertEqual('', err)

=== modified file 'bzrlib/tests/test_log.py'
--- a/bzrlib/tests/test_log.py	2009-03-30 05:47:29 +0000
+++ b/bzrlib/tests/test_log.py	2009-03-31 00:57:48 +0000
@@ -301,6 +301,7 @@
     1 Joe Foo\t2005-11-22
       rev-1
 
+Use --levels 0 (or -n0) to see merged revisions.
 """,
                              logfile.getvalue())
 
@@ -339,6 +340,7 @@
     2 Joe Foo\t2005-11-22 [merge]
       rev-2b
 
+Use --levels 0 (or -n0) to see merged revisions.
 """,
                              logfile.getvalue())
 
@@ -357,6 +359,7 @@
     1 Joe Foo\t2005-11-22
       rev-1
 
+Use --levels 0 (or -n0) to see merged revisions.
 """,
                              logfile.getvalue())