summaryrefslogtreecommitdiff
path: root/scripts
authorGiulio Cesare Solaroli <giulio.cesare@clipperz.com>2012-03-17 14:40:38 (UTC)
committer Giulio Cesare Solaroli <giulio.cesare@clipperz.com>2012-03-17 14:40:38 (UTC)
commite61e994abb9738d98447b203b9908793da6f560a (patch) (side-by-side diff)
treec12d695420bb6281708b367d52970eac5615ef1c /scripts
parent65a7a7be3feb846d6b1062a0b858a7660e8f99fa (diff)
parent24f7bfcbe317fe9f0d7de7cef3cb3b3b341c95a5 (diff)
downloadclipperz-e61e994abb9738d98447b203b9908793da6f560a.zip
clipperz-e61e994abb9738d98447b203b9908793da6f560a.tar.gz
clipperz-e61e994abb9738d98447b203b9908793da6f560a.tar.bz2
Merge branch 'buildScript' of https://github.com/jokajak/password-manager
Conflicts: scripts/builder/repository.py Signed-off-by: Giulio Cesare Solaroli <giulio.cesare@clipperz.com>
Diffstat (limited to 'scripts') (more/less context) (show whitespace changes)
-rw-r--r--scripts/builder/repository.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/scripts/builder/repository.py b/scripts/builder/repository.py
index 9da98a2..f8528c2 100644
--- a/scripts/builder/repository.py
+++ b/scripts/builder/repository.py
@@ -1,17 +1,19 @@
#!/usr/bin/env python
# -*- coding: UTF-8 -*-
def repositoryWithPath (path):
try:
- from dulwich.repo import Repo
+ from git import Repo
repo = Repo(path)
result = GitRepository(repo, path)
- except:
+ 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)
return result
@@ -47,13 +49,13 @@ class Repository(object):
#===================================================================
class GitRepository(Repository):
def revision (self):
- return self.repository.refs['HEAD']
+ return self.repository.head.commit.hexsha
def areTherePendingChanges (self):
return self.repository.is_dirty()