From a38a0053d31d0285dd1e6ebe6efc28726a9656cc Mon Sep 17 00:00:00 2001
From: Sebastian Thiel <byronimo@gmail.com>
Date: Wed, 16 Dec 2009 13:59:09 +0100
Subject: Added imports for standard locking file classes into the git module

---
 lib/git/__init__.py | 1 +
 lib/git/cmd.py      | 3 +++
 lib/git/index.py    | 3 ++-
 lib/git/remote.py   | 2 +-
 4 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'lib/git')

diff --git a/lib/git/__init__.py b/lib/git/__init__.py
index c7efe5ea..75eba3c9 100644
--- a/lib/git/__init__.py
+++ b/lib/git/__init__.py
@@ -20,6 +20,7 @@ from git.repo import Repo
 from git.stats import Stats
 from git.remote import *
 from git.index import *
+from git.utils import LockFile, BlockingLockFile
 
 __all__ = [ name for name, obj in locals().items()
 			if not (name.startswith('_') or inspect.ismodule(obj)) ]
diff --git a/lib/git/cmd.py b/lib/git/cmd.py
index 9095eb34..e361e772 100644
--- a/lib/git/cmd.py
+++ b/lib/git/cmd.py
@@ -218,6 +218,8 @@ class Git(object):
 		
 		# Wait for the process to return
 		status = 0
+		stdout_value = ''
+		stderr_value = ''
 		try:
 			if output_stream is None:
 				stdout_value = proc.stdout.read().rstrip()		# strip trailing "\n"
@@ -232,6 +234,7 @@ class Git(object):
 				stdout_value = output_stream
 			# END stdout handling
 			stderr_value = proc.stderr.read().rstrip()			# strip trailing "\n"
+			
 			# waiting here should do nothing as we have finished stream reading
 			status = proc.wait()
 		finally:
diff --git a/lib/git/index.py b/lib/git/index.py
index 334e84aa..df633ccd 100644
--- a/lib/git/index.py
+++ b/lib/git/index.py
@@ -21,7 +21,7 @@ import git.diff as diff
 
 from errors import GitCommandError
 from git.objects import Blob, Tree, Object, Commit
-from git.utils import SHA1Writer, LazyMixin, ConcurrentWriteOperation, join_path_native, BlockingLockFile
+from git.utils import SHA1Writer, LazyMixin, ConcurrentWriteOperation, join_path_native
 
 
 class CheckoutError( Exception ):
@@ -914,6 +914,7 @@ class IndexFile(LazyMixin, diff.Diffable):
 		entries_added = list()
 		paths, entries = self._preprocess_add_items(items)
 		
+		
 		# HANDLE PATHS 
 		if paths:
 			# to get suitable progress information, pipe paths to stdin 
diff --git a/lib/git/remote.py b/lib/git/remote.py
index 1e2e42fa..dc70309b 100644
--- a/lib/git/remote.py
+++ b/lib/git/remote.py
@@ -29,7 +29,7 @@ class _SectionConstraint(object):
 		
 	def __getattr__(self, attr):
 		if attr in self._valid_attrs_:
-			return lambda *args: self._call_config(attr, *args)
+			return lambda *args, **kwargs: self._call_config(attr, *args, **kwargs)
 		return super(_SectionConstraint,self).__getattribute__(attr)
 		
 	def _call_config(self, method, *args, **kwargs):
-- 
cgit v1.2.1