1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
|
#!/usr/bin/env python3
import os
import subprocess
import sys
from concurrent.futures import ThreadPoolExecutor
SAFEBRANCHES = ['master', 'develop', 'rc']
DEBUG = False
def dPrint(*args, **kwargs):
if DEBUG:
print(' '.join(map(str, args)), **kwargs)
def getStdout(command):
process = None
process = subprocess.run(command,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
if process.returncode != 0:
print('Failed to execute command:', command)
if process.stdout:
print(' Stdout:')
print(process.stdout.decode('UTF-8'))
if process.stderr:
print(' Stderr:')
print(process.stderr.decode('UTF-8'))
return ''
if process.stdout:
return process.stdout.decode('UTF-8').strip()
return ''
def getGitStdout(path, command):
dPrint('[ running', command, 'on', path, ']')
if isinstance(command, str):
cmd = 'git -C %s %s' % (path, command)
return getStdout(cmd.split())
if isinstance(command, list):
cmd = ['git', '-C', path]
cmd.extend(command)
return getStdout(cmd)
def findChanges(statusoutput):
dPrint('Parsing for changes:')
for line in statusoutput.split('\n'):
dPrint(' Status Line:', line)
if line.startswith('A ') or line.startswith('D ') or line.startswith('M '):
return True
return False
def updatePath(path):
friendly_path = os.path.basename(path)
dPrint('Repository:', path)
changed = findChanges(getGitStdout(path, 'status --porcelain'))
cur_branch = getGitStdout(path, 'rev-parse --abbrev-ref HEAD')
# Fetch changes, delete removed repositories
getGitStdout(path, 'fetch --all --prune')
# Go through branches and merge with upstream
branches = getGitStdout(path, [
'for-each-ref',
'--format=%(refname:short)#%(upstream)#%(upstream:track,nobracket)',
'refs/heads'
])
for branch in branches.split('\n'):
local_branch, upstream_branch, tracking = branch.split('#')
if not upstream_branch or tracking == 'gone':
print('[%s]' % friendly_path, local_branch, 'has no upstream branch.')
continue
dPrint('Update for', friendly_path, local_branch, upstream_branch)
local = getGitStdout(path, ['rev-parse', '--quiet', '--verify', local_branch])
remote = getGitStdout(path, ['rev-parse', '--quiet', '--verify', upstream_branch])
base = getGitStdout(path, ['merge-base', local_branch, upstream_branch])
dPrint(' Branch:', local_branch)
dPrint(' Upstream:', upstream_branch)
dPrint(' Local', local)
dPrint(' Remote', remote)
dPrint(' Base', base)
if local == remote:
continue
if local_branch == cur_branch and changed:
print('[%s]' % friendly_path, 'has a working branch with changes. Stashing.')
getGitStdout(path, ['stash', 'push', '--include-untracked', '--message', 'Automatic stash by updateGit.py'])
if local == base:
if local_branch == cur_branch:
getGitStdout(path, ['merge', remote])
local_short = getGitStdout(path, ['rev-parse', '--short', local])
remote_short = getGitStdout(path, ['rev-parse', '--short', remote])
shortstat = getGitStdout(path, ['diff', '--shortstat', local, remote])
shortlog = getGitStdout(path, ['log', '--pretty=format:… %s', '{}..{}'.format(local, remote)])
print('[%s]' % friendly_path, 'Updated branch', cur_branch, '{}..{}'.format(local_short, remote_short), "\n", shortstat)
print(shortlog)
else:
getGitStdout(path, ['branch', '-f', local_branch, remote])
shortstat = getGitStdout(path, ['diff', '--shortstat', local, remote])
shortlog = getGitStdout(path, ['log', '--pretty=format:… %s', '{}..{}'.format(local, remote)])
print('[%s] Updated branch %s:' % (friendly_path, cur_branch), '{}..{}'.format(local, remote), "\n", shortstat)
print(shortlog)
if remote == base:
print('[%s] %s is ahead. Consider pushing your changes.' % (friendly_path, local_branch))
continue
if local_branch == cur_branch and changed:
print('[%s]' % friendly_path, 'Reapplying stashed changes.')
getGitStdout(path, ['stash', 'pop'])
# Find safe branch (master/development/rc)
branches = getGitStdout(path, [
'for-each-ref',
'--format=%(refname:short)',
'refs/heads'
]).split('\n')
for branch in SAFEBRANCHES:
if branch in branches:
safe_branch = branch
break
# No safe branch found. What is this?
if not safe_branch:
print('Does the repository', friendly_path, 'not have any safe branch?')
return
# print('Safe branch:', safe_branch)
# Checkout master, if detached HEAD and not proceeded
if cur_branch == 'HEAD':
if changed:
print('[%s] Head detached, but changes found. Stash them to checkout %s.' % (
friendly_path,
safe_branch
))
else:
headrev = getGitStdout(path, 'rev-parse --quiet --verify HEAD')
mergerev = getGitStdout(path, ['merge-base', 'HEAD', safe_branch])
if headrev == mergerev:
print('[%s] Head detached, checking %s out.' % (friendly_path, safe_branch),
getGitStdout(path, 'checkout ' + safe_branch))
else:
print('[%s] Head detached, but not part of safe branch!' % friendly_path)
# Delete branches, that were already merged to master
merged_branches = getGitStdout(path, [
'branch',
'--format=%(refname:short)',
'--merged=%s' % safe_branch
]).split('\n')
# print('[%s]' % friendly_path, 'Deletion of branches', merged_branches, SAFEBRANCHES, cur_branch)
for merged_branch in merged_branches:
if merged_branch in SAFEBRANCHES:
continue
get_tracking_status = getGitStdout(path, [
'for-each-ref',
'--format=%(upstream:track,nobracket)',
'refs/heads/%s' % merged_branch
])
if merged_branch == cur_branch:
print("Checking out safe branch, as current is merged.")
getGitStdout(path, 'checkout ' + safe_branch)
if get_tracking_status.strip() == 'gone':
print('[%s]' % friendly_path, 'Removing branch by force, upstream is gone.')
print('[%s]' % friendly_path,
getGitStdout(path, ['branch', '-D', merged_branch]))
else:
print('[%s]' % friendly_path,
getGitStdout(path, ['branch', '-d', merged_branch]))
def main():
paths = []
if len(sys.argv) == 1:
paths.append('.')
else:
for path in sys.argv[1:]:
paths.append(path)
repos = []
for path in paths:
for subdir, dirs, _ in os.walk(path):
# dPrint(subdir, dir, files)
if '.git' in dirs:
repos.append(subdir)
if len(repos) == 0:
print('No repositories found.')
return
print('Updating', len(repos), 'repositories.')
# executor = ThreadPoolExecutor(max_workers=len(repos))
executor = ThreadPoolExecutor(max_workers=8)
for repo in repos:
# updatePath(subdir)
executor.submit(updatePath, repo)
executor.shutdown()
if __name__ == "__main__":
main()
|
