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

Show number of unpushed commits thanks to new log command.

Browse source
This commit is contained in:
voussoir 2020-01-20 21:53:49 -08:00
parent 3c757fcba4
commit dff9152898
1 changed files with 35 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
gitcheckup.py
View file

@ -14,13 +14,13 @@ GIT = winwhich.which('git')
# A file4 # A file4
# ?? file3 # ?? file3
# Here is an example of typical `git log -1 --decorate` output: # Here is an example of typical `git log --oneline --branches --not --remotes` output:
# Only the commits that haven't been pushed to a remote are shown!
# Thank you cxreg https://stackoverflow.com/a/3338774
# #
# commit f8fddd0de4283a251a8beb35493bd1bd3a4c925a (HEAD -> master) # a755f32 Ready to publish
# Author: My Name <mymail@example.net> # 5602e1e Another commit message
# Date: Sat Jan 11 01:59:07 2020 -0800 # a32a372 My commit message
#
# I made some changes.
def checkup_committed(directory): def checkup_committed(directory):
os.chdir(directory) os.chdir(directory)
@ -48,22 +48,35 @@ def checkup_committed(directory):
details = '' details = ''
else: else:
committed = False committed = False
details = f'+{added}, -{deleted}, ~{modified}' details = f'(+{added}, -{deleted}, ~{modified})'
return (committed, details) return (committed, details)
def checkup_pushed(directory): def checkup_pushed(directory):
os.chdir(directory) os.chdir(directory)
command = [GIT, 'log', '-1', '--decorate'] command = [GIT, 'log', '--oneline', '--branches', '--not', '--remotes']
output = subprocess.check_output(command, stderr=subprocess.STDOUT) output = subprocess.check_output(command, stderr=subprocess.STDOUT)
headline = output.splitlines()[0]
refs = headline.split(b'(')[-1].split(b')')[0] commits = sum(1 for line in output.splitlines() if line.strip())
return any (b'/' in ref for ref in refs.split(b','))
if commits == 0:
pushed = True
details = ''
else:
pushed = False
details = f'(↑{commits})'
return (pushed, details)
def checkup(directory): def checkup(directory):
(committed, details) = checkup_committed(directory) (committed, commit_details) = checkup_committed(directory)
pushed = checkup_pushed(directory) (pushed, push_details) = checkup_pushed(directory)
return {'committed': committed, 'pushed': pushed, 'details': details} return {
'committed': committed,
'commit_details': commit_details,
'pushed': pushed,
'push_details': push_details,
}
def main(argv): def main(argv):
directories_file = os.path.join(os.path.dirname(__file__), 'gitcheckup.txt') directories_file = os.path.join(os.path.dirname(__file__), 'gitcheckup.txt')
@ -83,8 +96,14 @@ def main(argv):
result = checkup(directory) result = checkup(directory)
committed = 'C' if result['committed'] else ' ' committed = 'C' if result['committed'] else ' '
pushed = 'P' if result['pushed'] else ' ' pushed = 'P' if result['pushed'] else ' '
details = result['details']
details = f' ({details})' if details else '' details = []
if result['commit_details']:
details.append(result['commit_details'])
if result['push_details']:
details.append(result['push_details'])
details = ' '.join(details)
details = (' ' + details).rstrip()
print(f'[{committed}][{pushed}] {directory}{details}') print(f'[{committed}][{pushed}] {directory}{details}')
if __name__ == '__main__': if __name__ == '__main__':