summaryrefslogtreecommitdiff
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) (unidiff)
tree5eee397439e3af31c8fe7f96a22ea11c234bd4a8
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 (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
@@ -4,17 +4,20 @@
4 4
5def repositoryWithPath (path): 5def repositoryWithPath (path):
6 try: 6 try:
7 from git import Repo
8
9 repo = Repo(path)
10 result = GitRepository(repo, path)
11 except ImportError:
12 print "Failed to import git, please install http://gitorious.org/git-python"
13 #except:
14 from mercurial import ui, hg 7 from mercurial import ui, hg
15 8
16 repo = hg.repository(ui.ui(), path) 9 repo = hg.repository(ui.ui(), path)
17 result = HgRepository(repo, path) 10 result = HgRepository(repo, path)
11 except:
12 try:
13 from git import Repo
14
15 repo = Repo(path)
16 result = GitRepository(repo, path)
17 except ImportError, exception:
18 print "Failed to import git, please install http://gitorious.org/git-python"
19 raise exception
20
18 21
19 return result 22 return result
20 23
@@ -50,6 +53,7 @@ class Repository(object):
50 53
51 54
52class GitRepository(Repository): 55class GitRepository(Repository):
56 #http://gitorious.org/git-python
53 57
54 def revision (self): 58 def revision (self):
55 return self.repository.head.commit.hexsha 59 return self.repository.head.commit.hexsha