Unverified 提交 1445ab2b authored 作者: Glenn Jocher's avatar Glenn Jocher 提交者: GitHub

check_git_status() Windows fix (#2015)

* check_git_status() Windows fix * Update general.py * Update general.py * Update general.py * Update general.py * Update general.py * Update general.py
上级 046c37e4
...@@ -4,6 +4,7 @@ import glob ...@@ -4,6 +4,7 @@ import glob
import logging import logging
import math import math
import os import os
import platform
import random import random
import re import re
import subprocess import subprocess
...@@ -65,14 +66,15 @@ def check_git_status(): ...@@ -65,14 +66,15 @@ def check_git_status():
assert check_online(), 'skipping check (offline)' assert check_online(), 'skipping check (offline)'
cmd = 'git fetch && git config --get remote.origin.url' # github repo url cmd = 'git fetch && git config --get remote.origin.url' # github repo url
url = subprocess.check_output(cmd, shell=True).decode()[:-1] url = subprocess.check_output(cmd, shell=True).decode().rstrip()
cmd = 'git rev-list $(git rev-parse --abbrev-ref HEAD)..origin/master --count' # commits behind branch = subprocess.check_output('git branch --show-current', shell=True).decode().rstrip() # current
n = int(subprocess.check_output(cmd, shell=True)) n = int(subprocess.check_output(f'git rev-list {branch}..origin/master --count', shell=True)) # commits behind
if n > 0: if n > 0:
print(f"⚠️ WARNING: code is out of date by {n} {'commits' if n > 1 else 'commmit'}. " s = f"⚠️ WARNING: code is out of date by {n} {'commits' if n > 1 else 'commmit'}. " \
f"Use 'git pull' to update or 'git clone {url}' to download latest.") f"Use 'git pull' to update or 'git clone {url}' to download latest."
else: else:
print(f'up to date with {url} ✅') s = f'up to date with {url} ✅'
print(s.encode().decode('ascii', 'ignore') if platform.system() == 'Windows' else s)
except Exception as e: except Exception as e:
print(e) print(e)
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论