Skip to content

Commit 468cad6

Browse files
committedNov 30, 2010
Fixed import of gitdb, keeping changed gitdb commit so that the submodule tests may work.
Switched gitdb submodule to new github url
1 parent 1053448 commit 468cad6

File tree

4 files changed

+11
-5
lines changed

4 files changed

+11
-5
lines changed
 

‎.gitmodules

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[submodule "gitdb"]
22
path = git/ext/gitdb
3-
url = git://github.com/Byron/gitdb.git
3+
url = git://github.com/gitpython-developers/gitdb.git

‎git/__init__.py

+7-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,13 @@
1414
#{ Initialization
1515
def _init_externals():
1616
"""Initialize external projects by putting them into the path"""
17-
sys.path.append(os.path.join(os.path.dirname(__file__), 'ext'))
17+
sys.path.append(os.path.join(os.path.dirname(__file__), 'ext', 'gitdb'))
18+
19+
try:
20+
import gitdb
21+
except ImportError:
22+
raise ImportError("'gitdb' could not be found in your PYTHONPATH")
23+
#END verify import
1824

1925
#} END initialization
2026

‎git/ext/gitdb

‎git/test/test_submodule.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def update(self, op, index, max_count, message=''):
2020

2121
class TestSubmodule(TestBase):
2222

23-
k_subm_current = "cb68eef0865df6aedbc11cd81888625a70da6777"
23+
k_subm_current = "e1e3017788213720afcfae0accddb2a6f2d9f052"
2424
k_subm_changed = "394ed7006ee5dc8bddfd132b64001d5dfc0ffdd3"
2525
k_no_subm_tag = "0.1.6"
2626

@@ -42,7 +42,7 @@ def _do_base_tests(self, rwrepo):
4242

4343
assert sm.path == 'git/ext/gitdb'
4444
assert sm.path != sm.name # in our case, we have ids there, which don't equal the path
45-
assert sm.url == 'git://gitorious.org/git-python/gitdb.git'
45+
assert sm.url == 'git://github.com/gitpython-developers/gitdb.git'
4646
assert sm.branch_path == 'refs/heads/master' # the default ...
4747
assert sm.branch_name == 'master'
4848
assert sm.parent_commit == rwrepo.head.commit

0 commit comments

Comments
 (0)
Please sign in to comment.