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

DescendantRebaser: change rebased() method to into_map() that consumes the rebaser

Browse source 
This prevents a clone and does not affect the public API, as suggested
in https://github.com/martinvonz/jj/pull/2738#discussion_r1438903463.
This commit is contained in:
Ilya Grigoriev 2024-01-01 18:47:24 -08:00
parent ddec3f91b2
commit 6edaa97517
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/src/repo.rs
View file

@ -914,7 +914,7 @@ impl MutableRepo {
) -> Result<usize, TreeMergeError> { ) -> Result<usize, TreeMergeError> {
let result = self let result = self
.rebase_descendants_return_rebaser(settings, options)? .rebase_descendants_return_rebaser(settings, options)?
.map_or(0, |rebaser| rebaser.rebased().len()); .map_or(0, |rebaser| rebaser.into_map().len());
self.clear_descendant_rebaser_plans(); self.clear_descendant_rebaser_plans();
Ok(result) Ok(result)
} }
@ -942,7 +942,7 @@ impl MutableRepo {
// enough information to describe the results of a rebase if some commits got // enough information to describe the results of a rebase if some commits got
// abandoned // abandoned
.rebase_descendants_return_rebaser(settings, options)? .rebase_descendants_return_rebaser(settings, options)?
.map_or(HashMap::new(), |rebaser| rebaser.rebased().clone())); .map_or(HashMap::new(), |rebaser| rebaser.into_map()));
self.clear_descendant_rebaser_plans(); self.clear_descendant_rebaser_plans();
result result
} }

4
lib/src/rewrite.rs
View file

@ -381,8 +381,8 @@ impl<'settings, 'repo> DescendantRebaser<'settings, 'repo> {
/// Returns a map from `CommitId` of old commit to new commit. Includes the /// Returns a map from `CommitId` of old commit to new commit. Includes the
/// commits rebase so far. Does not include the inputs passed to /// commits rebase so far. Does not include the inputs passed to
/// `rebase_descendants`. /// `rebase_descendants`.
pub fn rebased(&self) -> &HashMap<CommitId, CommitId> { pub fn into_map(self) -> HashMap<CommitId, CommitId> {
&self.rebased self.rebased
} }
/// Panics if `parent_mapping` contains cycles /// Panics if `parent_mapping` contains cycles