aboutsummaryrefslogtreecommitdiff
path: root/git/exc.py
diff options
context:
space:
mode:
Diffstat (limited to 'git/exc.py')
-rw-r--r--git/exc.py30
1 files changed, 22 insertions, 8 deletions
diff --git a/git/exc.py b/git/exc.py
index 3b3091e2..f1fcf9b3 100644
--- a/git/exc.py
+++ b/git/exc.py
@@ -7,27 +7,37 @@
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):
+
+ def __init__(self, command, status, stderr=None, stdout=None):
self.stderr = stderr
+ self.stdout = stdout
self.status = status
self.command = command
-
+
def __str__(self):
- return ("'%s' returned exit status %i: %s" %
- (' '.join(str(i) for i in self.command), self.status, self.stderr))
+ ret = "'%s' returned exit status %i: %s" % \
+ (' '.join(str(i) for i in self.command), self.status, self.stderr)
+ if self.stdout is not None:
+ ret += "\nstdout: %s" % self.stdout
+ return ret
+
+class CheckoutError(Exception):
-class CheckoutError( Exception ):
"""Thrown if a file could not be checked out from the index as it contained
changes.
@@ -40,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
@@ -48,11 +59,14 @@ class CheckoutError( Exception ):
def __str__(self):
return Exception.__str__(self) + ":%s" % self.failed_files
-
-
+
+
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
+
+ """Thrown if an operation cannot proceed as there are still unmerged
entries in the cache"""