make parameters for GitRepository.commits() optional

2 files changed, 19 insertions, 5 deletions

diff --git a/gbp/git_utils.py b/gbp/git_utils.py
index b6e4b35c..d89f778e 100644
--- a/gbp/git_utils.py
+++ b/gbp/git_utils.py
@@ -103,13 +103,26 @@ class GitRepository(object):
         else:
             return []
 
-    def commits(self, start, end, paths, options):
+    def commits(self, since=None, until=None, paths=None, options=None):
         """get commits from start to end touching pathds"""
+
+        if since or until:
+            range = ['%s..%s' % (since, until)]
+        else:
+            range = []
+
+        if paths:
+           paths = [ "--", paths ]
+        else:
+            paths = []
+
         commits, ret = self.__git_getoutput('log',
-                                            ['--pretty=format:%H'] + options +
-                                            ['%s..%s' % (start, end), '--', paths])
+                                            ['--pretty=format:%H'] +
+                                            options +
+                                            range +
+                                            paths)
         if ret:
-            raise GitRepositoryError, "Error getting commits %s..%s%s" % (start, end, ["", " on %s" % paths][len(paths) > 0] )
+            raise GitRepositoryError, "Error getting commits %s..%s%s" % (since, until,["", " on %s" % paths][len(paths) > 0] )
         return [ commit.strip() for commit in commits[::-1] ]
 
     def show(self, id):
diff --git a/git-dch b/git-dch
index 15dcae13..e8fd8a55 100755
--- a/git-dch
+++ b/git-dch
@@ -251,6 +251,7 @@ def guess_snapshot_commit(cp):
         return sr.group('commit')
 
 
+
 def main(argv):
     ret = 0
     changelog = 'debian/changelog'
@@ -335,7 +336,7 @@ def main(argv):
 
         if args:
             print "Only looking for changes on '%s'" % " ".join(args)
-        commits = repo.commits(since, until, " ".join(args), options.git_log.split(" "))
+        commits = repo.commits(since=since, until=until, paths=" ".join(args), options=options.git_log.split(" "))
 
         # add a new changelog section if:
         if cp['Distribution'] != "UNRELEASED" and not found_snapshot_header and commits: