Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

check_git_status() Windows fix #2015

Merged
merged 7 commits into from
Jan 22, 2021
Merged

check_git_status() Windows fix #2015

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
23c6ed4
check_git_status() Windows fix
glenn-jocher Jan 22, 2021
23dcdfe
Update general.py
glenn-jocher Jan 22, 2021
fcb0c7e
Update general.py
glenn-jocher Jan 22, 2021
e4b24de
Update general.py
glenn-jocher Jan 22, 2021
6b12e6a
Update general.py
glenn-jocher Jan 22, 2021
31fb332
Update general.py
glenn-jocher Jan 22, 2021
b789fcc
Update general.py
glenn-jocher Jan 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions utils/general.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import logging
import math
import os
import platform
import random
import re
import subprocess
Expand Down Expand Up @@ -65,14 +66,15 @@ def check_git_status():
assert check_online(), 'skipping check (offline)'

cmd = 'git fetch && git config --get remote.origin.url' # github repo url
url = subprocess.check_output(cmd, shell=True).decode()[:-1]
cmd = 'git rev-list $(git rev-parse --abbrev-ref HEAD)..origin/master --count' # commits behind
n = int(subprocess.check_output(cmd, shell=True))
url = subprocess.check_output(cmd, shell=True).decode().rstrip()
branch = subprocess.check_output('git branch --show-current', shell=True).decode().rstrip() # current
n = int(subprocess.check_output(f'git rev-list {branch}..origin/master --count', shell=True)) # commits behind
if n > 0:
print(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.")
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."
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:
print(e)

Expand Down