| author | Josh <jokajak@gmail.com> | 2012-03-17 19:29:33 (UTC) |
|---|---|---|
| committer | Josh <jokajak@gmail.com> | 2012-03-17 19:29:33 (UTC) |
| commit | 0e396afdc4aa9ec8734ba48f90e9fefbad3b2b33 (patch) (side-by-side diff) | |
| tree | 2ace8ec32d24c1d34b4578fe9297c4e4b4b97720 /scripts/builder/repository.py | |
| parent | ff33328861685c1a2d5f9b729a2b3595509c38ee (diff) | |
| parent | 6f7ead0446aae6dd9f40b183e402b059a33d0517 (diff) | |
| download | clipperz-0e396afdc4aa9ec8734ba48f90e9fefbad3b2b33.zip clipperz-0e396afdc4aa9ec8734ba48f90e9fefbad3b2b33.tar.gz clipperz-0e396afdc4aa9ec8734ba48f90e9fefbad3b2b33.tar.bz2 | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'scripts/builder/repository.py') (more/less context) (ignore whitespace changes)
| -rw-r--r-- | scripts/builder/repository.py | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/scripts/builder/repository.py b/scripts/builder/repository.py index 0efa10b..0045de7 100644 --- a/scripts/builder/repository.py +++ b/scripts/builder/repository.py @@ -1,25 +1,28 @@ #!/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): @@ -45,16 +48,17 @@ class Repository(object): # 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() |