summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--scripts/builder/repository.py14
1 files changed, 9 insertions, 5 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,29 +1,32 @@
#!/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:
+ except ImportError, exception:
print "Failed to import git, please install http://gitorious.org/git-python"
-# except:
- from mercurial import ui, hg
+ raise exception
- repo = hg.repository(ui.ui(), path)
- result = HgRepository(repo, path)
return result
#===================================================================
class Repository(object):
def __init__ (self, repository, path):
self.repository = repository
self.path = path
@@ -41,24 +44,25 @@ class Repository(object):
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
def areTherePendingChanges (self):
return self.repository.is_dirty()
#===================================================================