From da4abb78cb3033ecb0ea00e965c137f2e97ba7d2 Mon Sep 17 00:00:00 2001
From: Nico von Geyso <Nico.Geyso@FU-Berlin.de>
Date: Mon, 4 Mar 2013 18:37:45 +0100
Subject: [PATCH] added test data for diff.find_similiar
---
.../10/2374bdb1e8efca5e66cded18fd8f30571654a5 | Bin 0 -> 209 bytes
.../11/19926b06311143cab273f0af84eae77f5b3462 | Bin 0 -> 136 bytes
.../19/bf31524643d743751b09cf719456914bbd8bd5 | Bin 0 -> 136 bytes
.../55/60f04f38a674decf34d16d7c7476642fa03794 | Bin 0 -> 129 bytes
.../78/4855caf26449a1914d2cf62d12b9374d76ae78 | Bin 0 -> 176 bytes
.../f5/e5aa4e36ab0fe62ee1ccc6eb8f79b866863b87 | Bin 0 -> 172 bytes
test/data/testrepo.git/refs/heads/master | 2 +-
test/test_diff.py | 13 ++++++++-----
test/test_remote.py | 4 ++--
test/test_repository.py | 4 ++--
10 files changed, 13 insertions(+), 10 deletions(-)
create mode 100644 test/data/testrepo.git/objects/10/2374bdb1e8efca5e66cded18fd8f30571654a5
create mode 100644 test/data/testrepo.git/objects/11/19926b06311143cab273f0af84eae77f5b3462
create mode 100644 test/data/testrepo.git/objects/19/bf31524643d743751b09cf719456914bbd8bd5
create mode 100644 test/data/testrepo.git/objects/55/60f04f38a674decf34d16d7c7476642fa03794
create mode 100644 test/data/testrepo.git/objects/78/4855caf26449a1914d2cf62d12b9374d76ae78
create mode 100644 test/data/testrepo.git/objects/f5/e5aa4e36ab0fe62ee1ccc6eb8f79b866863b87
diff --git a/test/data/testrepo.git/objects/10/2374bdb1e8efca5e66cded18fd8f30571654a5 b/test/data/testrepo.git/objects/10/2374bdb1e8efca5e66cded18fd8f30571654a5
new file mode 100644
index 0000000000000000000000000000000000000000..4cb6eb7dde59cc87984dbcd34132839d06296f3f
GIT binary patch
literal 209
zcmV;?051P{0qs&dP6ROwrREgx0HZ08C@AUaIDwN`Bkv~hkk}*b?eT!bR&W9eH-2AP
zPE`}0U!ES`bZ~?0(;JFb9hhRE#<n19pKNR%ODe(1(l>Aw8w(~E6rqN$-P;W;qiKP0
z+rvcqA;r7F4V6-afbBbg(P--gs`BBtFyKKE_TzVG_1&CSyc!N33f6h5DQBN2-*EA1
zisCV6Xa2&OFgSTz@gAj-qbK1?vtaYYV;kI;Xd6icqpLIud{WQmp`V7|Z?XP?{om>S
LGwb6g(ihq?OFd`O
literal 0
HcmV?d00001
diff --git a/test/data/testrepo.git/objects/11/19926b06311143cab273f0af84eae77f5b3462 b/test/data/testrepo.git/objects/11/19926b06311143cab273f0af84eae77f5b3462
new file mode 100644
index 0000000000000000000000000000000000000000..8ac529e9ac5413e8aa6e578eb38d6061a627552f
GIT binary patch
literal 136
zcmV;30C)d*0V^p=O;s>7HD)k0FfcPQQAlJc?_iw&`pFlj$Ynl3vu3>wlS{d~7bdBf
zoL^9hPel^L^lPFI_o&-Aob)Qn5P81S{&tkKnTY`qC?qo^`rlm4>HSUO)#U#F2l#5G
qLVnD;05v)%zbG}AK|r}=@5UGJPsOF3eJk;|-ymEpWGMjU?LoUvmqAAW
literal 0
HcmV?d00001
diff --git a/test/data/testrepo.git/objects/19/bf31524643d743751b09cf719456914bbd8bd5 b/test/data/testrepo.git/objects/19/bf31524643d743751b09cf719456914bbd8bd5
new file mode 100644
index 0000000000000000000000000000000000000000..af11713b32bf8b0e22f687aa1a74440110a4c8a3
GIT binary patch
literal 136
zcmV;30C)d*0V^p=O;s>7HD)k0FfcPQQAlJc?_iw&`pFlj$Ynl3vu3>wlS{d~7bdBf
zoL^9hPel^L^lPFI_o&-Aob)Qn5P81S{&tkKnTY`qC?qo^`rlm4>HSUO)#U#F2l#5G
qLVnD;05v+Zptv-bK|r}=@5UGJPsOF3eJk;|-ymEpWGMjWKtalDDM6<I
literal 0
HcmV?d00001
diff --git a/test/data/testrepo.git/objects/55/60f04f38a674decf34d16d7c7476642fa03794 b/test/data/testrepo.git/objects/55/60f04f38a674decf34d16d7c7476642fa03794
new file mode 100644
index 0000000000000000000000000000000000000000..16bf7382001ad49e8010a4dc5224ea2fb3ed2af3
GIT binary patch
literal 129
zcmV-{0Dk{?0V^p=O;s>7v}7<eFfcPQQAlLSQs-&h)39~w#0QriufBf4B;df|sZhxz
zhUwQtAMR1NaX9H!lp*qbr~U0HX)_Z8AW%qVNc6wCnA7{4#H-2u{}1rhN`?HGbpfg|
jv!J*%mq9?eWbeio?@z_0oqa3ux8ERKEMzGFmFG0Wz9~UD
literal 0
HcmV?d00001
diff --git a/test/data/testrepo.git/objects/78/4855caf26449a1914d2cf62d12b9374d76ae78 b/test/data/testrepo.git/objects/78/4855caf26449a1914d2cf62d12b9374d76ae78
new file mode 100644
index 0000000000000000000000000000000000000000..69cb9de4a5d3ec1fbe8166da94c65a5e1f918da3
GIT binary patch
literal 176
zcmV;h08jsT0i}*RYC|y)08{G}+lLsfJ}U`A2r1$&T@Ij?R^);8WMtWp+Xwp!>1LW?
z%IJMtU|f1yQv@(^v*?W@XKQdacx0VQ3z(dzgpRpJu3nw<lzl<-;&XOlDYI@uMg&VK
zBph2v9El=XjzQ(?`WX|xwld&0b~wuKWx(s*4-bC-{C@e6dD`|vl{Y|3#$mL^z_UiJ
eRe78)`A<Xjagz$CF{Q&Au$?d0uKoaUrcPB;?^AUE
literal 0
HcmV?d00001
diff --git a/test/data/testrepo.git/objects/f5/e5aa4e36ab0fe62ee1ccc6eb8f79b866863b87 b/test/data/testrepo.git/objects/f5/e5aa4e36ab0fe62ee1ccc6eb8f79b866863b87
new file mode 100644
index 0000000000000000000000000000000000000000..5f611748fef446ba53ea44e29cea8c30aa0e5d2c
GIT binary patch
literal 172
zcmV;d08{^X0i}+;PQ)+}2C4lN+apf9YsYaUgb>ADM|Th4*q=qDBu2&{@%H!g3fIjv
zqe*q!mQL!1r``Y(k!eytv$t1tHpN*-TR4{B5HXHrn62|_zGK7Qi3bm_9)rwMk^m|}
z12gP2A%`4X3WbB3_}jl~qt7K(`l~yg@c&ck_2!2=zaP&pA86~cA2QxZtXC)DdO^=D
a%qHDWJ05A6m@_i1wPB;OtS}dDrb~bhy;CCq
literal 0
HcmV?d00001
diff --git a/test/data/testrepo.git/refs/heads/master b/test/data/testrepo.git/refs/heads/master
index b8e9848..436950f 100644
--- a/test/data/testrepo.git/refs/heads/master
+++ b/test/data/testrepo.git/refs/heads/master
@@ -1 +1 @@
-056e626e51b1fc1ee2182800e399ed8d84c8f082
+784855caf26449a1914d2cf62d12b9374d76ae78
diff --git a/test/test_diff.py b/test/test_diff.py
index 9b3b3d2..e67f321 100644
--- a/test/test_diff.py
+++ b/test/test_diff.py
@@ -41,6 +41,9 @@ COMMIT_SHA1_2 = 'c2792cfa289ae6321ecf2cd5806c2194b0fd070c'
COMMIT_SHA1_3 = '2cdae28389c059815e951d0bb9eed6533f61a46b'
COMMIT_SHA1_4 = 'ccca47fbb26183e71a7a46d165299b84e2e6c0b3'
COMMIT_SHA1_5 = '056e626e51b1fc1ee2182800e399ed8d84c8f082'
+COMMIT_SHA1_6 = 'f5e5aa4e36ab0fe62ee1ccc6eb8f79b866863b87'
+COMMIT_SHA1_7 = '784855caf26449a1914d2cf62d12b9374d76ae78'
+
PATCH = """diff --git a/a b/a
index 7f129fd..af431f2 100644
@@ -210,15 +213,15 @@ class DiffTest(utils.BareRepoTestCase):
'af431f20fc541ed6d5afede3e2dc7160f6f01f16')
def test_find_similar(self):
- commit_a = self.repo[COMMIT_SHA1_4]
- commit_b = self.repo[COMMIT_SHA1_5]
+ commit_a = self.repo[COMMIT_SHA1_6]
+ commit_b = self.repo[COMMIT_SHA1_7]
#~ Must pass GIT_DIFF_INCLUDE_UNMODIFIED if you expect to emulate
#~ --find-copies-harder during rename transformion...
diff = commit_a.tree.diff(commit_b.tree, GIT_DIFF_INCLUDE_UNMODIFIED)
- self.assertFalse(('a', 'a.copy', 5, 100) in diff[0].files)
- diff.find_similar(pygit2.GIT_DIFF_FIND_COPIES_FROM_UNMODIFIED)
- self.assertAny(lambda x:('a', 'a.copy', 5, 100) in x.files, diff)
+ self.assertFalse(('lorem', 'ipsum', 4, 100) in diff[0].files)
+ diff.find_similar()
+ self.assertAny(lambda x: ('lorem', 'ipsum', 4, 100) in x.files, diff)
if __name__ == '__main__':
unittest.main()
diff --git a/test/test_remote.py b/test/test_remote.py
index aacdc10..9b2c8c8 100644
--- a/test/test_remote.py
+++ b/test/test_remote.py
@@ -35,8 +35,8 @@ REMOTE_NAME = 'origin'
REMOTE_URL = 'git://github.com/libgit2/pygit2.git'
REMOTE_FETCHSPEC_SRC = 'refs/heads/*'
REMOTE_FETCHSPEC_DST = 'refs/remotes/origin/*'
-REMOTE_REPO_OBJECTS = 19
-REMOTE_REPO_BYTES = 1586
+REMOTE_REPO_OBJECTS = 24
+REMOTE_REPO_BYTES = 2253
class RepositoryTest(utils.RepoTestCase):
def test_remote_create(self):
diff --git a/test/test_repository.py b/test/test_repository.py
index 105d1c5..c3457c4 100644
--- a/test/test_repository.py
+++ b/test/test_repository.py
@@ -42,8 +42,8 @@ import pygit2
from . import utils
-HEAD_SHA = '056e626e51b1fc1ee2182800e399ed8d84c8f082'
-PARENT_SHA = 'ccca47fbb26183e71a7a46d165299b84e2e6c0b3' # HEAD^
+HEAD_SHA = '784855caf26449a1914d2cf62d12b9374d76ae78'
+PARENT_SHA = 'f5e5aa4e36ab0fe62ee1ccc6eb8f79b866863b87' # HEAD^
A_HEX_SHA = 'af431f20fc541ed6d5afede3e2dc7160f6f01f16'
A_BIN_SHA = binascii.unhexlify(A_HEX_SHA.encode('ascii'))