summaryrefslogtreecommitdiff
authorJosh <jokajak@gmail.com>2013-02-21 16:08:18 (UTC)
committer Josh <jokajak@gmail.com>2013-02-21 16:08:18 (UTC)
commit6d037cc7a40708c95860e9311236dc76a40d0764 (patch) (side-by-side diff)
tree77825931432896aa280ca543d48cda435313039b
parent07d0357beef5d9328a2dd8d07ad7b39c87ac55e4 (diff)
downloadclipperz-6d037cc7a40708c95860e9311236dc76a40d0764.zip
clipperz-6d037cc7a40708c95860e9311236dc76a40d0764.tar.gz
clipperz-6d037cc7a40708c95860e9311236dc76a40d0764.tar.bz2
add friendly error message when the git python module can't be found
also hides the exception
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--scripts/builder/repository.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/builder/repository.py b/scripts/builder/repository.py
index 7a44e47..2d4a12b 100644
--- a/scripts/builder/repository.py
+++ b/scripts/builder/repository.py
@@ -1,99 +1,100 @@
#!/usr/bin/env python
# -*- coding: UTF-8 -*-
def repositoryWithPath (path):
try:
from mercurial import ui, hg
repo = hg.repository(ui.ui(), path)
result = HgRepository(repo, path)
except:
try:
from git import Repo
repo = Repo(path)
result = GitRepository(repo, path)
except ImportError, exception:
print "Failed to import git, please install http://gitorious.org/git-python"
- raise exception
+ print "Use sudo apt-get install python-git for Ubuntu/Debian"
+ print "Use sudo yum install GitPython for Fedora/RHEL/CentOS"
except:
result = SnapshotRepository('', path)
return result
#===================================================================
class Repository(object):
def __init__ (self, repository, path):
self.repository = repository
self.path = path
def revision (self):
raise NotImplementedError()
def areTherePendingChanges (self):
raise NotImplementedError()
def version (self):
result = self.revision()
if self.areTherePendingChanges():
result = '>>> ' + result + ' <<<'
# print "VERSION: " + result
return result
#===================================================================
class GitRepository(Repository):
# http://gitorious.org/git-python
def revision (self):
try:
return self.repository.head.commit.hexsha
except:
return self.repository.commits()[0].id
def areTherePendingChanges (self):
try:
return self.repository.is_dirty()
except TypeError, te:
return self.repository.is_dirty
#===================================================================
class HgRepository(Repository):
# http://mercurial.selenic.com/wiki/MercurialApi
def revision (self):
return 'hg:' + str(self.repository['tip'])
def areTherePendingChanges (self):
# TODO: FIXME: repository.status() does not report 'unknown(?)' files. :(
return not all(map(lambda fileList: len(fileList) == 0, self.repository.status()))
#===================================================================
class SnapshotRepository(Repository):
def revision (self):
return 'SNAPSHOT'
def areTherePendingChanges (self):
return False