Skip to content

Commit

Permalink
rewrite: drop TODO about changing the API
Browse files Browse the repository at this point in the history
The `rebase_next()` method is private, so I think we've addressed the
TODO.
  • Loading branch information
martinvonz committed Jan 31, 2024
1 parent becbc88 commit 881d75e
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions lib/src/rewrite.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 881d75e

Please sign in to comment.