From e61e994abb9738d98447b203b9908793da6f560a Mon Sep 17 00:00:00 2001
From: Giulio Cesare Solaroli <giulio.cesare@clipperz.com>
Date: Sat, 17 Mar 2012 14:40:38 +0000
Subject: 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>
---
diff --git a/backend/php/properties/php.properties.json b/backend/php/properties/php.properties.json
index 8ce703a..dd25b09 100644
--- a/backend/php/properties/php.properties.json
+++ b/backend/php/properties/php.properties.json
@@ -1,9 +1,9 @@
 {
 	"request.path": "index.php",
-	"should.pay.toll": "false"
+	"should.pay.toll": "false",
 
 	"development.settings": {
 		"url": "http://localhost/php/clipperz"
 	}
 
-}
\ No newline at end of file
+}
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
@@ -4,11 +4,13 @@
 
 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)
@@ -50,8 +52,8 @@ 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()
--
cgit v0.9.0.2