Struct jj_lib::rewrite::CommitRewriter

pub struct CommitRewriter<'repo> { /* private fields */ }

Helps rewrite a commit.

Implementations

impl<'repo> CommitRewriter<'repo>

pub fn new( mut_repo: &'repo mut MutableRepo, old_commit: Commit, new_parents: Vec<CommitId>, ) -> Self

Create a new instance.

pub fn mut_repo(&mut self) -> &mut MutableRepo

Returns the MutableRepo.

pub fn old_commit(&self) -> &Commit

The commit we’re rewriting.

pub fn new_parents(&self) -> &[CommitId]

Get the old commit’s intended new parents.

pub fn set_new_parents(&mut self, new_parents: Vec<CommitId>)

Set the old commit’s intended new parents.

pub fn set_new_rewritten_parents(&mut self, unrewritten_parents: &[CommitId])

Set the old commit’s intended new parents to be the rewritten versions of the given parents.

pub fn replace_parent<'a>( &mut self, old_parent: &CommitId, new_parents: impl IntoIterator<Item = &'a CommitId>, )

Update the intended new parents by replacing any occurrence of old_parent by new_parents.

pub fn parents_changed(&self) -> bool

Checks if the intended new parents are different from the old commit’s parents.

pub fn simplify_ancestor_merge(&mut self)

If a merge commit would end up with one parent being an ancestor of the other, then filter out the ancestor.

pub fn abandon(self)

Records the old commit as abandoned with the new parents.

pub fn rebase_with_empty_behavior( self, settings: &UserSettings, empty: EmptyBehaviour, ) -> BackendResult<Option<CommitBuilder<'repo>>>

Rebase the old commit onto the new parents. Returns a CommitBuilder for the new commit. Returns None if the commit was abandoned.

pub fn rebase( self, settings: &UserSettings, ) -> BackendResult<CommitBuilder<'repo>>

Rebase the old commit onto the new parents. Returns a CommitBuilder for the new commit.

pub fn reparent( self, settings: &UserSettings, ) -> BackendResult<CommitBuilder<'repo>>

Rewrite the old commit onto the new parents without changing its contents. Returns a CommitBuilder for the new commit.