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

Add --pull option to gitcheckup.

Browse source
This commit is contained in:
voussoir 2020-08-12 12:21:00 -07:00
parent dbd21deb9e
commit ef3a4a830e
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gitcheckup.py
View file

@ -70,6 +70,10 @@ def git_merge_base():
command = [GIT, 'merge-base', '@', '@{u}'] command = [GIT, 'merge-base', '@', '@{u}']
return check_output(command) return check_output(command)
def git_pull():
command = [GIT, 'pull', '--all']
return check_output(command)
def git_rev_parse(rev): def git_rev_parse(rev):
command = [GIT, 'rev-parse', rev] command = [GIT, 'rev-parse', rev]
return check_output(command) return check_output(command)
@ -135,13 +139,16 @@ def checkup_pushed():
details.pushed = (details.to_push, details.to_pull) == (0, 0) details.pushed = (details.to_push, details.to_pull) == (0, 0)
return details return details
def gitcheckup(directory, do_fetch=False): def gitcheckup(directory, do_fetch=False, do_pull=False):
directory = os.path.abspath(directory) directory = os.path.abspath(directory)
os.chdir(directory) os.chdir(directory)
if do_fetch: if do_fetch:
git_fetch() git_fetch()
if do_pull:
git_pull()
try: try:
commit_details = checkup_committed() commit_details = checkup_committed()
push_details = checkup_pushed() push_details = checkup_pushed()
@ -180,13 +187,14 @@ def gitcheckup_argparse(args):
directories = read_directories_file() directories = read_directories_file()
for directory in directories: for directory in directories:
gitcheckup(directory, do_fetch=args.do_fetch) gitcheckup(directory, do_fetch=args.do_fetch, do_pull=args.do_pull)
def main(argv): def main(argv):
parser = argparse.ArgumentParser(description=__doc__) parser = argparse.ArgumentParser(description=__doc__)
parser.add_argument('directories', nargs='*') parser.add_argument('directories', nargs='*')
parser.add_argument('--fetch', dest='do_fetch', action='store_true') parser.add_argument('--fetch', dest='do_fetch', action='store_true')
parser.add_argument('--pull', dest='do_pull', action='store_true')
parser.set_defaults(func=gitcheckup_argparse) parser.set_defaults(func=gitcheckup_argparse)
args = parser.parse_args(argv) args = parser.parse_args(argv)