summaryrefslogtreecommitdiff
path: root/scripts/builder
Side-by-side diff
Diffstat (limited to 'scripts/builder') (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):