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
|
#!/usr/bin/env python
# -*- coding: utf-8 -*-
import sys, os
import subprocess, argparse, tempfile
import indent
def run(cmd):
proc = subprocess.Popen(cmd, stdout=subprocess.PIPE)
rv = proc.communicate("")[0].decode("UTF-8")
proc.wait()
return rv
clangfmt = run(["git", "show", "master:.clang-format"])
argp = argparse.ArgumentParser(description="git whitespace-fixing tool")
argp.add_argument("branch", metavar="BRANCH", type=str, nargs="?", default="HEAD")
args = argp.parse_args()
branch = args.branch
commit = run(["git", "rev-list", "-n", "1", branch, "--"]).strip()
# frr-3.1-dev = first commit that is on master but not on stable/3.0
masterid = run(["git", "rev-list", "-n", "1", "frr-3.1-dev", "--"]).strip()
masterbase = run(["git", "merge-base", commit, masterid]).strip()
if masterbase == masterid:
refbranch = "master"
else:
refbranch = "3.0"
sys.stderr.write("autodetected base: %s (can be 3.0 or master)\n" % refbranch)
beforeid = run(
["git", "rev-list", "-n", "1", "reindent-%s-before" % refbranch, "--"]
).strip()
afterid = run(
["git", "rev-list", "-n", "1", "reindent-%s-after" % refbranch, "--"]
).strip()
beforebase = run(["git", "merge-base", commit, beforeid]).strip()
afterbase = run(["git", "merge-base", commit, afterid]).strip()
if afterbase == afterid:
sys.stderr.write("this branch was already rebased\n")
sys.exit(1)
if beforebase != beforeid:
sys.stderr.write(
'you need to rebase your branch onto the tag "reindent-%s-before"\n' % refbranch
)
sys.exit(1)
revs = (
run(["git", "rev-list", "reindent-%s-before..%s" % (refbranch, commit)])
.strip()
.split("\n")
)
revs.reverse()
srcdir = os.getcwd()
tmpdir = tempfile.mkdtemp("frrindent")
os.chdir(tmpdir)
sys.stderr.write("using temporary directory %s; %d revisions\n" % (tmpdir, len(revs)))
run(["git", "clone", "-s", "-b", "reindent-%s-after" % refbranch, srcdir, "repo"])
os.chdir("repo")
with open(".clang-format", "w") as fd:
fd.write(clangfmt)
prev = beforeid
for rev in revs:
filestat = (
run(["git", "diff", "-z", "--name-status", prev, rev]).rstrip("\0").split("\0")
)
changes = zip(filestat[0::2], filestat[1::2])
sys.stderr.write("%s: %d files\n" % (rev, len(changes)))
for typ, name in changes:
if typ == "D":
run(["git", "rm", name])
elif typ in ["A", "M"]:
run(["git", "checkout", rev, "--", name])
if name.endswith(".c") or name.endswith(".h"):
for d in ["babeld/", "ldpd/", "nhrpd/"]:
if name.startswith(d):
break
else:
sys.stderr.write("\t%s\n" % name)
indent.wrap_file(name)
run(["git", "add", name])
run(["git", "commit", "-C", rev])
prev = rev
run(["git", "push", "origin", "HEAD:refs/heads/reindented-branch"])
sys.stderr.write('\n\n"reindented-branch" should now be OK.\n')
sys.stderr.write(
'you could use "git reset --hard reindented-branch" to set your current branch to the reindented output\n'
)
sys.stderr.write("\033[31;1mplease always double-check the output\033[m\n")
|
