-rw-r--r-- | backend/php/properties/php.properties.json | 4 | ||||
-rw-r--r-- | scripts/builder/repository.py | 10 |
2 files changed, 8 insertions, 6 deletions
diff --git a/backend/php/properties/php.properties.json b/backend/php/properties/php.properties.json index 8ce703a..dd25b09 100644 --- a/backend/php/properties/php.properties.json +++ b/backend/php/properties/php.properties.json | |||
@@ -1,9 +1,9 @@ | |||
1 | { | 1 | { |
2 | "request.path": "index.php", | 2 | "request.path": "index.php", |
3 | "should.pay.toll": "false" | 3 | "should.pay.toll": "false", |
4 | 4 | ||
5 | "development.settings": { | 5 | "development.settings": { |
6 | "url": "http://localhost/php/clipperz" | 6 | "url": "http://localhost/php/clipperz" |
7 | } | 7 | } |
8 | 8 | ||
9 | } \ No newline at end of file | 9 | } |
diff --git a/scripts/builder/repository.py b/scripts/builder/repository.py index 9da98a2..f8528c2 100644 --- a/scripts/builder/repository.py +++ b/scripts/builder/repository.py | |||
@@ -3,13 +3,15 @@ | |||
3 | 3 | ||
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) |
15 | result = HgRepository(repo, path) | 17 | result = HgRepository(repo, path) |
@@ -49,10 +51,10 @@ class Repository(object): | |||
49 | 51 | ||
50 | class GitRepository(Repository): | 52 | class GitRepository(Repository): |
51 | 53 | ||
52 | def revision (self): | 54 | def revision (self): |
53 | return self.repository.refs['HEAD'] | 55 | return self.repository.head.commit.hexsha |
54 | 56 | ||
55 | 57 | ||
56 | def areTherePendingChanges (self): | 58 | def areTherePendingChanges (self): |
57 | return self.repository.is_dirty() | 59 | return self.repository.is_dirty() |
58 | 60 | ||