Parcourir la source

Avoid using .git as a directory name since it confuses C git.

Jelmer Vernooij il y a 16 ans
Parent
commit
b6536eb330
52 fichiers modifiés avec 19 ajouts et 27 suppressions
  1. 0 0
      dulwich/tests/data/repos/a.git/HEAD
  2. 0 0
      dulwich/tests/data/repos/a.git/objects/2a/72d929692c41d8554c07f6301757ba18a65d91
  3. 0 0
      dulwich/tests/data/repos/a.git/objects/4e/f30bbfe26431a69c3820d3a683df54d688f2ec
  4. 0 0
      dulwich/tests/data/repos/a.git/objects/4f/2e6529203aa6d44b5af6e3292c837ceda003f9
  5. 0 0
      dulwich/tests/data/repos/a.git/objects/7d/9a07d797595ef11344549b8d08198e48c15364
  6. 0 0
      dulwich/tests/data/repos/a.git/objects/a2/96d0bb611188cabb256919f36bc30117cca005
  7. 0 0
      dulwich/tests/data/repos/a.git/objects/a9/0fa2d900a17e99b433217e988c4eb4a2e9a097
  8. 0 0
      dulwich/tests/data/repos/a.git/objects/ff/d47d45845a8f6576491e1edb97e3fe6a850e7f
  9. 0 0
      dulwich/tests/data/repos/a.git/refs/heads/master
  10. BIN
      dulwich/tests/data/repos/a/.git/index
  11. 0 1
      dulwich/tests/data/repos/a/a
  12. 0 1
      dulwich/tests/data/repos/a/b
  13. 0 1
      dulwich/tests/data/repos/a/c
  14. 0 0
      dulwich/tests/data/repos/ooo_merge.git/HEAD
  15. 0 0
      dulwich/tests/data/repos/ooo_merge.git/objects/29/69be3e8ee1c0222396a5611407e4769f14e54b
  16. 0 0
      dulwich/tests/data/repos/ooo_merge.git/objects/38/74e9c60a6d149c44c928140f250d81e6381520
  17. 0 0
      dulwich/tests/data/repos/ooo_merge.git/objects/6f/670c0fb53f9463760b7295fbb814e965fb20c8
  18. 0 0
      dulwich/tests/data/repos/ooo_merge.git/objects/70/c190eb48fa8bbb50ddc692a17b44cb781af7f6
  19. 0 0
      dulwich/tests/data/repos/ooo_merge.git/objects/76/01d7f6231db6a57f7bbb79ee52e4d462fd44d1
  20. 0 0
      dulwich/tests/data/repos/ooo_merge.git/objects/90/182552c4a85a45ec2a835cadc3451bebdfe870
  21. 0 0
      dulwich/tests/data/repos/ooo_merge.git/objects/95/4a536f7819d40e6f637f849ee187dd10066349
  22. 0 0
      dulwich/tests/data/repos/ooo_merge.git/objects/b2/a2766a2879c209ab1176e7e778b81ae422eeaa
  23. 0 0
      dulwich/tests/data/repos/ooo_merge.git/objects/f5/07291b64138b875c28e03469025b1ea20bc614
  24. 0 0
      dulwich/tests/data/repos/ooo_merge.git/objects/f9/e39b120c68182a4ba35349f832d0e4e61f485c
  25. 0 0
      dulwich/tests/data/repos/ooo_merge.git/objects/fb/5b0425c7ce46959bec94d54b9a157645e114f5
  26. 0 0
      dulwich/tests/data/repos/ooo_merge.git/refs/heads/master
  27. BIN
      dulwich/tests/data/repos/ooo_merge/.git/index
  28. 0 1
      dulwich/tests/data/repos/ooo_merge/a
  29. 0 1
      dulwich/tests/data/repos/ooo_merge/b
  30. 0 1
      dulwich/tests/data/repos/ooo_merge/c
  31. 0 0
      dulwich/tests/data/repos/simple_merge.git/HEAD
  32. 0 0
      dulwich/tests/data/repos/simple_merge.git/objects/0d/89f20333fbb1d2f3a94da77f4981373d8f4310
  33. 0 0
      dulwich/tests/data/repos/simple_merge.git/objects/1b/6318f651a534b38f9c7aedeebbd56c1e896853
  34. 0 0
      dulwich/tests/data/repos/simple_merge.git/objects/29/69be3e8ee1c0222396a5611407e4769f14e54b
  35. 0 0
      dulwich/tests/data/repos/simple_merge.git/objects/4c/ffe90e0a41ad3f5190079d7c8f036bde29cbe6
  36. 0 0
      dulwich/tests/data/repos/simple_merge.git/objects/5d/ac377bdded4c9aeb8dff595f0faeebcc8498cc
  37. 0 0
      dulwich/tests/data/repos/simple_merge.git/objects/60/dacdc733de308bb77bb76ce0fb0f9b44c9769e
  38. 0 0
      dulwich/tests/data/repos/simple_merge.git/objects/6f/670c0fb53f9463760b7295fbb814e965fb20c8
  39. 0 0
      dulwich/tests/data/repos/simple_merge.git/objects/70/c190eb48fa8bbb50ddc692a17b44cb781af7f6
  40. 0 0
      dulwich/tests/data/repos/simple_merge.git/objects/90/182552c4a85a45ec2a835cadc3451bebdfe870
  41. 0 0
      dulwich/tests/data/repos/simple_merge.git/objects/95/4a536f7819d40e6f637f849ee187dd10066349
  42. 0 0
      dulwich/tests/data/repos/simple_merge.git/objects/ab/64bbdcc51b170d21588e5c5d391ee5c0c96dfd
  43. 0 0
      dulwich/tests/data/repos/simple_merge.git/objects/d4/bdad6549dfedf25d3b89d21f506aff575b28a7
  44. 0 0
      dulwich/tests/data/repos/simple_merge.git/objects/d8/0c186a03f423a81b39df39dc87fd269736ca86
  45. 0 0
      dulwich/tests/data/repos/simple_merge.git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391
  46. 0 0
      dulwich/tests/data/repos/simple_merge.git/refs/heads/master
  47. BIN
      dulwich/tests/data/repos/simple_merge/.git/index
  48. 0 1
      dulwich/tests/data/repos/simple_merge/a
  49. 0 1
      dulwich/tests/data/repos/simple_merge/b
  50. 0 0
      dulwich/tests/data/repos/simple_merge/d
  51. 0 0
      dulwich/tests/data/repos/simple_merge/e
  52. 19 19
      dulwich/tests/test_repository.py

+ 0 - 0
dulwich/tests/data/repos/a/.git/HEAD → dulwich/tests/data/repos/a.git/HEAD


+ 0 - 0
dulwich/tests/data/repos/a/.git/objects/2a/72d929692c41d8554c07f6301757ba18a65d91 → dulwich/tests/data/repos/a.git/objects/2a/72d929692c41d8554c07f6301757ba18a65d91


+ 0 - 0
dulwich/tests/data/repos/a/.git/objects/4e/f30bbfe26431a69c3820d3a683df54d688f2ec → dulwich/tests/data/repos/a.git/objects/4e/f30bbfe26431a69c3820d3a683df54d688f2ec


+ 0 - 0
dulwich/tests/data/repos/a/.git/objects/4f/2e6529203aa6d44b5af6e3292c837ceda003f9 → dulwich/tests/data/repos/a.git/objects/4f/2e6529203aa6d44b5af6e3292c837ceda003f9


+ 0 - 0
dulwich/tests/data/repos/a/.git/objects/7d/9a07d797595ef11344549b8d08198e48c15364 → dulwich/tests/data/repos/a.git/objects/7d/9a07d797595ef11344549b8d08198e48c15364


+ 0 - 0
dulwich/tests/data/repos/a/.git/objects/a2/96d0bb611188cabb256919f36bc30117cca005 → dulwich/tests/data/repos/a.git/objects/a2/96d0bb611188cabb256919f36bc30117cca005


+ 0 - 0
dulwich/tests/data/repos/a/.git/objects/a9/0fa2d900a17e99b433217e988c4eb4a2e9a097 → dulwich/tests/data/repos/a.git/objects/a9/0fa2d900a17e99b433217e988c4eb4a2e9a097


+ 0 - 0
dulwich/tests/data/repos/a/.git/objects/ff/d47d45845a8f6576491e1edb97e3fe6a850e7f → dulwich/tests/data/repos/a.git/objects/ff/d47d45845a8f6576491e1edb97e3fe6a850e7f


+ 0 - 0
dulwich/tests/data/repos/a/.git/refs/heads/master → dulwich/tests/data/repos/a.git/refs/heads/master


BIN
dulwich/tests/data/repos/a/.git/index


+ 0 - 1
dulwich/tests/data/repos/a/a

@@ -1 +0,0 @@
-file a

+ 0 - 1
dulwich/tests/data/repos/a/b

@@ -1 +0,0 @@
-file b

+ 0 - 1
dulwich/tests/data/repos/a/c

@@ -1 +0,0 @@
-file c

+ 0 - 0
dulwich/tests/data/repos/ooo_merge/.git/HEAD → dulwich/tests/data/repos/ooo_merge.git/HEAD


+ 0 - 0
dulwich/tests/data/repos/ooo_merge/.git/objects/29/69be3e8ee1c0222396a5611407e4769f14e54b → dulwich/tests/data/repos/ooo_merge.git/objects/29/69be3e8ee1c0222396a5611407e4769f14e54b


+ 0 - 0
dulwich/tests/data/repos/ooo_merge/.git/objects/38/74e9c60a6d149c44c928140f250d81e6381520 → dulwich/tests/data/repos/ooo_merge.git/objects/38/74e9c60a6d149c44c928140f250d81e6381520


+ 0 - 0
dulwich/tests/data/repos/ooo_merge/.git/objects/6f/670c0fb53f9463760b7295fbb814e965fb20c8 → dulwich/tests/data/repos/ooo_merge.git/objects/6f/670c0fb53f9463760b7295fbb814e965fb20c8


+ 0 - 0
dulwich/tests/data/repos/ooo_merge/.git/objects/70/c190eb48fa8bbb50ddc692a17b44cb781af7f6 → dulwich/tests/data/repos/ooo_merge.git/objects/70/c190eb48fa8bbb50ddc692a17b44cb781af7f6


+ 0 - 0
dulwich/tests/data/repos/ooo_merge/.git/objects/76/01d7f6231db6a57f7bbb79ee52e4d462fd44d1 → dulwich/tests/data/repos/ooo_merge.git/objects/76/01d7f6231db6a57f7bbb79ee52e4d462fd44d1


+ 0 - 0
dulwich/tests/data/repos/ooo_merge/.git/objects/90/182552c4a85a45ec2a835cadc3451bebdfe870 → dulwich/tests/data/repos/ooo_merge.git/objects/90/182552c4a85a45ec2a835cadc3451bebdfe870


+ 0 - 0
dulwich/tests/data/repos/ooo_merge/.git/objects/95/4a536f7819d40e6f637f849ee187dd10066349 → dulwich/tests/data/repos/ooo_merge.git/objects/95/4a536f7819d40e6f637f849ee187dd10066349


+ 0 - 0
dulwich/tests/data/repos/ooo_merge/.git/objects/b2/a2766a2879c209ab1176e7e778b81ae422eeaa → dulwich/tests/data/repos/ooo_merge.git/objects/b2/a2766a2879c209ab1176e7e778b81ae422eeaa


+ 0 - 0
dulwich/tests/data/repos/ooo_merge/.git/objects/f5/07291b64138b875c28e03469025b1ea20bc614 → dulwich/tests/data/repos/ooo_merge.git/objects/f5/07291b64138b875c28e03469025b1ea20bc614


+ 0 - 0
dulwich/tests/data/repos/ooo_merge/.git/objects/f9/e39b120c68182a4ba35349f832d0e4e61f485c → dulwich/tests/data/repos/ooo_merge.git/objects/f9/e39b120c68182a4ba35349f832d0e4e61f485c


+ 0 - 0
dulwich/tests/data/repos/ooo_merge/.git/objects/fb/5b0425c7ce46959bec94d54b9a157645e114f5 → dulwich/tests/data/repos/ooo_merge.git/objects/fb/5b0425c7ce46959bec94d54b9a157645e114f5


+ 0 - 0
dulwich/tests/data/repos/ooo_merge/.git/refs/heads/master → dulwich/tests/data/repos/ooo_merge.git/refs/heads/master


BIN
dulwich/tests/data/repos/ooo_merge/.git/index


+ 0 - 1
dulwich/tests/data/repos/ooo_merge/a

@@ -1 +0,0 @@
-test 1

+ 0 - 1
dulwich/tests/data/repos/ooo_merge/b

@@ -1 +0,0 @@
-test 2

+ 0 - 1
dulwich/tests/data/repos/ooo_merge/c

@@ -1 +0,0 @@
-test 3

+ 0 - 0
dulwich/tests/data/repos/simple_merge/.git/HEAD → dulwich/tests/data/repos/simple_merge.git/HEAD


+ 0 - 0
dulwich/tests/data/repos/simple_merge/.git/objects/0d/89f20333fbb1d2f3a94da77f4981373d8f4310 → dulwich/tests/data/repos/simple_merge.git/objects/0d/89f20333fbb1d2f3a94da77f4981373d8f4310


+ 0 - 0
dulwich/tests/data/repos/simple_merge/.git/objects/1b/6318f651a534b38f9c7aedeebbd56c1e896853 → dulwich/tests/data/repos/simple_merge.git/objects/1b/6318f651a534b38f9c7aedeebbd56c1e896853


+ 0 - 0
dulwich/tests/data/repos/simple_merge/.git/objects/29/69be3e8ee1c0222396a5611407e4769f14e54b → dulwich/tests/data/repos/simple_merge.git/objects/29/69be3e8ee1c0222396a5611407e4769f14e54b


+ 0 - 0
dulwich/tests/data/repos/simple_merge/.git/objects/4c/ffe90e0a41ad3f5190079d7c8f036bde29cbe6 → dulwich/tests/data/repos/simple_merge.git/objects/4c/ffe90e0a41ad3f5190079d7c8f036bde29cbe6


+ 0 - 0
dulwich/tests/data/repos/simple_merge/.git/objects/5d/ac377bdded4c9aeb8dff595f0faeebcc8498cc → dulwich/tests/data/repos/simple_merge.git/objects/5d/ac377bdded4c9aeb8dff595f0faeebcc8498cc


+ 0 - 0
dulwich/tests/data/repos/simple_merge/.git/objects/60/dacdc733de308bb77bb76ce0fb0f9b44c9769e → dulwich/tests/data/repos/simple_merge.git/objects/60/dacdc733de308bb77bb76ce0fb0f9b44c9769e


+ 0 - 0
dulwich/tests/data/repos/simple_merge/.git/objects/6f/670c0fb53f9463760b7295fbb814e965fb20c8 → dulwich/tests/data/repos/simple_merge.git/objects/6f/670c0fb53f9463760b7295fbb814e965fb20c8


+ 0 - 0
dulwich/tests/data/repos/simple_merge/.git/objects/70/c190eb48fa8bbb50ddc692a17b44cb781af7f6 → dulwich/tests/data/repos/simple_merge.git/objects/70/c190eb48fa8bbb50ddc692a17b44cb781af7f6


+ 0 - 0
dulwich/tests/data/repos/simple_merge/.git/objects/90/182552c4a85a45ec2a835cadc3451bebdfe870 → dulwich/tests/data/repos/simple_merge.git/objects/90/182552c4a85a45ec2a835cadc3451bebdfe870


+ 0 - 0
dulwich/tests/data/repos/simple_merge/.git/objects/95/4a536f7819d40e6f637f849ee187dd10066349 → dulwich/tests/data/repos/simple_merge.git/objects/95/4a536f7819d40e6f637f849ee187dd10066349


+ 0 - 0
dulwich/tests/data/repos/simple_merge/.git/objects/ab/64bbdcc51b170d21588e5c5d391ee5c0c96dfd → dulwich/tests/data/repos/simple_merge.git/objects/ab/64bbdcc51b170d21588e5c5d391ee5c0c96dfd


+ 0 - 0
dulwich/tests/data/repos/simple_merge/.git/objects/d4/bdad6549dfedf25d3b89d21f506aff575b28a7 → dulwich/tests/data/repos/simple_merge.git/objects/d4/bdad6549dfedf25d3b89d21f506aff575b28a7


+ 0 - 0
dulwich/tests/data/repos/simple_merge/.git/objects/d8/0c186a03f423a81b39df39dc87fd269736ca86 → dulwich/tests/data/repos/simple_merge.git/objects/d8/0c186a03f423a81b39df39dc87fd269736ca86


+ 0 - 0
dulwich/tests/data/repos/simple_merge/.git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 → dulwich/tests/data/repos/simple_merge.git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391


+ 0 - 0
dulwich/tests/data/repos/simple_merge/.git/refs/heads/master → dulwich/tests/data/repos/simple_merge.git/refs/heads/master


BIN
dulwich/tests/data/repos/simple_merge/.git/index


+ 0 - 1
dulwich/tests/data/repos/simple_merge/a

@@ -1 +0,0 @@
-test 1

+ 0 - 1
dulwich/tests/data/repos/simple_merge/b

@@ -1 +0,0 @@
-test 2

+ 0 - 0
dulwich/tests/data/repos/simple_merge/d


+ 0 - 0
dulwich/tests/data/repos/simple_merge/e


+ 19 - 19
dulwich/tests/test_repository.py

@@ -33,62 +33,62 @@ class RepositoryTests(unittest.TestCase):
   
     def open_repo(self, name):
         return Repo(os.path.join(os.path.dirname(__file__),
-                          'data', 'repos', name, '.git'))
+                          'data', 'repos', name))
   
     def test_simple_props(self):
-        r = self.open_repo('a')
+        r = self.open_repo('a.git')
         basedir = os.path.join(os.path.dirname(__file__), 
-                os.path.join('data', 'repos', 'a', '.git'))
+                os.path.join('data', 'repos', 'a.git'))
         self.assertEqual(r.controldir(), basedir)
   
     def test_ref(self):
-        r = self.open_repo('a')
+        r = self.open_repo('a.git')
         self.assertEqual(r.ref('refs/heads/master'),
                          'a90fa2d900a17e99b433217e988c4eb4a2e9a097')
   
     def test_get_refs(self):
-        r = self.open_repo('a')
+        r = self.open_repo('a.git')
         self.assertEquals({
             'HEAD': 'a90fa2d900a17e99b433217e988c4eb4a2e9a097', 
             'refs/heads/master': 'a90fa2d900a17e99b433217e988c4eb4a2e9a097'
             }, r.get_refs())
   
     def test_head(self):
-        r = self.open_repo('a')
+        r = self.open_repo('a.git')
         self.assertEqual(r.head(), 'a90fa2d900a17e99b433217e988c4eb4a2e9a097')
   
     def test_get_object(self):
-        r = self.open_repo('a')
+        r = self.open_repo('a.git')
         obj = r.get_object(r.head())
         self.assertEqual(obj._type, 'commit')
   
     def test_get_object_non_existant(self):
-        r = self.open_repo('a')
+        r = self.open_repo('a.git')
         self.assertRaises(KeyError, r.get_object, missing_sha)
   
     def test_commit(self):
-        r = self.open_repo('a')
+        r = self.open_repo('a.git')
         obj = r.commit(r.head())
         self.assertEqual(obj._type, 'commit')
   
     def test_commit_not_commit(self):
-        r = self.open_repo('a')
+        r = self.open_repo('a.git')
         self.assertRaises(errors.NotCommitError,
                           r.commit, '4f2e6529203aa6d44b5af6e3292c837ceda003f9')
   
     def test_tree(self):
-        r = self.open_repo('a')
+        r = self.open_repo('a.git')
         commit = r.commit(r.head())
         tree = r.tree(commit.tree)
         self.assertEqual(tree._type, 'tree')
         self.assertEqual(tree.sha().hexdigest(), commit.tree)
   
     def test_tree_not_tree(self):
-        r = self.open_repo('a')
+        r = self.open_repo('a.git')
         self.assertRaises(errors.NotTreeError, r.tree, r.head())
   
     def test_get_blob(self):
-        r = self.open_repo('a')
+        r = self.open_repo('a.git')
         commit = r.commit(r.head())
         tree = r.tree(commit.tree())
         blob_sha = tree.entries()[0][2]
@@ -97,18 +97,18 @@ class RepositoryTests(unittest.TestCase):
         self.assertEqual(blob.sha().hexdigest(), blob_sha)
   
     def test_get_blob(self):
-        r = self.open_repo('a')
+        r = self.open_repo('a.git')
         self.assertRaises(errors.NotBlobError, r.get_blob, r.head())
     
     def test_linear_history(self):
-        r = self.open_repo('a')
+        r = self.open_repo('a.git')
         history = r.revision_history(r.head())
         shas = [c.sha().hexdigest() for c in history]
         self.assertEqual(shas, [r.head(),
                                 '2a72d929692c41d8554c07f6301757ba18a65d91'])
   
     def test_merge_history(self):
-        r = self.open_repo('simple_merge')
+        r = self.open_repo('simple_merge.git')
         history = r.revision_history(r.head())
         shas = [c.sha().hexdigest() for c in history]
         self.assertEqual(shas, ['5dac377bdded4c9aeb8dff595f0faeebcc8498cc',
@@ -118,13 +118,13 @@ class RepositoryTests(unittest.TestCase):
                                 '0d89f20333fbb1d2f3a94da77f4981373d8f4310'])
   
     def test_revision_history_missing_commit(self):
-        r = self.open_repo('simple_merge')
+        r = self.open_repo('simple_merge.git')
         self.assertRaises(errors.MissingCommitError, r.revision_history,
                           missing_sha)
   
     def test_out_of_order_merge(self):
         """Test that revision history is ordered by date, not parent order."""
-        r = self.open_repo('ooo_merge')
+        r = self.open_repo('ooo_merge.git')
         history = r.revision_history(r.head())
         shas = [c.sha().hexdigest() for c in history]
         self.assertEqual(shas, ['7601d7f6231db6a57f7bbb79ee52e4d462fd44d1',
@@ -133,5 +133,5 @@ class RepositoryTests(unittest.TestCase):
                                 'f9e39b120c68182a4ba35349f832d0e4e61f485c'])
   
     def test_get_tags_empty(self):
-        r = self.open_repo('ooo_merge')
+        r = self.open_repo('ooo_merge.git')
         self.assertEquals({}, r.refs.as_dict('refs/tags'))