Improved build scripts

Improved the detection of the correct repository class to use.

Signed-off-by: Giulio Cesare Solaroli <giulio.cesare@clipperz.com>

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,77 +1,81 @@
 #!/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
 
 
 #===================================================================
 
 
 class Repository(object):
 
 	def __init__ (self, repository, path):
 		self.repository = repository
 		self.path = path
 
 
 	def revision (self):
 		raise NotImplementedError()
 	
 
 	def areTherePendingChanges (self):
 		raise NotImplementedError()
 
 
 	def version (self):
 		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()
 
 
 #===================================================================
 
 
 class HgRepository(Repository):
 	#	http://mercurial.selenic.com/wiki/MercurialApi
 
 	def revision (self):
 		return 'hg:' + str(self.repository['tip'])
 	
 
 	def areTherePendingChanges (self):
 		# TODO: FIXME: repository.status() does not report 'unknown(?)' files. :(
 		return not all(map(lambda fileList: len(fileList) == 0, self.repository.status()))
 
 
 #===================================================================