diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2010-12-01 00:08:47 +0100 |
|---|---|---|
| committer | Sebastian Thiel <byronimo@gmail.com> | 2010-12-01 00:12:46 +0100 |
| commit | 468cad66ff1f80ddaeee4123c24e4d53a032c00d (patch) | |
| tree | 5d9a54916aa7d738e429a24b3a0ee10ad0850a52 | |
| parent | 1053448ad885c633af9805a750d6187d19efaa6c (diff) | |
| download | gitpython-468cad66ff1f80ddaeee4123c24e4d53a032c00d.tar.gz | |
Fixed import of gitdb, keeping changed gitdb commit so that the submodule tests may work.
Switched gitdb submodule to new github url
| -rw-r--r-- | .gitmodules | 2 | ||||
| -rw-r--r-- | git/__init__.py | 8 | ||||
| m--------- | git/ext/gitdb | 0 | ||||
| -rw-r--r-- | git/test/test_submodule.py | 4 |
4 files changed, 10 insertions, 4 deletions
diff --git a/.gitmodules b/.gitmodules index 271899fc..5741d992 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "gitdb"] path = git/ext/gitdb - url = git://github.com/Byron/gitdb.git + url = git://github.com/gitpython-developers/gitdb.git diff --git a/git/__init__.py b/git/__init__.py index 483ac091..0658c330 100644 --- a/git/__init__.py +++ b/git/__init__.py @@ -14,7 +14,13 @@ __version__ = 'git' #{ Initialization def _init_externals(): """Initialize external projects by putting them into the path""" - sys.path.append(os.path.join(os.path.dirname(__file__), 'ext')) + sys.path.append(os.path.join(os.path.dirname(__file__), 'ext', 'gitdb')) + + try: + import gitdb + except ImportError: + raise ImportError("'gitdb' could not be found in your PYTHONPATH") + #END verify import #} END initialization diff --git a/git/ext/gitdb b/git/ext/gitdb -Subproject 9f977b8baaf9cbe9b38f3bdf4887cef5370b222 +Subproject 4b1831f66fd3fe319bf537381c8b64de4a1461f diff --git a/git/test/test_submodule.py b/git/test/test_submodule.py index 3a0c5208..173d0f60 100644 --- a/git/test/test_submodule.py +++ b/git/test/test_submodule.py @@ -20,7 +20,7 @@ prog = TestRootProgress() class TestSubmodule(TestBase): - k_subm_current = "cb68eef0865df6aedbc11cd81888625a70da6777" + k_subm_current = "e1e3017788213720afcfae0accddb2a6f2d9f052" k_subm_changed = "394ed7006ee5dc8bddfd132b64001d5dfc0ffdd3" k_no_subm_tag = "0.1.6" @@ -42,7 +42,7 @@ class TestSubmodule(TestBase): assert sm.path == 'git/ext/gitdb' assert sm.path != sm.name # in our case, we have ids there, which don't equal the path - assert sm.url == 'git://gitorious.org/git-python/gitdb.git' + assert sm.url == 'git://github.com/gitpython-developers/gitdb.git' assert sm.branch_path == 'refs/heads/master' # the default ... assert sm.branch_name == 'master' assert sm.parent_commit == rwrepo.head.commit |