mirror of
http://git.whoc.org.uk/git/password-manager.git
synced 2025-10-24 17:27:35 +02:00
Merge branch 'buildScript' of https://github.com/jokajak/password-manager
Conflicts: scripts/builder/repository.py Signed-off-by: Giulio Cesare Solaroli <giulio.cesare@clipperz.com>
This commit is contained in:
@@ -4,11 +4,13 @@
|
||||
|
||||
def repositoryWithPath (path):
|
||||
try:
|
||||
from dulwich.repo import Repo
|
||||
from git import Repo
|
||||
|
||||
repo = Repo(path)
|
||||
result = GitRepository(repo, path)
|
||||
except:
|
||||
except ImportError:
|
||||
print "Failed to import git, please install http://gitorious.org/git-python"
|
||||
# except:
|
||||
from mercurial import ui, hg
|
||||
|
||||
repo = hg.repository(ui.ui(), path)
|
||||
@@ -50,8 +52,8 @@ class Repository(object):
|
||||
class GitRepository(Repository):
|
||||
|
||||
def revision (self):
|
||||
return self.repository.refs['HEAD']
|
||||
|
||||
return self.repository.head.commit.hexsha
|
||||
|
||||
|
||||
def areTherePendingChanges (self):
|
||||
return self.repository.is_dirty()
|
||||
|
||||
Reference in New Issue
Block a user