| -rw-r--r-- | scripts/builder/repository.py | 8 |
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,28 +1,28 @@ #!/usr/bin/env python # -*- coding: UTF-8 -*- def repositoryWithPath (path): try: - from dulwich.repo import Repo + from git import Repo repo = Repo(path) result = GitRepository(repo, path) except ImportError: - print "Failed to import dulwich, please install http://www.samba.org/~jelmer/dulwich/" + print "Failed to import git, please install http://gitorious.org/git-python" 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 @@ -39,37 +39,37 @@ class Repository(object): def version (self): result = self.revision() if self.areTherePendingChanges(): result = '>>> ' + result + ' <<<' # print "VERSION: " + result return result #=================================================================== class GitRepository(Repository): def revision (self): - return self.repository.refs['HEAD'] + return self.repository.head.commit.hexsha def areTherePendingChanges (self): - return repository.is_dirty() + return self.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())) |