summaryrefslogtreecommitdiff
path: root/scripts
authorGiulio Cesare Solaroli <giulio.cesare@clipperz.com>2012-03-17 15:10:02 (UTC)
committer Giulio Cesare Solaroli <giulio.cesare@clipperz.com>2012-03-17 15:10:02 (UTC)
commitbf7d8191a3a6dbd092a88911098a3e7f6cf30cf7 (patch) (side-by-side diff)
tree5eee397439e3af31c8fe7f96a22ea11c234bd4a8 /scripts
parente61e994abb9738d98447b203b9908793da6f560a (diff)
downloadclipperz-bf7d8191a3a6dbd092a88911098a3e7f6cf30cf7.zip
clipperz-bf7d8191a3a6dbd092a88911098a3e7f6cf30cf7.tar.gz
clipperz-bf7d8191a3a6dbd092a88911098a3e7f6cf30cf7.tar.bz2
Improved build scripts
Improved the detection of the correct repository class to use. Signed-off-by: Giulio Cesare Solaroli <giulio.cesare@clipperz.com>
Diffstat (limited to 'scripts') (more/less context) (ignore whitespace changes)
-rw-r--r--scripts/builder/repository.py18
1 files changed, 11 insertions, 7 deletions
diff --git a/scripts/builder/repository.py b/scripts/builder/repository.py
index f8528c2..0045de7 100644
--- a/scripts/builder/repository.py
+++ b/scripts/builder/repository.py
@@ -1,23 +1,26 @@
#!/usr/bin/env python
# -*- coding: UTF-8 -*-
def repositoryWithPath (path):
try:
- from git import Repo
-
- repo = Repo(path)
- result = GitRepository(repo, path)
- except ImportError:
- print "Failed to import git, please install http://gitorious.org/git-python"
-# except:
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
#===================================================================
@@ -47,12 +50,13 @@ class Repository(object):
#===================================================================
class GitRepository(Repository):
+ # http://gitorious.org/git-python
def revision (self):
return self.repository.head.commit.hexsha
def areTherePendingChanges (self):