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

repo: add a method for explicitly recording divergent rewrite

Browse source 
I plan to remove `record_rewritten_commit()` and instead make repeated
rewrites replace the rewrite state.
This commit is contained in:
Martin von Zweigbergk 2024-03-23 05:51:45 -07:00 committed by Martin von Zweigbergk
parent b54ace4954
commit af7ef4d04e
1 changed files with 25 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
lib/src/repo.rs
View file

@ -853,6 +853,24 @@ impl MutableRepo {
.insert(new_id);
}
/// Record a commit as being rewritten into multiple other commits in this
/// transaction.
///
/// A later call to `rebase_descendants()` will update branches pointing to
/// `old_id` be conflicted and pointing to all pf `new_ids`. Working
/// copies pointing to `old_id` will be updated to point to an arbitrary
/// commit in `new_ids` (TODO: make it point to the first one). Descendants
/// of `old_id` will be left alone.
pub fn set_divergent_rewrite(
&mut self,
old_id: CommitId,
new_ids: impl IntoIterator<Item = CommitId>,
) {
assert_ne!(old_id, *self.store().root_commit_id());
self.rewritten_commits
.insert(old_id, new_ids.into_iter().collect());
}
/// Record a commit as having been abandoned in this transaction.
///
/// This record is used by `rebase_descendants` to know which commits have
@ -1345,8 +1363,13 @@ impl MutableRepo {
rewritten_changes.insert(change_id);
}
for (old_commit, new_commits) in rewritten_commits {
for new_commit in new_commits {
self.record_rewritten_commit(old_commit.clone(), new_commit);
if new_commits.len() == 1 {
self.record_rewritten_commit(
old_commit.clone(),
new_commits.into_iter().next().unwrap(),
);
} else {
self.set_divergent_rewrite(old_commit.clone(), new_commits);
}
}