mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-18 18:27:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

evolution: use updated state when resolving descendants of orphans

Browse source 
Before this commit, when the `evolve()` evolved a stack of orphans, it
would use the evolve state from the beginning of the function to
calculate where they should go. That meant that only the bottom-most
orphan(s) would get evolved to their right place. This commit fixes
that by use the Transaction's evolution state.
This commit is contained in:
Martin von Zweigbergk 2020-12-23 16:00:10 -08:00
parent 0219dbb359
commit 66ba74cf5a
2 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
lib/src/evolution.rs
View file

@ -348,12 +348,18 @@ pub fn evolve(
listener: &mut dyn EvolveListener, listener: &mut dyn EvolveListener,
) { ) {
let store = tx.store().clone(); let store = tx.store().clone();
// TODO: update the state in the transaction
let state = tx.as_repo_mut().evolution_mut().state.clone();
// Resolving divergence can creates new orphans but not vice versa, so resolve // Resolving divergence can creates new orphans but not vice versa, so resolve
// divergence first. // divergence first.
for commit_ids in state.divergent_changes.values() { let divergent_changes: Vec<_> = tx
.as_repo_mut()
.evolution_mut()
.state
.divergent_changes
.values()
.cloned()
.collect();
for commit_ids in divergent_changes {
let commits: HashSet<Commit> = commit_ids let commits: HashSet<Commit> = commit_ids
.iter() .iter()
.map(|id| store.get_commit(&id).unwrap()) .map(|id| store.get_commit(&id).unwrap())
@ -361,7 +367,12 @@ pub fn evolve(
evolve_divergent_change(user_settings, &store, tx, listener, &commits); evolve_divergent_change(user_settings, &store, tx, listener, &commits);
} }
let orphans: HashSet<Commit> = state // Dom't reuse the state from above, since the divergence-resolution may have
// created new orphans, or resolved existing orphans.
let orphans: HashSet<Commit> = tx
.as_repo_mut()
.evolution_mut()
.state
.orphan_commits .orphan_commits
.iter() .iter()
.map(|id| store.get_commit(&id).unwrap()) .map(|id| store.get_commit(&id).unwrap())
@ -376,7 +387,7 @@ pub fn evolve(
commit commit
.parents() .parents()
.iter() .iter()
.filter(|commit| state.orphan_commits.contains(commit.id())) .filter(|commit| orphans.contains(commit))
.cloned() .cloned()
.collect::<Vec<_>>() .collect::<Vec<_>>()
}), }),
@ -389,8 +400,9 @@ pub fn evolve(
let old_parents = orphan.parents(); let old_parents = orphan.parents();
let mut new_parents = vec![]; let mut new_parents = vec![];
let mut ambiguous_new_parents = false; let mut ambiguous_new_parents = false;
let evolution = tx.as_repo_mut().evolution();
for old_parent in &old_parents { for old_parent in &old_parents {
let new_parent_candidates = state.new_parent(&store, old_parent.id()); let new_parent_candidates = evolution.new_parent(old_parent.id());
if new_parent_candidates.len() > 1 { if new_parent_candidates.len() > 1 {
ambiguous_new_parents = true; ambiguous_new_parents = true;
break; break;

9
lib/tests/test_evolution.rs
View file

@ -503,11 +503,10 @@ fn test_evolve_orphan(use_git: bool) {
assert_eq!(&listener.evolved_orphans[0].0, &child); assert_eq!(&listener.evolved_orphans[0].0, &child);
assert_eq!(&listener.evolved_orphans[0].1.parents(), &vec![rewritten]); assert_eq!(&listener.evolved_orphans[0].1.parents(), &vec![rewritten]);
assert_eq!(&listener.evolved_orphans[1].0, &grandchild); assert_eq!(&listener.evolved_orphans[1].0, &grandchild);
// TODO: the grandchild currently doesn't get rebased onto the rewritten child assert_eq!(
// assert_eq!( &listener.evolved_orphans[1].1.parents(),
// &listener.evolved_orphans[1].1.parents(), &vec![listener.evolved_orphans[0].1.clone()]
// &vec![listener.evolved_orphans[0].1.clone()] );
// );
tx.discard(); tx.discard();
} }