/
git-fixup.py
executable file
·170 lines (141 loc) · 6.1 KB
/
git-fixup.py
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
#!/usr/bin/env python
"""
git-fixup - Automate the workflow of 'git commit {--fixup,--squash}'
For each modified file, finds the latest commit X, that has changes
to the same file and commits the changes with 'git commit --fixup=X'.
Github:
https://github.com/ohmu/git-crust
License:
MIT, https://github.com/ohmu/git-crust/LICENSE
Installation:
Link/move/symlink this script somewhere in your $PATH as "git-fixup".
Usage:
git fixup -h # Show help
git fixup # View changes
git fixup -a # Commit all changes
git fixup <file> [...] # Commit only some changes
git fixup -s # Commit with --squash instead of --fixup
git fixup -r # 'git rebase --autosquash -i' all fixup commits
# over the nearest possible commit
git fixup -e # Commit the changed as fixups to HEAD
Notes:
* Older git version do not handle "rebase --autosquash" properly when
there are commits that start with multiple levels of
"fixup! fixup! fixup! ...", etc. Upgrading to a more recent git version
helps (at least 1.9.1 and newer work ok).
"""
from __future__ import print_function
import logging
import subprocess
import optparse
import sys
class Error(Exception):
"""gix-fixup error"""
class Fixup(object):
"""git-fixup tool"""
def __init__(self):
self.log = logging.getLogger("git-fixup")
def parse_args(self, args):
parser = optparse.OptionParser()
parser.add_option("-a", "--all", action="store_true",
help="commit all changes")
parser.add_option("-d", "--diff", action="store_true",
help="show diff of changes")
parser.add_option("-D", "--debug", action="store_true",
help="enable debug output")
parser.add_option("-n", "--no-commit", action="store_true",
help="just show the changes, do not commit")
parser.add_option("-s", "--squash", action="store_true",
help="use --squash=<commit> instead of --fixup=<commit>")
parser.add_option("-r", "--rebase", action="store_true",
help="rebase all fixup commits automatically")
parser.add_option("-e", "--head", action="store_true",
help="commit all changes as a fixup to HEAD")
return parser.parse_args()
def git(self, args, capture=True):
args = ["git"] + args
self.log.debug("git cmd: %r", args)
sub = subprocess.Popen(args,
stdout=subprocess.PIPE if capture else None,
stderr=subprocess.PIPE if capture else None)
stdout, stderr = sub.communicate()
if sub.returncode:
raise Error("command {0!r} failed with exit code {1!r}, "
"stdout={2!r}, stderr={3!r}".format(
args, sub.returncode, stdout, stderr))
return (stdout or b"").decode("utf-8").splitlines()
def changed_files(self):
for line in self.git(["status", "--short"]):
if line[1:2] != "M":
# we only handle modified files
continue
yield line[3:]
def fixup(self, files, commit=False, diff=False, squash=False):
changes = {}
desc = {}
for file_path in files:
entries = self.git(["log", "-n", "1", "--oneline",
"--decorate=no", "--", file_path])
if not entries:
raise Error("no previous commits for file {0}"
.format(file_path))
parent, title = entries[0].split(" ", 1)
children = changes.setdefault(parent, set())
children.add(file_path)
desc[parent] = title
for commit_id, desc in desc.items():
print(commit_id, desc)
for file_path in changes[commit_id]:
if diff:
for line in self.git(["--no-pager", "diff", file_path],
capture=False):
print(line)
else:
print(" ", file_path)
print()
if commit:
for commit_id, files in changes.items():
self.git(["commit", "--squash" if squash else "--fixup",
commit_id] + list(files), capture=False)
def rebase_all(self):
commits = [
line.split(" ", 1)
for line in self.git(["--no-pager", "log", "-n", "1000", "--oneline",
"--decorate=no"])
]
fixups = set(
[e[1].replace("fixup! ", "").replace("squash! ", "")
for e in commits
if e[1].startswith("fixup!") or e[1].startswith("squash!")]
)
self.log.debug("found fixup commits: %r", fixups)
if not fixups:
return
parents = [e for e in commits if e[1] in fixups]
self.log.debug("found parents: %r", parents)
if not parents:
raise Error("could not find target for fixup/squashes: {0!r}"
.format(fixups))
self.git(["rebase", "-i", "--autosquash", parents[-1][0] + "^"],
capture=False)
def main(self, args):
opt, files = self.parse_args(args)
logging.basicConfig(level=logging.DEBUG if opt.debug else logging.INFO)
try:
if opt.head:
print(self.git(["commit", "-a", "--fixup=HEAD"])[0])
elif (not opt.rebase) or opt.all:
ret = self.fixup(
files or self.changed_files(),
commit=(not opt.no_commit and (opt.all or files)),
diff=opt.diff, squash=opt.squash)
if ret:
return ret
if opt.rebase:
ret = self.rebase_all()
return ret
except Error as error:
print("ERROR: {0.__class__.__name__}: {0}".format(error))
return 1
if __name__ == "__main__":
sys.exit(Fixup().main(sys.argv[1:]))