summaryrefslogtreecommitdiff
authorJosh <jokajak@gmail.com>2012-03-06 15:47:34 (UTC)
committer Josh <jokajak@gmail.com>2012-03-06 15:47:34 (UTC)
commitfc528c0f65192419ee54c2dc620d55a778660790 (patch) (side-by-side diff)
tree66663322a7bbc9a4c58f04f8f2fab89992a0426b
parent5115ce2faf3efdf2bec242d9c37d0524bf341a94 (diff)
downloadclipperz-fc528c0f65192419ee54c2dc620d55a778660790.zip
clipperz-fc528c0f65192419ee54c2dc620d55a778660790.tar.gz
clipperz-fc528c0f65192419ee54c2dc620d55a778660790.tar.bz2
fix GitRepository revision function
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--scripts/builder/repository.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/builder/repository.py b/scripts/builder/repository.py
index f3f7d6f..7ea29bb 100644
--- a/scripts/builder/repository.py
+++ b/scripts/builder/repository.py
@@ -7,71 +7,71 @@ def repositoryWithPath (path):
from dulwich.repo import Repo
repo = Repo(path)
result = GitRepository(repo, path)
except ImportError:
print "Failed to import dulwich, please install http://www.samba.org/~jelmer/dulwich/"
except:
from mercurial import ui, hg
repo = hg.repository(ui.ui(), path)
result = HgRepository(repo, path)
return result
#===================================================================
class Repository(object):
def __init__ (self, repository, path):
self.repository = repository
self.path = path
def revision (self):
raise NotImplementedError()
def areTherePendingChanges (self):
raise NotImplementedError()
def version (self):
result = self.revision()
if self.areTherePendingChanges():
result = '>>> ' + result + ' <<<'
# print "VERSION: " + result
return result
#===================================================================
class GitRepository(Repository):
def revision (self):
- return repository.refs['HEAD']
-
+ return self.repository.refs['HEAD']
+
def areTherePendingChanges (self):
return repository.is_dirty()
#===================================================================
class HgRepository(Repository):
# http://mercurial.selenic.com/wiki/MercurialApi
def revision (self):
return 'hg:' + str(self.repository['tip'])
def areTherePendingChanges (self):
# TODO: FIXME: repository.status() does not report 'unknown(?)' files. :(
return not all(map(lambda fileList: len(fileList) == 0, self.repository.status()))
#===================================================================