Skip to content

Commit 1cb02eb

Browse files
ByronByron
committed
Merge branch 'feature/spaces-and-cleanup-master'
* feature/spaces-and-cleanup-master: Basic fixes to get tests back on track. Of course there is much more work to be done here removed leftover gitdb - I thought it was merged into git tabs to 4 spaces - overall state of this branch is desolate, but fixable. Needs plenty of work
2 parents 660bdca + f77230f commit 1cb02eb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+20089
-20085
lines changed

‎.gitmodules

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
[submodule "async"]
22
path = git/ext/async
33
url = http://github.com/gitpython-developers/async.git
4+
branch = master
45
[submodule "smmap"]
56
path = git/ext/smmap
67
url = http://github.com/Byron/smmap.git
8+
branch = master

‎README.rst

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,11 @@ The object database implementation is optimized for handling large quantities of
1111
REQUIREMENTS
1212
============
1313

14-
* Git ( tested with 1.7.3.2 )
14+
* Git ( tested with 1.8.3.4 )
1515
* Python Nose - used for running the tests
16-
* Mock by Michael Foord used for tests. Requires 0.5
16+
* Tested with nose 1.3.0
17+
* Mock by Michael Foord used for tests
18+
* Tested with 1.0.1
1719

1820
INSTALL
1921
=======

‎git/__init__.py

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@
1313

1414
#{ Initialization
1515
def _init_externals():
16-
"""Initialize external projects by putting them into the path"""
17-
ext_base = os.path.join(os.path.dirname(__file__), 'ext')
18-
for package in ('async', 'smmap'):
19-
sys.path.append(os.path.join(ext_base, package))
20-
try:
21-
__import__(package)
22-
except ImportError:
23-
raise ImportError("%r could not be found in your PYTHONPATH" % package)
24-
#END verify import
25-
#END handle external import
26-
16+
"""Initialize external projects by putting them into the path"""
17+
ext_base = os.path.join(os.path.dirname(__file__), 'ext')
18+
for package in ('async', 'smmap'):
19+
sys.path.append(os.path.join(ext_base, package))
20+
try:
21+
__import__(package)
22+
except ImportError:
23+
raise ImportError("%r could not be found in your PYTHONPATH" % package)
24+
#END verify import
25+
#END handle external import
26+
2727
#} END initialization
2828

2929
#################
@@ -43,14 +43,14 @@ def _init_externals():
4343
from git.index import *
4444
from git.repo import Repo
4545
from git.util import (
46-
LockFile,
47-
BlockingLockFile,
48-
Stats,
49-
Actor
50-
)
46+
LockFile,
47+
BlockingLockFile,
48+
Stats,
49+
Actor
50+
)
5151

5252
#} END imports
5353

5454
__all__ = [ name for name, obj in locals().items()
55-
if not (name.startswith('_') or inspect.ismodule(obj)) ]
56-
55+
if not (name.startswith('_') or inspect.ismodule(obj)) ]
56+

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy