summaryrefslogtreecommitdiff
authorJosh <jokajak@gmail.com>2012-03-07 03:09:32 (UTC)
committer Josh <jokajak@gmail.com>2012-03-07 03:09:32 (UTC)
commit24f7bfcbe317fe9f0d7de7cef3cb3b3b341c95a5 (patch) (unidiff)
tree97493c18978af421dea50b3b0e9c11b5bec48f73
parentfc528c0f65192419ee54c2dc620d55a778660790 (diff)
downloadclipperz-24f7bfcbe317fe9f0d7de7cef3cb3b3b341c95a5.zip
clipperz-24f7bfcbe317fe9f0d7de7cef3cb3b3b341c95a5.tar.gz
clipperz-24f7bfcbe317fe9f0d7de7cef3cb3b3b341c95a5.tar.bz2
switch from dulwich to git-python
this fixes the areTherePendingChanges check
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--scripts/builder/repository.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/builder/repository.py b/scripts/builder/repository.py
index 7ea29bb..0efa10b 100644
--- a/scripts/builder/repository.py
+++ b/scripts/builder/repository.py
@@ -1,20 +1,20 @@
1#!/usr/bin/env python 1#!/usr/bin/env python
2# -*- coding: UTF-8 -*- 2# -*- coding: UTF-8 -*-
3 3
4 4
5def repositoryWithPath (path): 5def 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 ImportError: 11 except ImportError:
12 print "Failed to import dulwich, please install http://www.samba.org/~jelmer/dulwich/" 12 print "Failed to import git, please install http://gitorious.org/git-python"
13 except: 13 except:
14 from mercurial import ui, hg 14 from mercurial import ui, hg
15 15
16 repo = hg.repository(ui.ui(), path) 16 repo = hg.repository(ui.ui(), path)
17 result = HgRepository(repo, path) 17 result = HgRepository(repo, path)
18 18
19 return result 19 return result
20 20
@@ -47,21 +47,21 @@ class Repository(object):
47 47
48 48
49#=================================================================== 49#===================================================================
50 50
51 51
52class GitRepository(Repository): 52class GitRepository(Repository):
53 53
54 def revision (self): 54 def revision (self):
55 return self.repository.refs['HEAD'] 55 return self.repository.head.commit.hexsha
56 56
57 57
58 def areTherePendingChanges (self): 58 def areTherePendingChanges (self):
59 return repository.is_dirty() 59 return self.repository.is_dirty()
60 60
61 61
62#=================================================================== 62#===================================================================
63 63
64 64
65class HgRepository(Repository): 65class HgRepository(Repository):
66 #http://mercurial.selenic.com/wiki/MercurialApi 66 #http://mercurial.selenic.com/wiki/MercurialApi
67 67