Fixed import of gitdb, keeping changed gitdb commit so that the submo… · gitpython-developers/GitPython@468cad6 · GitHub

1. gitpython-developers
2. GitPython

Repository navigation

• Code
• Issues6 (6)
• Pull requests2 (2)
• Discussions
• Actions
• Security and quality42 (42)
• Insights

Commit 468cad6

Browse filesBrowse the repository at this point in the historyBrowse files

Byron

committed

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
Copy full SHA for 468cad6

4 files changed

+11-5Lines changed: 11 additions & 5 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• .gitmodules
• git
  • __init__.py
  • ext
    • gitdb
  • test
    • test_submodule.py

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎.gitmodules‎

Copy file name to clipboard

+1-1Lines changed: 1 addition & 1 deletion

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

Collapse file

‎git/__init__.py‎

Copy file name to clipboardExpand all lines: git/__init__.py

+7-1Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -14,7 +14,13 @@
14	14	#{ Initialization
15	15	def _init_externals():
16	16	"""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
18	24
19	25	#} END initialization
20	26

Collapse file

‎git/ext/gitdb‎

Copy file name to clipboard

Submodule gitdb updated 52 files

• .gitmodules

  +2

  -2
• MANIFEST.in

  +4

  -4
• README.rst

  +2

  -3
• doc/source/conf.py

  +1

  -1
• doc/source/intro.rst

  +2

  -3
• doc/source/tutorial.rst

  +1

  -1
• ext/async

  -1
• gitdb/__init__.py

  +7

  -1
• gitdb/_delta_apply.c
• gitdb/_delta_apply.h
• gitdb/_fun.c
• gitdb/base.py
• gitdb/db/__init__.py
• gitdb/db/base.py
• gitdb/db/git.py
• gitdb/db/loose.py
• gitdb/db/mem.py
• gitdb/db/pack.py
• gitdb/db/ref.py
• gitdb/exc.py
• gitdb/ext/async

  +1
• gitdb/fun.py

  +5

  -4
• gitdb/pack.py

  +1

  -1
• gitdb/stream.py
• gitdb/test/__init__.py
• gitdb/test/db/__init__.py
• gitdb/test/db/lib.py
• gitdb/test/db/test_git.py

  +1

  -1
• gitdb/test/db/test_loose.py
• gitdb/test/db/test_mem.py
• gitdb/test/db/test_pack.py

  +1

  -2
• gitdb/test/db/test_ref.py

  +1

  -1
• gitdb/test/fixtures/objects/7b/b839852ed5e3a069966281bb08d50012fb309b
• gitdb/test/fixtures/packs/pack-11fdfa9e156ab73caae3b6da867192221f2089c2.idx
• gitdb/test/fixtures/packs/pack-11fdfa9e156ab73caae3b6da867192221f2089c2.pack
• gitdb/test/fixtures/packs/pack-a2bf8e71d8c18879e499335762dd95119d93d9f1.idx
• gitdb/test/fixtures/packs/pack-a2bf8e71d8c18879e499335762dd95119d93d9f1.pack
• gitdb/test/fixtures/packs/pack-c0438c19fb16422b6bbcce24387b3264416d485b.idx
• gitdb/test/fixtures/packs/pack-c0438c19fb16422b6bbcce24387b3264416d485b.pack
• gitdb/test/lib.py
• gitdb/test/performance/lib.py
• gitdb/test/performance/test_pack.py
• gitdb/test/performance/test_pack_streaming.py
• gitdb/test/performance/test_stream.py
• gitdb/test/test_base.py
• gitdb/test/test_example.py

  +1

  -1
• gitdb/test/test_pack.py
• gitdb/test/test_stream.py
• gitdb/test/test_util.py
• gitdb/typ.py
• gitdb/util.py
• setup.py

  +3

  -4

Collapse file

‎git/test/test_submodule.py‎

Copy file name to clipboardExpand all lines: git/test/test_submodule.py

+2-2Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -20,7 +20,7 @@ def update(self, op, index, max_count, message=''):
20	20
21	21	class TestSubmodule(TestBase):
22	22
23		- k_subm_current = "cb68eef0865df6aedbc11cd81888625a70da6777"
	23	+ k_subm_current = "e1e3017788213720afcfae0accddb2a6f2d9f052"
24	24	k_subm_changed = "394ed7006ee5dc8bddfd132b64001d5dfc0ffdd3"
25	25	k_no_subm_tag = "0.1.6"
26	26
@@ -42,7 +42,7 @@ def _do_base_tests(self, rwrepo):
42	42
43	43	assert sm.path == 'git/ext/gitdb'
44	44	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'
46	46	assert sm.branch_path == 'refs/heads/master' # the default ...
47	47	assert sm.branch_name == 'master'
48	48	assert sm.parent_commit == rwrepo.head.commit

0 commit comments

Comments

0 (0)