summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2016-05-19 12:41:16 +0200
committerSebastian Thiel <byronimo@gmail.com>2016-05-19 12:43:19 +0200
commit4bcc4d55baef64825b4163c6fb8526a2744b4a86 (patch)
tree7e1a7f0411d3bf6572c597874b2c358eec09f0d4
parentfb577c8a1eca8958415b76cde54d454618ac431e (diff)
downloadgitpython-4bcc4d55baef64825b4163c6fb8526a2744b4a86.tar.gz
Deprecate Diffable.rename for .renamed_file
Fixes #426
-rw-r--r--git/diff.py11
-rw-r--r--git/test/test_diff.py2
2 files changed, 12 insertions, 1 deletions
diff --git a/git/diff.py b/git/diff.py
index 76426940..44a65017 100644
--- a/git/diff.py
+++ b/git/diff.py
@@ -333,7 +333,16 @@ class Diff(object):
@property
def renamed(self):
- """:returns: True if the blob of our diff has been renamed"""
+ """:returns: True if the blob of our diff has been renamed
+ :note: This property is deprecated, please use ``renamed_file`` instead.
+ """
+ return self.renamed_file
+
+ @property
+ def renamed_file(self):
+ """:returns: True if the blob of our diff has been renamed
+ :note: This property is deprecated, please use ``renamed_file`` instead.
+ """
return self.rename_from != self.rename_to
@classmethod
diff --git a/git/test/test_diff.py b/git/test/test_diff.py
index 858b3994..1d7a4fda 100644
--- a/git/test/test_diff.py
+++ b/git/test/test_diff.py
@@ -86,6 +86,7 @@ class TestDiff(TestBase):
assert_equal(1, len(diffs))
diff = diffs[0]
+ assert_true(diff.renamed_file)
assert_true(diff.renamed)
assert_equal(diff.rename_from, u'Jérôme')
assert_equal(diff.rename_to, u'müller')
@@ -95,6 +96,7 @@ class TestDiff(TestBase):
diffs = Diff._index_from_raw_format(self.rorepo, output.stdout)
assert len(diffs) == 1
diff = diffs[0]
+ assert diff.renamed_file
assert diff.renamed
assert diff.rename_from == 'this'
assert diff.rename_to == 'that'