summaryrefslogtreecommitdiff
authorGiulio Cesare Solaroli <giulio.cesare@solaroli.it>2012-03-19 01:35:36 (UTC)
committer Giulio Cesare Solaroli <giulio.cesare@solaroli.it>2012-03-19 01:35:36 (UTC)
commit36ff1deefcbbd24aceca97eb39a13f9da4af8ff5 (patch) (side-by-side diff)
tree811b944f321218fdb3d9d02df13da2ea2eef4949
parent758bd68eee9c0ae1d3ad8dc50481c78557bd6228 (diff)
parent67ba4cd7b5bc5e834db3106b3081677ee70d18f7 (diff)
downloadclipperz-36ff1deefcbbd24aceca97eb39a13f9da4af8ff5.zip
clipperz-36ff1deefcbbd24aceca97eb39a13f9da4af8ff5.tar.gz
clipperz-36ff1deefcbbd24aceca97eb39a13f9da4af8ff5.tar.bz2
Merge pull request #36 from jokajak/buildFix
add code to handle older version of GitPython
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--scripts/builder/repository.py11
1 files changed, 9 insertions, 2 deletions
diff --git a/scripts/builder/repository.py b/scripts/builder/repository.py
index 0045de7..a47e249 100644
--- a/scripts/builder/repository.py
+++ b/scripts/builder/repository.py
@@ -1,81 +1,88 @@
#!/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
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):
- return self.repository.head.commit.hexsha
+ try:
+ return self.repository.head.commit.hexsha
+ except:
+ return self.repository.commits()[0].id
def areTherePendingChanges (self):
- return self.repository.is_dirty()
+ 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()))
#===================================================================