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

rewrite: drop TODO about changing the API

Browse source 
The `rebase_next()` method is private, so I think we've addressed the
TODO.
This commit is contained in:
Martin von Zweigbergk 2024-01-27 08:44:42 -08:00 committed by Martin von Zweigbergk
parent becbc88915
commit 881d75e899
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/src/rewrite.rs
View file

@ -539,8 +539,6 @@ impl<'settings, 'repo> DescendantRebaser<'settings, 'repo> {
Ok(())
}
// TODO: Perhaps change the interface since it's not just about rebasing
// commits.
fn rebase_next(&mut self) -> Result<Option<RebasedDescendant>, TreeMergeError> {
while let Some(old_commit) = self.to_visit.pop() {
let old_commit_id = old_commit.id().clone();
@ -616,7 +614,6 @@ impl<'settings, 'repo> DescendantRebaser<'settings, 'repo> {
pub fn rebase_all(&mut self) -> Result<(), TreeMergeError> {
while self.rebase_next()?.is_some() {}
// TODO: As the TODO above says, we should probably change the API.
let mut view = self.mut_repo.view().store_view().clone();
for commit_id in &self.heads_to_remove {
view.head_ids.remove(commit_id);