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
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
|
# pylint: skip-file
import pytest
from conftest import *
def interactive_reorder_helper(repo, cwd):
bash(
"""
echo "hello, world" > file1
git add file1
git commit -m "commit one"
echo "second file" > file2
git add file2
git commit -m "commit two"
echo "new line!" >> file1
git add file1
git commit -m "commit three"
"""
)
prev = repo.get_commit("HEAD")
prev_u = prev.parent()
prev_uu = prev_u.parent()
with editor_main(["-i", "HEAD~~"], cwd=cwd) as ed:
with ed.next_file() as f:
assert f.startswith_dedent(
f"""\
pick {prev.parent().oid.short()} commit two
pick {prev.oid.short()} commit three
"""
)
f.replace_dedent(
f"""\
pick {prev.oid.short()} commit three
pick {prev.parent().oid.short()} commit two
"""
)
curr = repo.get_commit("HEAD")
curr_u = curr.parent()
curr_uu = curr_u.parent()
assert curr != prev
assert curr.tree() == prev.tree()
assert curr_u.message == prev.message
assert curr.message == prev_u.message
assert curr_uu == prev_uu
assert b"file2" in prev_u.tree().entries
assert b"file2" not in curr_u.tree().entries
assert prev_u.tree().entries[b"file2"] == curr.tree().entries[b"file2"]
assert prev_u.tree().entries[b"file1"] == curr_uu.tree().entries[b"file1"]
assert prev.tree().entries[b"file1"] == curr_u.tree().entries[b"file1"]
def test_interactive_reorder(repo):
interactive_reorder_helper(repo, cwd=repo.workdir)
def test_interactive_reorder_subdir(repo):
bash("mkdir subdir")
interactive_reorder_helper(repo, cwd=repo.workdir / "subdir")
def test_interactive_on_root(repo):
bash(
"""
echo "hello, world" > file1
git add file1
git commit -m "commit one"
echo "second file" > file2
git add file2
git commit -m "commit two"
echo "new line!" >> file1
git add file1
git commit -m "commit three"
"""
)
orig_commit3 = prev = repo.get_commit("HEAD")
orig_commit2 = prev_u = prev.parent()
orig_commit1 = prev_u.parent()
index_tree = repo.index.tree()
with editor_main(["-i", "--root"]) as ed:
with ed.next_file() as f:
assert f.startswith_dedent(
f"""\
pick {prev.parent().parent().oid.short()} commit one
pick {prev.parent().oid.short()} commit two
pick {prev.oid.short()} commit three
"""
)
f.replace_dedent(
f"""\
pick {prev.parent().oid.short()} commit two
pick {prev.parent().parent().oid.short()} commit one
pick {prev.oid.short()} commit three
"""
)
new_commit3 = curr = repo.get_commit("HEAD")
new_commit1 = curr_u = curr.parent()
new_commit2 = curr_u.parent()
assert curr != prev
assert curr.tree() == index_tree
assert new_commit1.message == orig_commit1.message
assert new_commit2.message == orig_commit2.message
assert new_commit3.message == orig_commit3.message
assert new_commit2.is_root
assert new_commit1.parent() == new_commit2
assert new_commit3.parent() == new_commit1
assert new_commit1.tree().entries[b"file1"] == orig_commit1.tree().entries[b"file1"]
assert new_commit2.tree().entries[b"file2"] == orig_commit2.tree().entries[b"file2"]
assert new_commit3.tree() == orig_commit3.tree()
def test_interactive_fixup(repo):
bash(
"""
echo "hello, world" > file1
git add file1
git commit -m "commit one"
echo "second file" > file2
git add file2
git commit -m "commit two"
echo "new line!" >> file1
git add file1
git commit -m "commit three"
echo "extra" >> file3
git add file3
"""
)
prev = repo.get_commit("HEAD")
prev_u = prev.parent()
prev_uu = prev_u.parent()
index_tree = repo.index.tree()
with editor_main(["-i", "HEAD~~"]) as ed:
with ed.next_file() as f:
index = repo.index.commit()
assert f.startswith_dedent(
f"""\
pick {prev.parent().oid.short()} commit two
pick {prev.oid.short()} commit three
index {index.oid.short()} <git index>
"""
)
f.replace_dedent(
f"""\
pick {prev.oid.short()} commit three
fixup {index.oid.short()} <git index>
pick {prev.parent().oid.short()} commit two
"""
)
curr = repo.get_commit("HEAD")
curr_u = curr.parent()
curr_uu = curr_u.parent()
assert curr != prev
assert curr.tree() == index_tree
assert curr_u.message == prev.message
assert curr.message == prev_u.message
assert curr_uu == prev_uu
assert b"file2" in prev_u.tree().entries
assert b"file2" not in curr_u.tree().entries
assert b"file3" not in prev.tree().entries
assert b"file3" not in prev_u.tree().entries
assert b"file3" not in prev_uu.tree().entries
assert b"file3" in curr.tree().entries
assert b"file3" in curr_u.tree().entries
assert b"file3" not in curr_uu.tree().entries
assert curr.tree().entries[b"file3"].blob().body == b"extra\n"
assert curr_u.tree().entries[b"file3"].blob().body == b"extra\n"
assert prev_u.tree().entries[b"file2"] == curr.tree().entries[b"file2"]
assert prev_u.tree().entries[b"file1"] == curr_uu.tree().entries[b"file1"]
assert prev.tree().entries[b"file1"] == curr_u.tree().entries[b"file1"]
@pytest.mark.parametrize(
"rebase_config,revise_config,expected",
[
(None, None, False),
("1", "0", False),
("0", "1", True),
("1", None, True),
(None, "1", True),
],
)
def test_autosquash_config(repo, rebase_config, revise_config, expected):
bash(
"""
echo "hello, world" > file1
git add file1
git commit -m "commit one"
echo "second file" > file2
git add file2
git commit -m "commit two"
echo "new line!" >> file1
git add file1
git commit -m "commit three"
echo "extra line" >> file2
git add file2
git commit --fixup=HEAD~
"""
)
if rebase_config is not None:
bash(f"git config rebase.autoSquash '{rebase_config}'")
if revise_config is not None:
bash(f"git config revise.autoSquash '{revise_config}'")
head = repo.get_commit("HEAD")
headu = head.parent()
headuu = headu.parent()
disabled = f"""\
pick {headuu.oid.short()} commit two
pick {headu.oid.short()} commit three
pick {head.oid.short()} fixup! commit two
"""
enabled = f"""\
pick {headuu.oid.short()} commit two
fixup {head.oid.short()} fixup! commit two
pick {headu.oid.short()} commit three
"""
def subtest(args, expected_todos):
with editor_main(args + ["-i", "HEAD~3"]) as ed:
with ed.next_file() as f:
assert f.startswith_dedent(expected_todos)
f.replace_dedent(disabled) # don't mutate state
assert repo.get_commit("HEAD") == head
subtest([], enabled if expected else disabled)
subtest(["--autosquash"], enabled)
subtest(["--no-autosquash"], disabled)
def test_interactive_reword(repo):
bash(
"""
echo "hello, world" > file1
git add file1
git commit -m "commit one" -m "extended1"
echo "second file" > file2
git add file2
git commit -m "commit two" -m "extended2"
echo "new line!" >> file1
git add file1
git commit -m "commit three" -m "extended3"
"""
)
prev = repo.get_commit("HEAD")
prev_u = prev.parent()
prev_uu = prev_u.parent()
with editor_main(["-ie", "HEAD~~"]) as ed:
with ed.next_file() as f:
assert f.startswith_dedent(
f"""\
++ pick {prev.parent().oid.short()}
commit two
extended2
++ pick {prev.oid.short()}
commit three
extended3
"""
)
f.replace_dedent(
f"""\
++ pick {prev.oid.short()}
updated commit three
extended3 updated
++ pick {prev.parent().oid.short()}
updated commit two
extended2 updated
"""
)
curr = repo.get_commit("HEAD")
curr_u = curr.parent()
curr_uu = curr_u.parent()
assert curr != prev
assert curr.tree() == prev.tree()
assert curr_u.message == b"updated commit three\n\nextended3 updated\n"
assert curr.message == b"updated commit two\n\nextended2 updated\n"
assert curr_uu == prev_uu
assert b"file2" in prev_u.tree().entries
assert b"file2" not in curr_u.tree().entries
assert prev_u.tree().entries[b"file2"] == curr.tree().entries[b"file2"]
assert prev_u.tree().entries[b"file1"] == curr_uu.tree().entries[b"file1"]
assert prev.tree().entries[b"file1"] == curr_u.tree().entries[b"file1"]
|
