ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

repo: make record_rewritten_commit() accept only one replacement id

Browse source 
All callers now pass a single new commit and I would like to keep it
that way.
This commit is contained in:
Martin von Zweigbergk 2024-03-23 06:04:50 -07:00 committed by Martin von Zweigbergk
parent af7ef4d04e
commit e55168fa3e
2 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cli/src/commands/split.rs
View file

@ -149,7 +149,7 @@ don't make any changes, then the operation will be aborted.
// However, we want only the `second_commit` to inherit `commit`'s branches and // However, we want only the `second_commit` to inherit `commit`'s branches and
// descendants. // descendants.
tx.mut_repo() tx.mut_repo()
.set_rewritten_commit(commit.id().clone(), [second_commit.id().clone()]); .set_rewritten_commit(commit.id().clone(), second_commit.id().clone());
let num_rebased = tx.mut_repo().rebase_descendants(command.settings())?; let num_rebased = tx.mut_repo().rebase_descendants(command.settings())?;
if num_rebased > 0 { if num_rebased > 0 {
writeln!(ui.stderr(), "Rebased {num_rebased} descendant commits")?; writeln!(ui.stderr(), "Rebased {num_rebased} descendant commits")?;

14
lib/src/repo.rs
View file

@ -808,22 +808,16 @@ impl MutableRepo {
Ok(commit) Ok(commit)
} }
/// Record a commit as having been rewritten to one or more ids in this /// Record a commit as having been rewritten to another commit in this
/// transaction. /// transaction.
/// ///
/// This record is used by `rebase_descendants` to know which commits have /// This record is used by `rebase_descendants` to know which commits have
/// children that need to be rebased, and where to rebase them to. See the /// children that need to be rebased, and where to rebase them to. See the
/// docstring for `record_rewritten_commit` for details. /// docstring for `record_rewritten_commit` for details.
// TODO(ilyagr): Make this API saner, e.g. make `self.rewritten_commits` public pub fn set_rewritten_commit(&mut self, old_id: CommitId, new_id: CommitId) {
// and make empty values correspond to abandoned commits.
pub fn set_rewritten_commit(
&mut self,
old_id: CommitId,
new_ids: impl IntoIterator<Item = CommitId>,
) {
assert_ne!(old_id, *self.store().root_commit_id()); assert_ne!(old_id, *self.store().root_commit_id());
self.rewritten_commits self.rewritten_commits
.insert(old_id, new_ids.into_iter().collect()); .insert(old_id, std::iter::once(new_id).collect());
} }
/// Record a commit as having been rewritten in this transaction. If it was /// Record a commit as having been rewritten in this transaction. If it was
@ -1364,7 +1358,7 @@ impl MutableRepo {
} }
for (old_commit, new_commits) in rewritten_commits { for (old_commit, new_commits) in rewritten_commits {
if new_commits.len() == 1 { if new_commits.len() == 1 {
self.record_rewritten_commit( self.set_rewritten_commit(
old_commit.clone(), old_commit.clone(),
new_commits.into_iter().next().unwrap(), new_commits.into_iter().next().unwrap(),
); );