summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2015-03-02 18:33:59 +0100
committerSebastian Thiel <byronimo@gmail.com>2015-03-02 18:33:59 +0100
commit88f3dc2eb94e9e5ff8567be837baf0b90b354f35 (patch)
tree5cdafbe221621ae6def1db5f90ca853d9b452bf0
parenta5e607e8aa62ca3778f1026c27a927ee5c79749b (diff)
parent50f763cfe38a1d69a3a04e41a36741545885f1d8 (diff)
downloadgitpython-88f3dc2eb94e9e5ff8567be837baf0b90b354f35.tar.gz
Merge pull request #266 from jeblair/master
Store path attribute on Diff object
-rw-r--r--git/diff.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/git/diff.py b/git/diff.py
index 37882369..dc53f3f7 100644
--- 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 @@ class Diff(object):
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: