mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-18 18:27:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Transaction: rename as_repo_mut() to mut_repo()

Browse source 
I think the `as_` prefix of `as_repo_mut()` makes it sound like it
returns a view of the `Transaction`, but the `MutableRepo` is actually
a part of it. Also, the convention seems to be to put the `mut_` in
the name first if the function returns a name with a matching name
(like `MutableRepo` does).
This commit is contained in:
Martin von Zweigbergk 2021-03-13 23:31:00 -08:00
parent 7ea0c6a868
commit 82c683bf63
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/src/evolution.rs
View file

@ -484,7 +484,7 @@ pub fn evolve(
// Resolving divergence can creates new orphans but not vice versa, so resolve // Resolving divergence can creates new orphans but not vice versa, so resolve
// divergence first. // divergence first.
let divergent_changes: Vec<_> = tx let divergent_changes: Vec<_> = tx
.as_repo_mut() .mut_repo()
.evolution() .evolution()
.state .state
.non_obsoletes_by_changeid .non_obsoletes_by_changeid
@ -503,7 +503,7 @@ pub fn evolve(
// Dom't reuse the state from above, since the divergence-resolution may have // Dom't reuse the state from above, since the divergence-resolution may have
// created new orphans, or resolved existing orphans. // created new orphans, or resolved existing orphans.
let orphans: HashSet<Commit> = tx let orphans: HashSet<Commit> = tx
.as_repo_mut() .mut_repo()
.evolution() .evolution()
.state .state
.orphan_commits .orphan_commits
@ -533,7 +533,7 @@ pub fn evolve(
let old_parents = orphan.parents(); let old_parents = orphan.parents();
let mut new_parents = vec![]; let mut new_parents = vec![];
let mut ambiguous_new_parents = false; let mut ambiguous_new_parents = false;
let evolution = tx.as_repo_mut().evolution(); let evolution = tx.mut_repo().evolution();
for old_parent in &old_parents { for old_parent in &old_parents {
let new_parent_candidates = evolution.new_parent(old_parent.id()); let new_parent_candidates = evolution.new_parent(old_parent.id());
if new_parent_candidates.len() > 1 { if new_parent_candidates.len() > 1 {

2
lib/src/transaction.rs
View file

@ -56,7 +56,7 @@ impl<'r> Transaction<'r> {
self.repo.as_ref().unwrap().as_repo_ref() self.repo.as_ref().unwrap().as_repo_ref()
} }
pub fn as_repo_mut(&mut self) -> &mut MutableRepo<'r> { pub fn mut_repo(&mut self) -> &mut MutableRepo<'r> {
Arc::get_mut(self.repo.as_mut().unwrap()).unwrap() Arc::get_mut(self.repo.as_mut().unwrap()).unwrap()
} }