GitRepository/diff: add 'paths' argument

Makes the diff function more versatile. I.e. makes diffing only certain
paths possible. Also, add basic unittests for the diff() method.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>

2 files changed, 22 insertions, 1 deletions

diff --git a/gbp/git/repository.py b/gbp/git/repository.py
index 100b6b2..dfe5cb2 100644
--- a/gbp/git/repository.py
+++ b/gbp/git/repository.py
@@ -1352,7 +1352,7 @@ class GitRepository(object):
         args.append(patch)
         self._git_command("apply", args)
 
-    def diff(self, obj1, obj2):
+    def diff(self, obj1, obj2, paths=None):
         """
         Diff two git repository objects
 
@@ -1360,10 +1360,14 @@ class GitRepository(object):
         @type obj1: C{str}
         @param obj2: second object
         @type obj2: C{str}
+        @param paths: List of paths to diff
+        @type paths: C{list}
         @return: diff
         @rtype: C{str}
         """
         options = GitArgs(obj1, obj2)
+        if paths:
+            options.add('--', paths)
         output, ret = self._git_getoutput('diff', options.args)
         return output
 #}
diff --git a/tests/test_GitRepository.py b/tests/test_GitRepository.py
index 1b3f5b8..5b9fc92 100644
--- a/tests/test_GitRepository.py
+++ b/tests/test_GitRepository.py
@@ -410,6 +410,23 @@ def test_get_commit_info():
     defaultdict(<type 'list'>, {'M': ['testfile']})
     """
 
+def test_diff():
+    """
+    Test git-diff
+
+    Methods tested:
+         - L{gbp.git.GitRepository.diff}
+
+    >>> import gbp.git
+    >>> repo = gbp.git.GitRepository(repo_dir)
+    >>> len(repo.diff('HEAD~1', 'HEAD')) > 3
+    True
+    >>> len(repo.diff('HEAD~1', 'HEAD', 'testfile')) > 3
+    True
+    >>> len(repo.diff('HEAD~1', 'HEAD', 'filenotexist')) == 0
+    True
+    """
+
 def test_mirror_clone():
     """
     Mirror a repository