mirror of
https://github.com/martinvonz/jj.git
synced 2025-01-12 07:14:38 +00:00
8d090628c3
We had both `repo()` and `mut_repo()` on `Transaction` and I think it was easy to get confused and think that the former returned a `&ReadonlyRepo` but both of them actually return a reference to `MutableRepo` (the latter obviously returns a mutable reference). I hope that renaming to the more idiomatic `repo_mut()` will help clarify. We could instead have renamed them to `mut_repo()` and `mut_repo_mut()` but that seemed unnecessarily long. It would better match the `mut_repo` variables we typically use, though.
124 lines
4.3 KiB
Rust
124 lines
4.3 KiB
Rust
// Copyright 2024 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::collections::HashMap;
|
|
|
|
use jj_lib::repo::Repo;
|
|
use maplit::hashset;
|
|
use testutils::CommitGraphBuilder;
|
|
use testutils::TestRepo;
|
|
|
|
// Simulate some `jj sync` command that rebases B:: onto G while abandoning C
|
|
// (because it's presumably already in G).
|
|
//
|
|
// G
|
|
// | E
|
|
// | D F
|
|
// | |/
|
|
// | C
|
|
// | B
|
|
// |/
|
|
// A
|
|
#[test]
|
|
fn test_transform_descendants_sync() {
|
|
let settings = testutils::user_settings();
|
|
let test_repo = TestRepo::init();
|
|
let repo = &test_repo.repo;
|
|
|
|
let mut tx = repo.start_transaction(&settings);
|
|
let mut graph_builder = CommitGraphBuilder::new(&settings, tx.repo_mut());
|
|
let commit_a = graph_builder.initial_commit();
|
|
let commit_b = graph_builder.commit_with_parents(&[&commit_a]);
|
|
let commit_c = graph_builder.commit_with_parents(&[&commit_b]);
|
|
let commit_d = graph_builder.commit_with_parents(&[&commit_c]);
|
|
let commit_e = graph_builder.commit_with_parents(&[&commit_d]);
|
|
let commit_f = graph_builder.commit_with_parents(&[&commit_c]);
|
|
let commit_g = graph_builder.commit_with_parents(&[&commit_a]);
|
|
|
|
let mut rebased = HashMap::new();
|
|
tx.repo_mut()
|
|
.transform_descendants(&settings, vec![commit_b.id().clone()], |mut rewriter| {
|
|
rewriter.replace_parent(commit_a.id(), [commit_g.id()]);
|
|
if *rewriter.old_commit() == commit_c {
|
|
rewriter.abandon();
|
|
} else {
|
|
let old_commit_id = rewriter.old_commit().id().clone();
|
|
let new_commit = rewriter.rebase(&settings)?.write()?;
|
|
rebased.insert(old_commit_id, new_commit);
|
|
}
|
|
Ok(())
|
|
})
|
|
.unwrap();
|
|
assert_eq!(rebased.len(), 4);
|
|
let new_commit_b = rebased.get(commit_b.id()).unwrap();
|
|
let new_commit_d = rebased.get(commit_d.id()).unwrap();
|
|
let new_commit_e = rebased.get(commit_e.id()).unwrap();
|
|
let new_commit_f = rebased.get(commit_f.id()).unwrap();
|
|
|
|
assert_eq!(
|
|
*tx.repo_mut().view().heads(),
|
|
hashset! {
|
|
new_commit_e.id().clone(),
|
|
new_commit_f.id().clone(),
|
|
}
|
|
);
|
|
|
|
assert_eq!(new_commit_b.parent_ids(), vec![commit_g.id().clone()]);
|
|
assert_eq!(new_commit_d.parent_ids(), vec![new_commit_b.id().clone()]);
|
|
assert_eq!(new_commit_e.parent_ids(), vec![new_commit_d.id().clone()]);
|
|
assert_eq!(new_commit_f.parent_ids(), vec![new_commit_b.id().clone()]);
|
|
}
|
|
|
|
// Transform just commit C replacing parent A by parent B. The parents should be
|
|
// deduplicated.
|
|
//
|
|
// C
|
|
// /|
|
|
// B |
|
|
// |/
|
|
// A
|
|
#[test]
|
|
fn test_transform_descendants_sync_linearize_merge() {
|
|
let settings = testutils::user_settings();
|
|
let test_repo = TestRepo::init();
|
|
let repo = &test_repo.repo;
|
|
|
|
let mut tx = repo.start_transaction(&settings);
|
|
let mut graph_builder = CommitGraphBuilder::new(&settings, tx.repo_mut());
|
|
let commit_a = graph_builder.initial_commit();
|
|
let commit_b = graph_builder.commit_with_parents(&[&commit_a]);
|
|
let commit_c = graph_builder.commit_with_parents(&[&commit_a, &commit_b]);
|
|
|
|
let mut rebased = HashMap::new();
|
|
tx.repo_mut()
|
|
.transform_descendants(&settings, vec![commit_c.id().clone()], |mut rewriter| {
|
|
rewriter.replace_parent(commit_a.id(), [commit_b.id()]);
|
|
let old_commit_id = rewriter.old_commit().id().clone();
|
|
let new_commit = rewriter.rebase(&settings)?.write()?;
|
|
rebased.insert(old_commit_id, new_commit);
|
|
Ok(())
|
|
})
|
|
.unwrap();
|
|
assert_eq!(rebased.len(), 1);
|
|
let new_commit_c = rebased.get(commit_c.id()).unwrap();
|
|
|
|
assert_eq!(
|
|
*tx.repo_mut().view().heads(),
|
|
hashset! {
|
|
new_commit_c.id().clone(),
|
|
}
|
|
);
|
|
|
|
assert_eq!(new_commit_c.parent_ids(), vec![commit_b.id().clone()]);
|
|
}
|