Improved build scripts
Improved the detection of the correct repository class to use. Signed-off-by: Giulio Cesare Solaroli <giulio.cesare@clipperz.com>
This commit is contained in:
		| @@ -4,17 +4,20 @@ | |||||||
|  |  | ||||||
| def repositoryWithPath (path): | def repositoryWithPath (path): | ||||||
| 	try: | 	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 | 		from mercurial import ui, hg | ||||||
|  |  | ||||||
| 		repo = hg.repository(ui.ui(), path) | 		repo = hg.repository(ui.ui(), path) | ||||||
| 		result = HgRepository(repo, 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 | 	return result | ||||||
|  |  | ||||||
| @@ -50,6 +53,7 @@ class Repository(object): | |||||||
|  |  | ||||||
|  |  | ||||||
| class GitRepository(Repository): | class GitRepository(Repository): | ||||||
|  | 	#	http://gitorious.org/git-python | ||||||
|  |  | ||||||
| 	def revision (self): | 	def revision (self): | ||||||
| 		return self.repository.head.commit.hexsha | 		return self.repository.head.commit.hexsha | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Giulio Cesare Solaroli
					Giulio Cesare Solaroli