author | Clipperz <info@clipperz.com> | 2013-01-09 11:24:13 (UTC) |
---|---|---|
committer | Clipperz <info@clipperz.com> | 2013-01-09 11:24:13 (UTC) |
commit | 6cfcbb8deeb99b0b88f5ce3b34a5c9aa1877dc57 (patch) (unidiff) | |
tree | ae7ed58da6d0f4ce64b7ae4a4ba3f7b1519471d3 /scripts | |
parent | f6903b9a5670370ef742a02092ab72e4227ddcd9 (diff) | |
parent | 0db1d5c8b18eadc4bd9cfc6603e86227fa94b5a9 (diff) | |
download | clipperz-6cfcbb8deeb99b0b88f5ce3b34a5c9aa1877dc57.zip clipperz-6cfcbb8deeb99b0b88f5ce3b34a5c9aa1877dc57.tar.gz clipperz-6cfcbb8deeb99b0b88f5ce3b34a5c9aa1877dc57.tar.bz2 |
Merge branch 'master' of github.com:clipperz/password-manager
Conflicts:
frontend/beta/css/yui-extensions/basic-dialog.css
-rw-r--r-- | scripts/builder/repository.py | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/scripts/builder/repository.py b/scripts/builder/repository.py index a47e249..7ac2324 100644 --- a/scripts/builder/repository.py +++ b/scripts/builder/repository.py | |||
@@ -1,43 +1,45 @@ | |||
1 | #!/usr/bin/env python | 1 | #!/usr/bin/env python |
2 | # -*- coding: UTF-8 -*- | 2 | # -*- coding: UTF-8 -*- |
3 | 3 | ||
4 | 4 | ||
5 | def repositoryWithPath (path): | 5 | def repositoryWithPath (path): |
6 | try: | 6 | try: |
7 | from mercurial import ui, hg | 7 | from mercurial import ui, hg |
8 | 8 | ||
9 | repo = hg.repository(ui.ui(), path) | 9 | repo = hg.repository(ui.ui(), path) |
10 | result = HgRepository(repo, path) | 10 | result = HgRepository(repo, path) |
11 | except: | 11 | except: |
12 | try: | 12 | try: |
13 | from git import Repo | 13 | from git import Repo |
14 | |||
15 | repo = Repo(path) | 14 | repo = Repo(path) |
16 | result = GitRepository(repo, path) | 15 | result = GitRepository(repo, path) |
16 | |||
17 | except ImportError, exception: | 17 | except ImportError, exception: |
18 | print "Failed to import git, please install http://gitorious.org/git-python" | 18 | print "Failed to import git, please install http://gitorious.org/git-python" |
19 | raise exception | 19 | raise exception |
20 | except: | ||
21 | result = SnapshotRepository('', path) | ||
20 | 22 | ||
21 | 23 | ||
22 | return result | 24 | return result |
23 | 25 | ||
24 | 26 | ||
25 | #=================================================================== | 27 | #=================================================================== |
26 | 28 | ||
27 | 29 | ||
28 | class Repository(object): | 30 | class Repository(object): |
29 | 31 | ||
30 | def __init__ (self, repository, path): | 32 | def __init__ (self, repository, path): |
31 | self.repository = repository | 33 | self.repository = repository |
32 | self.path = path | 34 | self.path = path |
33 | 35 | ||
34 | 36 | ||
35 | def revision (self): | 37 | def revision (self): |
36 | raise NotImplementedError() | 38 | raise NotImplementedError() |
37 | 39 | ||
38 | 40 | ||
39 | def areTherePendingChanges (self): | 41 | def areTherePendingChanges (self): |
40 | raise NotImplementedError() | 42 | raise NotImplementedError() |
41 | 43 | ||
42 | 44 | ||
43 | def version (self): | 45 | def version (self): |
@@ -65,24 +67,31 @@ class GitRepository(Repository): | |||
65 | def areTherePendingChanges (self): | 67 | def areTherePendingChanges (self): |
66 | try: | 68 | try: |
67 | return self.repository.is_dirty() | 69 | return self.repository.is_dirty() |
68 | except TypeError, te: | 70 | except TypeError, te: |
69 | return self.repository.is_dirty | 71 | return self.repository.is_dirty |
70 | 72 | ||
71 | 73 | ||
72 | 74 | ||
73 | #=================================================================== | 75 | #=================================================================== |
74 | 76 | ||
75 | 77 | ||
76 | class HgRepository(Repository): | 78 | class HgRepository(Repository): |
77 | #http://mercurial.selenic.com/wiki/MercurialApi | 79 | #http://mercurial.selenic.com/wiki/MercurialApi |
78 | 80 | ||
79 | def revision (self): | 81 | def revision (self): |
80 | return 'hg:' + str(self.repository['tip']) | 82 | return 'hg:' + str(self.repository['tip']) |
81 | 83 | ||
82 | 84 | ||
83 | def areTherePendingChanges (self): | 85 | def areTherePendingChanges (self): |
84 | # TODO: FIXME: repository.status() does not report 'unknown(?)' files. :( | 86 | # TODO: FIXME: repository.status() does not report 'unknown(?)' files. :( |
85 | return not all(map(lambda fileList: len(fileList) == 0, self.repository.status())) | 87 | return not all(map(lambda fileList: len(fileList) == 0, self.repository.status())) |
86 | 88 | ||
87 | 89 | ||
88 | #=================================================================== | 90 | #=================================================================== |
91 | |||
92 | class SnapshotRepository(Repository): | ||
93 | def revision (self): | ||
94 | return 'SNAPSHOT' | ||
95 | |||
96 | def areTherePendingChanges (self): | ||
97 | return False | ||