dulwich-users team mailing list archive

[dborowitz@xxxxxxxxxx]

From: Dave Borowitz <dborowitz@xxxxxxxxxx>

Change-Id: Ice14da3a020d62d1f9d959de7d0e1e795bd5c376
---
 dulwich/tests/test_walk.py |   13 +++++++++++++
 dulwich/walk.py            |    8 +++++++-
 2 files changed, 20 insertions(+), 1 deletions(-)

diff --git a/dulwich/tests/test_walk.py b/dulwich/tests/test_walk.py
index 938ef8a..476ab2a 100644
--- a/dulwich/tests/test_walk.py
+++ b/dulwich/tests/test_walk.py
@@ -75,3 +75,16 @@ class WalkerTest(TestCase):
     def test_reverse(self):
         c1, c2, c3 = self.make_linear_commits(3)
         self.assertWalkYields([c1, c2, c3], [c3.id], reverse=True)
+
+    def test_max_commits(self):
+        c1, c2, c3 = self.make_linear_commits(3)
+        self.assertWalkYields([c3, c2, c1], [c3.id], max_commits=3)
+        self.assertWalkYields([c3, c2], [c3.id], max_commits=2)
+        self.assertWalkYields([c3], [c3.id], max_commits=1)
+
+    def test_reverse_after_max_commits(self):
+        c1, c2, c3 = self.make_linear_commits(3)
+        self.assertWalkYields([c1, c2, c3], [c3.id], max_commits=3,
+                              reverse=True)
+        self.assertWalkYields([c2, c3], [c3.id], max_commits=2, reverse=True)
+        self.assertWalkYields([c3], [c3.id], max_commits=1, reverse=True)
diff --git a/dulwich/walk.py b/dulwich/walk.py
index ac14877..ce123d1 100644
--- a/dulwich/walk.py
+++ b/dulwich/walk.py
@@ -32,7 +32,7 @@ class Walker(object):
     """
 
     def __init__(self, store, include, exclude=None, order=ORDER_DATE,
-                 reverse=False):
+                 reverse=False, max_commits=None):
         """Constructor.
 
         :param store: ObjectStore instance for looking up objects.
@@ -44,6 +44,8 @@ class Walker(object):
             other than ORDER_DATE may result in O(n) memory usage.
         :param reverse: If True, reverse the order of output, requiring O(n)
             memory.
+        :param max_commits: The maximum number of commits to yield, or None for
+            no limit.
         """
         self._store = store
 
@@ -51,6 +53,7 @@ class Walker(object):
             raise ValueError('Unknown walk order %s' % order)
         self._order = order
         self._reverse = reverse
+        self._max_commits = max_commits
 
         exclude = exclude or []
         self._excluded = set(exclude)
@@ -88,6 +91,9 @@ class Walker(object):
         return None
 
     def _next(self):
+        limit = self._max_commits
+        if limit is not None and len(self._done) >= limit:
+            return None
         return self._pop()
 
     def __iter__(self):
-- 
1.7.3.1