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
335
336
337
338
339
|
// Copyright 2025 The Jujutsu Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
use std::slice;
use assert_matches::assert_matches;
use itertools::Itertools as _;
use jj_lib::backend::CommitId;
use jj_lib::evolution::walk_predecessors;
use jj_lib::evolution::CommitEvolutionEntry;
use jj_lib::evolution::WalkPredecessorsError;
use jj_lib::repo::ReadonlyRepo;
use jj_lib::repo::Repo as _;
use maplit::btreemap;
use testutils::commit_transactions;
use testutils::write_random_commit;
use testutils::TestRepo;
fn collect_predecessors(repo: &ReadonlyRepo, start_commit: &CommitId) -> Vec<CommitEvolutionEntry> {
walk_predecessors(repo, slice::from_ref(start_commit))
.try_collect()
.unwrap()
}
#[test]
fn test_walk_predecessors_basic() {
let test_repo = TestRepo::init();
let repo0 = test_repo.repo;
let root_commit = repo0.store().root_commit();
let mut tx = repo0.start_transaction();
let commit1 = write_random_commit(tx.repo_mut());
let repo1 = tx.commit("test").unwrap();
let mut tx = repo1.start_transaction();
let commit2 = tx
.repo_mut()
.rewrite_commit(&commit1)
.set_description("rewritten")
.write()
.unwrap();
tx.repo_mut().rebase_descendants().unwrap();
let repo2 = tx.commit("test").unwrap();
// The root commit has no associated operation because it isn't "created" at
// the root operation.
let entries = collect_predecessors(&repo2, root_commit.id());
assert_eq!(entries.len(), 1);
assert_eq!(entries[0].commit, root_commit);
assert_eq!(entries[0].operation.as_ref(), None);
assert_eq!(entries[0].predecessor_ids(), []);
let entries = collect_predecessors(&repo2, commit1.id());
assert_eq!(entries.len(), 1);
assert_eq!(entries[0].commit, commit1);
assert_eq!(entries[0].operation.as_ref(), Some(repo1.operation()));
assert_eq!(entries[0].predecessor_ids(), []);
let entries = collect_predecessors(&repo2, commit2.id());
assert_eq!(entries.len(), 2);
assert_eq!(entries[0].commit, commit2);
assert_eq!(entries[0].operation.as_ref(), Some(repo2.operation()));
assert_eq!(entries[0].predecessor_ids(), [commit1.id().clone()]);
assert_eq!(entries[1].commit, commit1);
assert_eq!(entries[1].operation.as_ref(), Some(repo1.operation()));
assert_eq!(entries[1].predecessor_ids(), []);
}
#[test]
fn test_walk_predecessors_basic_legacy_op() {
let test_repo = TestRepo::init();
let repo0 = test_repo.repo;
let loader = repo0.loader();
let mut tx = repo0.start_transaction();
let commit1 = write_random_commit(tx.repo_mut());
let repo1 = tx.commit("test").unwrap();
let mut tx = repo1.start_transaction();
let commit2 = tx
.repo_mut()
.rewrite_commit(&commit1)
.set_description("rewritten")
.write()
.unwrap();
tx.repo_mut().rebase_descendants().unwrap();
let repo2 = tx.commit("test").unwrap();
// Save operation without the predecessors as old jj would do. We only need
// to rewrite the head operation since walk_predecessors() will fall back to
// the legacy code path immediately.
let repo2 = {
let mut data = repo2.operation().store_operation().clone();
data.commit_predecessors = None;
let op_id = loader.op_store().write_operation(&data).unwrap();
let op = loader.load_operation(&op_id).unwrap();
loader.load_at(&op).unwrap()
};
let entries = collect_predecessors(&repo2, commit2.id());
assert_eq!(entries.len(), 2);
assert_eq!(entries[0].commit, commit2);
assert_eq!(entries[0].operation.as_ref(), None);
assert_eq!(entries[0].predecessor_ids(), [commit1.id().clone()]);
assert_eq!(entries[1].commit, commit1);
assert_eq!(entries[1].operation.as_ref(), None);
assert_eq!(entries[1].predecessor_ids(), []);
}
#[test]
fn test_walk_predecessors_concurrent_ops() {
let test_repo = TestRepo::init();
let repo0 = test_repo.repo;
let mut tx = repo0.start_transaction();
let commit1 = write_random_commit(tx.repo_mut());
let repo1 = tx.commit("test").unwrap();
let mut tx2 = repo1.start_transaction();
let commit2 = tx2
.repo_mut()
.rewrite_commit(&commit1)
.set_description("rewritten 2")
.write()
.unwrap();
tx2.repo_mut().rebase_descendants().unwrap();
let mut tx3 = repo1.start_transaction();
let commit3 = tx3
.repo_mut()
.rewrite_commit(&commit1)
.set_description("rewritten 3")
.write()
.unwrap();
tx3.repo_mut().rebase_descendants().unwrap();
let repo4 = commit_transactions(vec![tx2, tx3]);
let [op2, op3] = repo4
.operation()
.parents()
.map(Result::unwrap)
.collect_array()
.unwrap();
let mut tx = repo4.start_transaction();
let commit4 = tx
.repo_mut()
.rewrite_commit(&commit2)
.set_description("rewritten 4")
.write()
.unwrap();
let commit5 = tx
.repo_mut()
.rewrite_commit(&commit3)
.set_description("rewritten 5")
.write()
.unwrap();
tx.repo_mut().rebase_descendants().unwrap();
let repo5 = tx.commit("test").unwrap();
let entries = collect_predecessors(&repo5, commit4.id());
assert_eq!(entries.len(), 3);
assert_eq!(entries[0].commit, commit4);
assert_eq!(entries[0].operation.as_ref(), Some(repo5.operation()));
assert_eq!(entries[0].predecessor_ids(), [commit2.id().clone()]);
assert_eq!(entries[1].commit, commit2);
assert_eq!(entries[1].operation.as_ref(), Some(&op2));
assert_eq!(entries[1].predecessor_ids(), [commit1.id().clone()]);
assert_eq!(entries[2].commit, commit1);
assert_eq!(entries[2].operation.as_ref(), Some(repo1.operation()));
assert_eq!(entries[2].predecessor_ids(), []);
let entries = collect_predecessors(&repo5, commit5.id());
assert_eq!(entries.len(), 3);
assert_eq!(entries[0].commit, commit5);
assert_eq!(entries[0].operation.as_ref(), Some(repo5.operation()));
assert_eq!(entries[0].predecessor_ids(), [commit3.id().clone()]);
assert_eq!(entries[1].commit, commit3);
assert_eq!(entries[1].operation.as_ref(), Some(&op3));
assert_eq!(entries[1].predecessor_ids(), [commit1.id().clone()]);
assert_eq!(entries[2].commit, commit1);
assert_eq!(entries[2].operation.as_ref(), Some(repo1.operation()));
assert_eq!(entries[2].predecessor_ids(), []);
}
#[test]
fn test_walk_predecessors_multiple_predecessors_across_ops() {
let test_repo = TestRepo::init();
let repo0 = test_repo.repo;
let mut tx = repo0.start_transaction();
let commit1 = write_random_commit(tx.repo_mut());
let repo1 = tx.commit("test").unwrap();
let mut tx = repo1.start_transaction();
let commit2 = write_random_commit(tx.repo_mut());
let repo2 = tx.commit("test").unwrap();
let mut tx = repo2.start_transaction();
let commit3 = tx
.repo_mut()
.rewrite_commit(&commit2)
.set_predecessors(vec![commit2.id().clone(), commit1.id().clone()])
.set_description("rewritten")
.write()
.unwrap();
tx.repo_mut().rebase_descendants().unwrap();
let repo3 = tx.commit("test").unwrap();
// Predecessor commits are emitted in chronological (operation) order.
let entries = collect_predecessors(&repo3, commit3.id());
assert_eq!(entries.len(), 3);
assert_eq!(entries[0].commit, commit3);
assert_eq!(entries[0].operation.as_ref(), Some(repo3.operation()));
assert_eq!(
entries[0].predecessor_ids(),
[commit2.id().clone(), commit1.id().clone()]
);
assert_eq!(entries[1].commit, commit2);
assert_eq!(entries[1].operation.as_ref(), Some(repo2.operation()));
assert_eq!(entries[1].predecessor_ids(), []);
assert_eq!(entries[2].commit, commit1);
assert_eq!(entries[2].operation.as_ref(), Some(repo1.operation()));
assert_eq!(entries[2].predecessor_ids(), []);
}
#[test]
fn test_walk_predecessors_multiple_predecessors_within_op() {
let test_repo = TestRepo::init();
let repo0 = test_repo.repo;
let mut tx = repo0.start_transaction();
let commit1 = write_random_commit(tx.repo_mut());
let commit2 = write_random_commit(tx.repo_mut());
let repo1 = tx.commit("test").unwrap();
let mut tx = repo1.start_transaction();
let commit3 = tx
.repo_mut()
.rewrite_commit(&commit1)
.set_predecessors(vec![commit1.id().clone(), commit2.id().clone()])
.set_description("rewritten")
.write()
.unwrap();
tx.repo_mut().rebase_descendants().unwrap();
let repo2 = tx.commit("test").unwrap();
// Predecessor commits are emitted in reverse within operation.
let entries = collect_predecessors(&repo2, commit3.id());
assert_eq!(entries.len(), 3);
assert_eq!(entries[0].commit, commit3);
assert_eq!(entries[0].operation.as_ref(), Some(repo2.operation()));
assert_eq!(
entries[0].predecessor_ids(),
[commit1.id().clone(), commit2.id().clone()]
);
assert_eq!(entries[1].commit, commit2);
assert_eq!(entries[1].operation.as_ref(), Some(repo1.operation()));
assert_eq!(entries[1].predecessor_ids(), []);
assert_eq!(entries[2].commit, commit1);
assert_eq!(entries[2].operation.as_ref(), Some(repo1.operation()));
assert_eq!(entries[2].predecessor_ids(), []);
}
#[test]
fn test_walk_predecessors_transitive() {
let test_repo = TestRepo::init();
let repo0 = test_repo.repo;
let mut tx = repo0.start_transaction();
let commit1 = write_random_commit(tx.repo_mut());
let repo1 = tx.commit("test").unwrap();
let mut tx = repo1.start_transaction();
let commit2 = tx
.repo_mut()
.rewrite_commit(&commit1)
.set_description("rewritten 2")
.write()
.unwrap();
let commit3 = tx
.repo_mut()
.rewrite_commit(&commit2)
.set_description("rewritten 3")
.write()
.unwrap();
tx.repo_mut().rebase_descendants().unwrap();
let repo2 = tx.commit("test").unwrap();
let entries = collect_predecessors(&repo2, commit3.id());
assert_eq!(entries.len(), 3);
assert_eq!(entries[0].commit, commit3);
assert_eq!(entries[0].operation.as_ref(), Some(repo2.operation()));
assert_eq!(entries[0].predecessor_ids(), [commit2.id().clone()]);
assert_eq!(entries[1].commit, commit2);
assert_eq!(entries[1].operation.as_ref(), Some(repo2.operation()));
assert_eq!(entries[1].predecessor_ids(), [commit1.id().clone()]);
assert_eq!(entries[2].commit, commit1);
assert_eq!(entries[2].operation.as_ref(), Some(repo1.operation()));
assert_eq!(entries[2].predecessor_ids(), []);
}
#[test]
fn test_walk_predecessors_cycle_within_op() {
let test_repo = TestRepo::init();
let repo0 = test_repo.repo;
let loader = repo0.loader();
let mut tx = repo0.start_transaction();
let commit1 = write_random_commit(tx.repo_mut());
let commit2 = write_random_commit(tx.repo_mut());
let commit3 = write_random_commit(tx.repo_mut());
let repo1 = tx.commit("test").unwrap();
let repo1 = {
let mut data = repo1.operation().store_operation().clone();
data.commit_predecessors = Some(btreemap! {
commit1.id().clone() => vec![commit3.id().clone()],
commit2.id().clone() => vec![commit1.id().clone()],
commit3.id().clone() => vec![commit2.id().clone()],
});
let op_id = loader.op_store().write_operation(&data).unwrap();
let op = loader.load_operation(&op_id).unwrap();
loader.load_at(&op).unwrap()
};
assert_matches!(
walk_predecessors(&repo1, slice::from_ref(commit3.id())).next(),
Some(Err(WalkPredecessorsError::CycleDetected(_)))
);
}
|
