.gitignore

@@ -6,3 +6,4 @@
 /dist
 /doc/_build
 nbproject
+.nosebazinga

.gitmodules

@@ -1,4 +1,8 @@
-[submodule "gitdb"]
-	path = git/ext/gitdb
-	url = git://github.com/gitpython-developers/gitdb.git
+[submodule "async"]
+	path = git/ext/async
+	url = http://github.com/gitpython-developers/async.git
+	branch = master
+[submodule "smmap"]
+	path = git/ext/smmap
+	url = http://github.com/Byron/smmap.git 
 	branch = master

README.rst

@@ -1,63 +1,9 @@
-==========
-GitPython
-==========
+===================
+DEPRECATION WARNING
+===================
 
-GitPython is a python library used to interact with git repositories, high-level like git-porcelain, or low-level like git-plumbing.
+This branch contains an abandoned experiment which aimed to change the architecture of git-python entirely. However, as it was never finished, it was good for quite a bit of confusion only.
 
-It provides abstractions of git objects for easy access of repository data, and additionally allows you to access the git repository more directly using either a pure python implementation, or the faster, but more resource intensive git command implementation.
+For the most recent state, please refer to the default branch you find on github.
 
-The object database implementation is optimized for handling large quantities of objects and large datasets, which is achieved by using low-level structures and data streaming.
-
-REQUIREMENTS
-============
-
-* Git ( tested with 1.7.3.2 )
-* Python Nose - used for running the tests
-* Mock by Michael Foord used for tests. Requires 0.5
-
-INSTALL
-=======
-If you have downloaded the source code:
-
-	python setup.py install
-
-or if you want to obtain a copy more easily: 
-
-    easy_install gitpython
-
-A distribution package can be obtained for manual installation at:
-
-    http://pypi.python.org/pypi/GitPython
-
-SOURCE
-======
-
-GitPython's git repo is available on GitHub, which can be browsed at:
-
-https://github.com/gitpython-developers/GitPython
-
-and cloned using:
-
-git clone git://github.com/gitpython-developers/GitPython.git git-python
-
-
-DOCUMENTATION
-=============
-The html-compiled documentation can be found at the following URL:
-
-http://packages.python.org/GitPython/
-
-MAILING LIST
-============
-http://groups.google.com/group/git-python
-
-ISSUE TRACKER
-=============
-Issues are tracked on github:
-
-https://github.com/gitpython-developers/GitPython/issues
-
-LICENSE
-=======
-
-New BSD License.  See the LICENSE file.
+Thank you.

doc/source/changes.rst

@@ -4,8 +4,36 @@ Changelog
 
 NEXT
 ====
-* Blob Type
- * Added mode constants to ease the manual creation of blobs
+* ### Class Renames ###
+
+ * Renamed **GitCmdObjectDB** to **CmdGitDB** (analogue to **PureCmdDB**)
+
+* ### Interface Changes ###
+
+ * **SymbolicReference**
+
+  * object_binsha property added
+
+ * **Blob** Type
+
+  * Added mode constants to ease the manual creation of blobs
+
+ * **Repo** (i.e. **HighLevelRepository**) now supports a progress instance to be provided for its ``clone()`` and ``clone_from`` methods.
+
+* ### Module Changes ###
+
+ * Removed rev_parse function from git.repo.fun - the respective functionality is available only through the repository's rev_parse method, which might in turn translate to any implementation.
+
+* ### Git Cmd ###
+
+ * Added ``version_info`` property to git command, returning a tuple of version numbers.
+ * Added GIT_PYTHON_GIT_EXECUTABLE environment variable, which can be used to set the desired git executable to be used. despite of what would be found in the path.
+ * GIT_PYTHON_TRACE is now set on class level of the Git type, previously it was a module level global variable.
+ * GIT_PYTHON_GIT_EXECUTABLE is a class level variable as well.
+
+* ### Exceptions ###
+
+ * There is a new common base for all exceptions git-python will throw, namely `GitPythonError`.
 
 0.3.1 Beta 2
 ============

doc/source/intro.rst

@@ -19,7 +19,7 @@ Requirements
 * `GitDB`_ - a pure python git database implementation
 
  * `async`_ - asynchronous task scheduling
- 
+
 * `Python Nose`_ - used for running the tests
 * `Mock by Michael Foord`_ used for tests. Requires version 0.5
 
@@ -36,9 +36,9 @@ Installing GitPython is easily done using
 `setuptools`_. Assuming it is
 installed, just run the following from the command-line:
 
-.. sourcecode:: none
+.. sourcecode:: console
 
-    # easy_install GitPython
+    $ easy_install GitPython
 
 This command will download the latest version of GitPython from the
 `Python Package Index <http://pypi.python.org/pypi/GitPython>`_ and install it
@@ -54,10 +54,10 @@ here:
 Alternatively, you can install from the distribution using the ``setup.py``
 script:
 
-.. sourcecode:: none
+.. sourcecode:: console
+
+    $ python setup.py install
 
-    # python setup.py install
-
 .. note:: In this case, you have to manually install `GitDB`_ and `async`_ as well. It would be recommended to use the :ref:`git source repository <source-code-label>` in that case.
 
 Getting Started
@@ -80,21 +80,27 @@ Source Code
 
 GitPython's git repo is available on GitHub, which can be browsed at:
 
- * https://github.com/gitpython-developers/GitPython
+* https://github.com/gitpython-developers/GitPython
+
+and cloned using:
+
+.. sourcecode:: console
+
+    $ git clone git://github.com/gitpython-developers/GitPython.git git-python
+
+Initialize all submodules to obtain the required dependencies with:
 
-and cloned using::
+.. sourcecode:: console
 
-	$ git clone git://github.com/gitpython-developers/GitPython.git git-python
-	
-Initialize all submodules to obtain the required dependencies with::
-    
     $ cd git-python
     $ git submodule update --init --recursive
-    
-Finally verify the installation by running the `nose powered <http://code.google.com/p/python-nose/>`_ unit tests::
-    
+
+Finally verify the installation by running the `nose powered <http://code.google.com/p/python-nose/>`_ unit tests:
+
+.. sourcecode:: console
+
     $ nosetests
-    
+
 Mailing List
 ============
 http://groups.google.com/group/git-python
@@ -104,7 +110,7 @@ Issue Tracker
 The issue tracker is hosted by github:
 
 https://github.com/gitpython-developers/GitPython/issues
-	
+
 License Information
 ===================
 GitPython is licensed under the New BSD License.  See the LICENSE file for

doc/source/tutorial.rst

@@ -146,9 +146,9 @@ Index Objects are objects that can be put into git's index. These objects are tr
     ''
     hct.trees[0].path   # the first subdirectory has one though
     'dir'
-    htc.mode            # trees have the mode of a linux directory
+    oct(htc.mode)       # trees have the mode of a linux directory
     040000
-    '%o' % htc.blobs[0].mode    # blobs have a specific mode though comparable to a standard linux fs
+    oct(htc.blobs[0].mode)    # blobs have a specific mode though comparable to a standard linux fs
     100644
     
 Access blob data (or any object data) directly or using streams::
@@ -412,6 +412,20 @@ The special notion ``git.command(flag=True)`` will create a flag without value l
 
 If ``None`` is found in the arguments, it will be dropped silently. Lists and tuples  passed as arguments will be unpacked recursively to individual arguments. Objects are converted to strings using the str(...) function.
 
+Git Command Debugging and Customization
+***************************************
+
+Using environment variables, you can further adjust the behaviour of the git command.
+
+* **GIT_PYTHON_TRACE**
+
+ * If set to non-0, all executed git commands will be printed to stdout.
+ * if set to *full*, the executed git command will be printed along with its output.
+
+* **GIT_PYTHON_GIT_EXECUTABLE**
+
+ * If set, it should contain the full path to the git executable, e.g. *c:\\Program Files (x86)\\Git\\bin\\git.exe* on windows or */usr/bin/git* on linux.
+
 And even more ...
 *****************
 

git/__init__.py

@@ -13,15 +13,17 @@
 
 #{ Initialization
 def _init_externals():
-	"""Initialize external projects by putting them into the path"""
-	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
-
+    """Initialize external projects by putting them into the path"""
+    ext_base = os.path.join(os.path.dirname(__file__), 'ext')
+    for package in ('async', 'smmap'):
+        sys.path.append(os.path.join(ext_base, package))
+        try:
+            __import__(package)
+        except ImportError:
+            raise ImportError("%r could not be found in your PYTHONPATH" % package)
+        # END verify import
+    # END handle external import
+
 #} END initialization
 
 #################
@@ -37,18 +39,17 @@ def _init_externals():
 from git.exc import *
 from git.db import *
 from git.cmd import Git
-from git.repo import Repo
 from git.remote import *
 from git.index import *
+from git.repo import Repo
 from git.util import (
-						LockFile, 
-						BlockingLockFile, 
-						Stats,
-						Actor
-						)
+    LockFile,
+    BlockingLockFile,
+    Stats,
+    Actor
+)
 
 #} END imports
 
-__all__ = [ name for name, obj in locals().items()
-			if not (name.startswith('_') or inspect.ismodule(obj)) ]
-
+__all__ = [name for name, obj in locals().items()
+           if not (name.startswith('_') or inspect.ismodule(obj))]