added ignore_Whitespace flag into diff options

vcs/backends/git.py

@@ -101,10 +101,14 @@ def run_git_command(self, cmd):
                 "stderr:\n%s" % (cmd, se))
         return so, se
 
-    def _get_diff(self, rev1, rev2, path=None):
+    def _get_diff(self, rev1, rev2, path=None, ignore_whitespace=False):
         rev1 = self._get_revision(rev1)
         rev2 = self._get_revision(rev2)
-        cmd = 'diff %s %s' % (rev1, rev2)
+
+        if ignore_whitespace:
+            cmd = 'diff -w %s %s' % (rev1, rev2)
+        else:
+            cmd = 'diff %s %s' % (rev1, rev2)
         if path:
             cmd += ' -- "%s"' % path
         so, se = self.run_git_command(cmd)

vcs/backends/hg.py

@@ -254,10 +254,11 @@ def _get_all_revisions(self):
 
         return map(lambda x: hex(x[7]), self._repo.changelog.index)[:-1]
 
-    def _get_diff(self, rev1, rev2, path=None):
+    def _get_diff(self, rev1, rev2, path=None, ignore_whitespace=False):
         file_filter = match(self.path, '', [path])
         return patch.diff(self._repo, rev1, rev2, match=file_filter,
-                          opts=diffopts(git=True))
+                          opts=diffopts(git=True,
+                                        ignorews=ignore_whitespace))
 
     def _check_url(self, url):
         """

vcs/utils/diffs.py

@@ -15,7 +15,7 @@
 from vcs.nodes import FileNode, NodeError
 
 
-def get_udiff(filenode_old, filenode_new):
+def get_udiff(filenode_old, filenode_new,show_whitespace=True):
     """
     Returns unified diff between given ``filenode_old`` and ``filenode_new``.
     """
@@ -48,9 +48,11 @@ def get_udiff(filenode_old, filenode_new):
     return vcs_udiff
 
 
-def get_gitdiff(filenode_old, filenode_new):
+def get_gitdiff(filenode_old, filenode_new, ignore_whitespace=True):
     """
     Returns git style diff between given ``filenode_old`` and ``filenode_new``.
+    
+    :param ignore_whitespace: ignore whitespaces in diff
     """
 
     for filenode in (filenode_old, filenode_new):
@@ -62,7 +64,8 @@ def get_gitdiff(filenode_old, filenode_new):
     new_raw_id = getattr(filenode_new.changeset, 'raw_id', '0' * 40)
 
     repo = filenode_new.changeset.repository
-    vcs_gitdiff = repo._get_diff(old_raw_id, new_raw_id, filenode_new.path)
+    vcs_gitdiff = repo._get_diff(old_raw_id, new_raw_id, filenode_new.path,
+                                 ignore_whitespace)
 
     return vcs_gitdiff