remove duplicate code path as few will have git python installed

pull/811/merge
Michael DeHaan 12 years ago
parent fde329fb9e
commit 51083e48e9

@ -39,12 +39,6 @@ try:
except ImportError: except ImportError:
from md5 import md5 as _md5 from md5 import md5 as _md5
try:
import git
HAS_GIT = True
except ImportError:
HAS_GIT = False
############################################################### ###############################################################
# UTILITY FUNCTIONS FOR COMMAND LINE TOOLS # UTILITY FUNCTIONS FOR COMMAND LINE TOOLS
############################################################### ###############################################################
@ -299,17 +293,11 @@ def _gitinfo():
result = None result = None
repo_path = os.path.join(os.path.dirname(__file__), '..', '..', '.git') repo_path = os.path.join(os.path.dirname(__file__), '..', '..', '.git')
if os.path.exists(repo_path): if os.path.exists(repo_path):
if HAS_GIT:
repo = git.Repo(repo_path)
head = repo.head
branch = head.reference.name
commit = head.commit.hexsha[:10]
else:
with open(os.path.join(repo_path, "HEAD")) as f: with open(os.path.join(repo_path, "HEAD")) as f:
branch = f.readline().split('/')[-1].rstrip("\n") branch = f.readline().split('/')[-1].rstrip("\n")
with open(os.path.join(repo_path, "refs", "heads", branch)) as f: with open(os.path.join(repo_path, "refs", "heads", branch)) as f:
commit = f.readline()[:10] commit = f.readline()[:10]
result = "({0}) [{1}]".format(branch, commit) result = "({0} {1})".format(branch, commit)
return result return result
def version(prog): def version(prog):

Loading…
Cancel
Save