rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change qute:version git commit to display hash

Browse Source 
Replaces output of git-describe

Closes #3095
This commit is contained in:
Jay Kamat 2017-10-13 21:33:03 -04:00
parent d411ec1eba
commit ee3d7463f6
No known key found for this signature in database
GPG Key ID: 5D2E399600F4F7B5
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
qutebrowser/utils/version.py
View File

@ -148,13 +148,18 @@ def _git_str_subprocess(gitpath):
if not os.path.isdir(os.path.join(gitpath, ".git")): if not os.path.isdir(os.path.join(gitpath, ".git")):
return None return None
try: try:
cid = subprocess.check_output( commit_hash = subprocess.check_output(
['git', 'describe', '--tags', '--dirty', '--always'], ['git',
'describe',
'--match=NeVeRmAtCh',
'--always',
'--abbrev=40',
'--dirty'],
cwd=gitpath).decode('UTF-8').strip() cwd=gitpath).decode('UTF-8').strip()
date = subprocess.check_output( date = subprocess.check_output(
['git', 'show', '-s', '--format=%ci', 'HEAD'], ['git', 'show', '-s', '--format=%ci', 'HEAD'],
cwd=gitpath).decode('UTF-8').strip() cwd=gitpath).decode('UTF-8').strip()
return '{} ({})'.format(cid, date) return '{} ({})'.format(commit_hash, date)
except (subprocess.CalledProcessError, OSError): except (subprocess.CalledProcessError, OSError):
return None return None

4
tests/unit/utils/test_version.py
View File

@ -356,7 +356,9 @@ class TestGitStrSubprocess:
def test_real_git(self, git_repo): def test_real_git(self, git_repo):
"""Test with a real git repository.""" """Test with a real git repository."""
ret = version._git_str_subprocess(str(git_repo)) ret = version._git_str_subprocess(str(git_repo))
assert ret == 'foobar (1970-01-01 01:00:00 +0100)' assert ret == \
'6e4b65a529c0ab78fb370c1527d5809f7436b8f3 ' \
+ '(1970-01-01 01:00:00 +0100)'
def test_missing_dir(self, tmpdir): def test_missing_dir(self, tmpdir):
"""Test with a directory which doesn't exist.""" """Test with a directory which doesn't exist."""