voussoir/cmd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Reduce number of unnecessary subprocesses with better conditions.

Browse source 
The code is a little uglier with more ifs and elses but saving
some subprocess calls is worth it.
This commit is contained in:
voussoir 2020-02-04 19:01:31 -08:00
parent 4652f9b745
commit 37093aebe6
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
gitcheckup.py
View file

@ -50,16 +50,23 @@ def checkup_pushed():
output = check_output(command) output = check_output(command)
(my_head, remote_head) = output.strip().decode().splitlines() (my_head, remote_head) = output.strip().decode().splitlines()
command = [GIT, 'merge-base', '@', '@{u}']
merge_base = check_output(command)
merge_base = merge_base.strip().decode()
if my_head == remote_head: if my_head == remote_head:
to_push = 0 to_push = 0
to_pull = 0 to_pull = 0
else: else:
to_push = len(git_commits_between(merge_base, my_head)) command = [GIT, 'merge-base', '@', '@{u}']
to_pull = len(git_commits_between(merge_base, remote_head)) merge_base = check_output(command)
merge_base = merge_base.strip().decode()
if my_head == merge_base:
to_push = 0
to_pull = len(git_commits_between(merge_base, remote_head))
elif remote_head == merge_base:
to_push = len(git_commits_between(merge_base, my_head))
to_pull = 0
else:
to_push = len(git_commits_between(merge_base, my_head))
to_pull = len(git_commits_between(merge_base, remote_head))
pushed = (to_push, to_pull) == (0, 0) pushed = (to_push, to_pull) == (0, 0)
details = types.SimpleNamespace( details = types.SimpleNamespace(