openstack/deb-python-pygit2
Code Issues Proposed changes

Refactored: get rid of type check for treeish_to_tree in Diff

Browse Source
This commit is contained in:
Nico von Geyso
2013-05-20 14:58:54 +02:00
parent 6ce71a2799
commit 77b5cdce5b
3 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pygit2/repository.py
View File

@@ -30,7 +30,6 @@ from string import hexdigits
from collections import OrderedDict from collections import OrderedDict
# Import from pygit2 # Import from pygit2
from utils import text_type
from _pygit2 import Repository as _Repository from _pygit2 import Repository as _Repository
from _pygit2 import Oid, GIT_OID_HEXSZ, GIT_OID_MINPREFIXLEN from _pygit2 import Oid, GIT_OID_HEXSZ, GIT_OID_MINPREFIXLEN
from _pygit2 import GIT_CHECKOUT_SAFE_CREATE from _pygit2 import GIT_CHECKOUT_SAFE_CREATE
@@ -180,8 +179,10 @@ class Repository(_Repository):
""" """
def treeish_to_tree(obj): def treeish_to_tree(obj):
if isinstance(obj, text_type): try:
obj = self.revparse_single(obj) obj = self.revparse_single(obj)
except:
pass
if isinstance(obj, Commit): if isinstance(obj, Commit):
return obj.tree return obj.tree

10
pygit2/utils.py
View File

@@ -27,13 +27,3 @@
# feel free to add utils functions here # feel free to add utils functions here
import sys
# python2/3 compability types for isinstance()
if sys.version < '3':
text_type = unicode
binary_type = str
else:
text_type = str
binary_type = bytes

8
test/test_diff.py
View File

@@ -196,13 +196,17 @@ class DiffTest(utils.BareRepoTestCase):
self.assertAll(lambda x: commit_a.tree[x], entries) self.assertAll(lambda x: commit_a.tree[x], entries)
self.assertAll(lambda x: '+' == x, get_context_for_lines(diff_swaped)) self.assertAll(lambda x: '+' == x, get_context_for_lines(diff_swaped))
def test_diff_revparse(self):
diff = self.repo.diff('HEAD','HEAD~6')
self.assertEqual(type(diff), pygit2.Diff)
def test_diff_tree_opts(self): def test_diff_tree_opts(self):
commit_c = self.repo[COMMIT_SHA1_3] commit_c = self.repo[COMMIT_SHA1_3]
commit_d = self.repo[COMMIT_SHA1_4] commit_d = self.repo[COMMIT_SHA1_4]
for opt in [pygit2.GIT_DIFF_IGNORE_WHITESPACE, for flag in [pygit2.GIT_DIFF_IGNORE_WHITESPACE,
pygit2.GIT_DIFF_IGNORE_WHITESPACE_EOL]: pygit2.GIT_DIFF_IGNORE_WHITESPACE_EOL]:
diff = commit_c.tree.diff_to_tree(commit_d.tree, opt) diff = commit_c.tree.diff_to_tree(commit_d.tree, flag)
self.assertTrue(diff is not None) self.assertTrue(diff is not None)
self.assertEqual(0, len(diff[0].hunks)) self.assertEqual(0, len(diff[0].hunks))