gitpython-developers
diff --git a/‎git/cmd.py
+4-3 b/‎git/cmd.py
+4-3
diff --git a/‎git/config.py
+7-5 b/‎git/config.py
+7-5
diff --git a/‎git/db.py
+4-1 b/‎git/db.py
+4-1
diff --git a/‎git/diff.py
+4-2 b/‎git/diff.py
+4-2
diff --git a/‎git/exc.py
+10 b/‎git/exc.py
+10
diff --git a/‎git/index/base.py
+1-8 b/‎git/index/base.py
+1-8
diff --git a/‎git/index/fun.py
+6 b/‎git/index/fun.py
+6
diff --git a/‎git/index/typ.py
+4 b/‎git/index/typ.py
+4
@@ -23,11 +23,13 @@
 
 __all__ = ('Git', )
 
+
 def dashify(string):
     return string.replace('_', '-')
 
 
 class Git(LazyMixin):
+
     """
     The Git class manages communication with the Git binary.
 
@@ -59,8 +61,8 @@ class Git(LazyMixin):
     _git_exec_env_var = "GIT_PYTHON_GIT_EXECUTABLE"
     GIT_PYTHON_GIT_EXECUTABLE = os.environ.get(_git_exec_env_var, git_exec_name)
 
-
     class AutoInterrupt(object):
+
         """Kill/Interrupt the stored process instance once this instance goes out of scope. It is 
         used to prevent processes piling up in case iterators stop reading.
         Besides all attributes are wired through to the contained process object.
@@ -114,6 +116,7 @@ def wait(self):
     # END auto interrupt
 
     class CatFileContentStream(object):
+
         """Object representing a sized read-only stream returning the contents of 
         an object.
         It behaves like a stream, but counts the data read and simulates an empty 
@@ -213,7 +216,6 @@ def __del__(self):
                 self._stream.read(bytes_left + 1)
             # END handle incomplete read
 
-
     def __init__(self, working_dir=None):
         """Initialize this instance with:
 
@@ -247,7 +249,6 @@ def _set_cache_(self, attr):
             super(Git, self)._set_cache_(attr)
         #END handle version info
 
-
     @property
     def working_dir(self):
         """:return: Git directory we are working on"""
 
@@ -17,7 +17,9 @@
 
 __all__ = ('GitConfigParser', 'SectionConstraint')
 
+
 class MetaParserBuilder(type):
+
     """Utlity class wrapping base-class methods into decorators that assure read-only properties"""
     def __new__(metacls, name, bases, clsdict):
         """
@@ -45,20 +47,22 @@ def __new__(metacls, name, bases, clsdict):
         return new_type
 
 
-
 def needs_values(func):
     """Returns method assuring we read values (on demand) before we try to access them"""
+
     def assure_data_present(self, *args, **kwargs):
         self.read()
         return func(self, *args, **kwargs)
     # END wrapper method
     assure_data_present.__name__ = func.__name__
     return assure_data_present
 
+
 def set_dirty_and_flush_changes(non_const_func):
     """Return method that checks whether given non constant function may be called.
     If so, the instance will be set dirty.
     Additionally, we flush the changes right to disk"""
+
     def flush_changes(self, *args, **kwargs):
         rval = non_const_func(self, *args, **kwargs)
         self.write()
@@ -69,6 +73,7 @@ def flush_changes(self, *args, **kwargs):
 
 
 class SectionConstraint(object):
+
     """Constrains a ConfigParser to only option commands which are constrained to 
     always use the section we have been initialized with.
 
@@ -98,6 +103,7 @@ def config(self):
 
 
 class GitConfigParser(cp.RawConfigParser, object):
+
     """Implements specifics required to read git style configuration files.
 
     This variation behaves much like the git.config command such that the configuration
@@ -114,7 +120,6 @@ class GitConfigParser(cp.RawConfigParser, object):
         must match perfectly."""
     __metaclass__ = MetaParserBuilder
 
-
     #{ Configuration
     # The lock type determines the type of lock to use in new configuration readers.
     # They must be compatible to the LockFile interface.
@@ -172,7 +177,6 @@ def __init__(self, file_or_files, read_only=True):
             self._lock._obtain_lock()
         # END read-only check
 
-
     def __del__(self):
         """Write pending changes if required and release locks"""
         # checking for the lock here makes sure we do not raise during write()
@@ -261,7 +265,6 @@ def _read(self, fp, fpname):
         if e:
             raise e
 
-
     def read(self):
         """Reads the data stored in the files we have been initialized with. It will 
         ignore files that cannot be read, possibly leaving an empty configuration
@@ -311,7 +314,6 @@ def write_section(name, section_dict):
             write_section(cp.DEFAULTSECT, self._defaults)
         map(lambda t: write_section(t[0],t[1]), self._sections.items())
 
-
     @needs_values
     def write(self):
         """Write changes to our file, if there are changes at all
 
@@ -20,14 +20,18 @@
 __all__ = ('GitCmdObjectDB', 'GitDB' )
 
 #class GitCmdObjectDB(CompoundDB, ObjectDBW):
+
+
 class GitCmdObjectDB(LooseObjectDB):
+
     """A database representing the default git object store, which includes loose 
     objects, pack files and an alternates file
 
     It will create objects only in the loose object database.
     :note: for now, we use the git command to do all the lookup, just until he 
         have packs and the other implementations
     """
+
     def __init__(self, root_path, git):
         """Initialize this instance with the root and a git command"""
         super(GitCmdObjectDB, self).__init__(root_path)
@@ -42,7 +46,6 @@ def stream(self, sha):
         hexsha, typename, size, stream = self._git.stream_object_data(bin_to_hex(sha))
         return OStream(hex_to_bin(hexsha), typename, size, stream)
 
-
     # { Interface
 
     def partial_to_complete_sha_hex(self, partial_hexsha):
 
@@ -14,7 +14,9 @@
 
 __all__ = ('Diffable', 'DiffIndex', 'Diff')
 
+
 class Diffable(object):
+
     """Common interface for all object that can be diffed against another object of compatible type.
 
     :note: 
@@ -109,6 +111,7 @@ def diff(self, other=Index, paths=None, create_patch=False, **kwargs):
 
 
 class DiffIndex(list):
+
     """Implements an Index for diffs, allowing a list of Diffs to be queried by 
     the diff properties.
 
@@ -120,7 +123,6 @@ class DiffIndex(list):
     # M = modified
     change_type = ("A", "D", "R", "M")
 
-
     def iter_change_type(self, change_type):
         """
         :return:
@@ -149,6 +151,7 @@ def iter_change_type(self, change_type):
 
 
 class Diff(object):
+
     """A Diff contains diff information between two Trees.
 
     It contains two sides a and b of the diff, members are prefixed with 
@@ -228,7 +231,6 @@ def __init__(self, repo, a_path, b_path, a_blob_id, b_blob_id, a_mode,
 
         self.diff = diff
 
-
     def __eq__(self, other):
         for name in self.__slots__:
             if getattr(self, name) != getattr(other, name):
 
@@ -7,16 +7,21 @@
 
 from gitdb.exc import *
 
+
 class InvalidGitRepositoryError(Exception):
+
     """ Thrown if the given repository appears to have an invalid format.  """
 
 
 class NoSuchPathError(OSError):
+
     """ Thrown if a path could not be access by the system. """
 
 
 class GitCommandError(Exception):
+
     """ Thrown if execution of the git command fails with non-zero status code. """
+
     def __init__(self, command, status, stderr=None, stdout=None):
         self.stderr = stderr
         self.stdout = stdout
@@ -32,6 +37,7 @@ def __str__(self):
 
 
 class CheckoutError( Exception ):
+
     """Thrown if a file could not be checked out from the index as it contained
     changes.
 
@@ -44,6 +50,7 @@ class CheckoutError( Exception ):
     The .valid_files attribute contains a list of relative paths to files that
     were checked out successfully and hence match the version stored in the
     index"""
+
     def __init__(self, message, failed_files, valid_files, failed_reasons):
         Exception.__init__(self, message)
         self.failed_files = failed_files
@@ -55,8 +62,11 @@ def __str__(self):
 
 
 class CacheError(Exception):
+
     """Base for all errors related to the git index, which is called cache internally"""
 
+
 class UnmergedEntriesError(CacheError):
+
     """Thrown if an operation cannot proceed as there are still unmerged 
     entries in the cache"""
@@ -71,6 +71,7 @@
 
 
 class IndexFile(LazyMixin, diff.Diffable, Serializable):
+
     """
     Implements an Index that can be manipulated using a native implementation in
     order to save git command function calls wherever possible.
@@ -174,7 +175,6 @@ def _serialize(self, stream, ignore_tree_extension_data=False):
                     (ignore_tree_extension_data and None) or self._extension_data) 
         return self
 
-
     #} END serializable interface
 
     def write(self, file_path = None, ignore_tree_extension_data=False):
@@ -273,7 +273,6 @@ def new(cls, repo, *tree_sha):
         inst.entries = entries
         return inst
 
-
     @classmethod
     def from_tree(cls, repo, *treeish, **kwargs):
         """Merge the given treeish revisions into a new index which is returned.
@@ -519,7 +518,6 @@ def write_tree(self):
         # copy changed trees only
         mdb.stream_copy(mdb.sha_iter(), self.repo.odb)
 
-
         # note: additional deserialization could be saved if write_tree_from_cache
         # would return sorted tree entries
         root_tree = Tree(self.repo, binsha, path='')
@@ -664,7 +662,6 @@ def add(self, items, force=True, fprogress=lambda *args: None, path_rewriter=Non
             del(paths[:])
         # END rewrite paths
 
-
         def store_path(filepath):
             """Store file at filepath in the database and return the base index entry"""
             st = os.lstat(filepath)     # handles non-symlinks as well
@@ -681,7 +678,6 @@ def store_path(filepath):
                                     istream.binsha, 0, to_native_path_linux(filepath)))
         # END utility method
 
-
         # HANDLE PATHS
         if paths:
             assert len(entries_added) == 0
@@ -691,7 +687,6 @@ def store_path(filepath):
             # END for each filepath
         # END path handling
 
-
         # HANDLE ENTRIES
         if entries:
             null_mode_entries = [ e for e in entries if e.mode == 0 ]
@@ -866,7 +861,6 @@ def move(self, items, skip_errors=False, **kwargs):
             return out
         # END handle dryrun
 
-
         # now apply the actual operation
         kwargs.pop('dry_run')
         self.repo.git.mv(args, paths, **kwargs)
@@ -989,7 +983,6 @@ def handle_stderr(proc, iter_checked_out_files):
                 raise CheckoutError("Some files could not be checked out from the index due to local modifications", failed_files, valid_files, failed_reasons)
         # END stderr handler
 
-
         if paths is None:
             args.append("--all")
             kwargs['as_process'] = 1
 
@@ -99,6 +99,7 @@ def write_cache(entries, stream, extension_data=None, ShaStreamCls=IndexFileSHA1
     # write the sha over the content
     stream.write_sha()
 
+
 def read_header(stream):
         """Return tuple(version_long, num_entries) from the given stream"""
         type_id = stream.read(4)
@@ -110,6 +111,7 @@ def read_header(stream):
         assert version in (1, 2)
         return version, num_entries
 
+
 def entry_key(*entry):
     """:return: Key suitable to be used for the index.entries dictionary
     :param entry: One instance of type BaseIndexEntry or the path and the stage"""
@@ -119,6 +121,7 @@ def entry_key(*entry):
         return tuple(entry)
     # END handle entry
 
+
 def read_cache(stream):
     """Read a cache file from the given stream
     :return: tuple(version, entries_dict, extension_data, content_sha)
@@ -166,6 +169,7 @@ def read_cache(stream):
 
     return (version, entries, extension_data, content_sha)
 
+
 def write_tree_from_cache(entries, odb, sl, si=0):
     """Create a tree from the given sorted list of entries and put the respective
     trees into the given object database
@@ -221,9 +225,11 @@ def write_tree_from_cache(entries, odb, sl, si=0):
     istream = odb.store(IStream(str_tree_type, len(sio.getvalue()), sio))
     return (istream.binsha, tree_items)
 
+
 def _tree_entry_to_baseindexentry(tree_entry, stage):
     return BaseIndexEntry((tree_entry[1], tree_entry[0], stage << CE_STAGESHIFT, tree_entry[2]))
 
+
 def aggressive_tree_merge(odb, tree_shas):
     """
     :return: list of BaseIndexEntries representing the aggressive merge of the given
 
@@ -21,7 +21,9 @@
 
 #} END invariants
 
+
 class BlobFilter(object):
+
     """
     Predicate to be used by iter_blobs allowing to filter only return blobs which
     match the given list of directories or files.
@@ -47,6 +49,7 @@ def __call__(self, stage_blob):
 
 
 class BaseIndexEntry(tuple):
+
     """Small Brother of an index entry which can be created to describe changes
     done to the index in which case plenty of additional information is not requried.
 
@@ -109,6 +112,7 @@ def to_blob(self, repo):
 
 
 class IndexEntry(BaseIndexEntry):
+
     """Allows convenient access to IndexEntry data without completely unpacking it.
 
     Attributes usully accessed often are cached in the tuple whereas others are