Rev 3674: (robertc) Unbreak log --limit (Robert Collins) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 3674
revision-id: pqm at pqm.ubuntu.com-20080902005036-bbqbkssiec08fd3h
parent: pqm at pqm.ubuntu.com-20080902002130-5056i7diicwe1uwl
parent: robertc at robertcollins.net-20080901005653-blrkf62i7171gmv7
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2008-09-02 01:50:36 +0100
message:
  (robertc) Unbreak log --limit (Robert Collins)
modified:
  bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
  bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
    ------------------------------------------------------------
    revno: 3660.1.1
    revision-id: robertc at robertcollins.net-20080901005653-blrkf62i7171gmv7
    parent: pqm at pqm.ubuntu.com-20080828212328-q4mx5qgvrokx06c0
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: log
    timestamp: Mon 2008-09-01 10:56:53 +1000
    message:
      Fix log --limit (broken by log filtering patch).
    modified:
      bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
      bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
=== modified file 'bzrlib/log.py'
--- a/bzrlib/log.py	2008-08-28 01:27:59 +0000
+++ b/bzrlib/log.py	2008-09-01 00:56:53 +0000
@@ -230,7 +230,7 @@
             if limit:
                 log_count += 1
                 if log_count >= limit:
-                    break
+                    return
 
 
 def calculate_view_revisions(branch, start_revision, end_revision, direction,

=== modified file 'bzrlib/tests/blackbox/test_log.py'
--- a/bzrlib/tests/blackbox/test_log.py	2008-07-05 23:06:12 +0000
+++ b/bzrlib/tests/blackbox/test_log.py	2008-09-01 00:56:53 +0000
@@ -177,11 +177,21 @@
         self.assertContainsRe(log, r'tags: tag1')
 
     def test_log_limit(self):
-        self._prepare()
+        tree = self.make_branch_and_tree('.')
+        # We want more commits than our batch size starts at
+        for pos in range(10):
+            tree.commit("%s" % pos)
         log = self.run_bzr("log --limit 2")[0]
         self.assertNotContainsRe(log, r'revno: 1\n')
-        self.assertContainsRe(log, r'revno: 2\n')
-        self.assertContainsRe(log, r'revno: 3\n')
+        self.assertNotContainsRe(log, r'revno: 2\n')
+        self.assertNotContainsRe(log, r'revno: 3\n')
+        self.assertNotContainsRe(log, r'revno: 4\n')
+        self.assertNotContainsRe(log, r'revno: 5\n')
+        self.assertNotContainsRe(log, r'revno: 6\n')
+        self.assertNotContainsRe(log, r'revno: 7\n')
+        self.assertNotContainsRe(log, r'revno: 8\n')
+        self.assertContainsRe(log, r'revno: 9\n')
+        self.assertContainsRe(log, r'revno: 10\n')
 
     def test_log_limit_short(self):
         self._prepare()