Merge pull request #266 from jeblair/master

Byron · Byron · commit 88f3dc2eb94e · 2015-03-02T18:33:59.000+01:00
Store path attribute on Diff object
diff --git a/git/diff.py b/git/diff.py
@@ -168,11 +168,13 @@ class Diff(object):
 
         a_mode is None
         a_blob is None
+        a_path is None
 
     ``Deleted File``::
 
         b_mode is None
         b_blob is None
+        b_path is None
 
     ``Working Tree Blobs``
 
@@ -200,8 +202,8 @@ class Diff(object):
     NULL_HEX_SHA = "0" * 40
     NULL_BIN_SHA = b"\0" * 20
 
-    __slots__ = ("a_blob", "b_blob", "a_mode", "b_mode", "new_file", "deleted_file",
-                 "rename_from", "rename_to", "diff")
+    __slots__ = ("a_blob", "b_blob", "a_mode", "b_mode", "a_path", "b_path",
+                 "new_file", "deleted_file", "rename_from", "rename_to", "diff")
 
     def __init__(self, repo, a_path, b_path, a_blob_id, b_blob_id, a_mode,
                  b_mode, new_file, deleted_file, rename_from,
@@ -210,6 +212,9 @@ def __init__(self, repo, a_path, b_path, a_blob_id, b_blob_id, a_mode,
         self.a_mode = a_mode
         self.b_mode = b_mode
 
+        self.a_path = a_path
+        self.b_path = b_path
+
         if self.a_mode:
             self.a_mode = mode_str_to_int(self.a_mode)
         if self.b_mode:
