author | Giulio Cesare Solaroli <giulio.cesare@solaroli.it> | 2012-03-17 14:43:30 (UTC) |
---|---|---|
committer | Giulio Cesare Solaroli <giulio.cesare@solaroli.it> | 2012-03-17 14:43:30 (UTC) |
commit | 58ec03cc3dba43ccd9826148b99bf3d7b8e97d8a (patch) (unidiff) | |
tree | c12d695420bb6281708b367d52970eac5615ef1c /scripts/builder/repository.py | |
parent | e7e021141d7906b537b3622ed706017f31222dfd (diff) | |
parent | e61e994abb9738d98447b203b9908793da6f560a (diff) | |
download | clipperz-58ec03cc3dba43ccd9826148b99bf3d7b8e97d8a.zip clipperz-58ec03cc3dba43ccd9826148b99bf3d7b8e97d8a.tar.gz clipperz-58ec03cc3dba43ccd9826148b99bf3d7b8e97d8a.tar.bz2 |
Merge pull request #31 from gcsolaroli/master
Updated build scripts
Diffstat (limited to 'scripts/builder/repository.py') (more/less context) (ignore whitespace changes)
-rw-r--r-- | scripts/builder/repository.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/scripts/builder/repository.py b/scripts/builder/repository.py index 89db9a5..f8528c2 100644 --- a/scripts/builder/repository.py +++ b/scripts/builder/repository.py | |||
@@ -4,11 +4,13 @@ | |||
4 | 4 | ||
5 | def repositoryWithPath (path): | 5 | def repositoryWithPath (path): |
6 | try: | 6 | try: |
7 | from dulwich.repo import Repo | 7 | from git import Repo |
8 | 8 | ||
9 | repo = Repo(path) | 9 | repo = Repo(path) |
10 | result = GitRepository(repo, path) | 10 | result = GitRepository(repo, path) |
11 | except: | 11 | except ImportError: |
12 | print "Failed to import git, please install http://gitorious.org/git-python" | ||
13 | #except: | ||
12 | from mercurial import ui, hg | 14 | from mercurial import ui, hg |
13 | 15 | ||
14 | repo = hg.repository(ui.ui(), path) | 16 | repo = hg.repository(ui.ui(), path) |
@@ -50,11 +52,11 @@ class Repository(object): | |||
50 | class GitRepository(Repository): | 52 | class GitRepository(Repository): |
51 | 53 | ||
52 | def revision (self): | 54 | def revision (self): |
53 | return repository.refs['HEAD'] | 55 | return self.repository.head.commit.hexsha |
54 | 56 | ||
55 | 57 | ||
56 | def areTherePendingChanges (self): | 58 | def areTherePendingChanges (self): |
57 | return repository.is_dirty() | 59 | return self.repository.is_dirty() |
58 | 60 | ||
59 | 61 | ||
60 | #=================================================================== | 62 | #=================================================================== |