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

repo: rename abandoned_commits to abandoned

Browse source 
This is just to match `DescendantRebaser`, to make the next commit a
bit simpler. I think `MutableRepo` still has few enough fields that
just `abandoned` is clear enough. Maybe we'll move the three
rewrite-related fields into a new struct at some point.
This commit is contained in:
Martin von Zweigbergk 2024-03-24 09:41:52 -07:00 committed by Martin von Zweigbergk
parent 6e3ceb4d1c
commit a6857a7a8f
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/src/repo.rs
View file

@ -736,7 +736,7 @@ pub struct MutableRepo {
/// Commits with a key in `parent_mapping` that have been divergently /// Commits with a key in `parent_mapping` that have been divergently
/// rewritten into all the commits indicated by the value. /// rewritten into all the commits indicated by the value.
divergent: HashSet<CommitId>, divergent: HashSet<CommitId>,
abandoned_commits: HashSet<CommitId>, abandoned: HashSet<CommitId>,
} }
impl MutableRepo { impl MutableRepo {
@ -753,7 +753,7 @@ impl MutableRepo {
view: DirtyCell::with_clean(mut_view), view: DirtyCell::with_clean(mut_view),
parent_mapping: Default::default(), parent_mapping: Default::default(),
divergent: Default::default(), divergent: Default::default(),
abandoned_commits: Default::default(), abandoned: Default::default(),
} }
} }
@ -770,7 +770,7 @@ impl MutableRepo {
} }
pub fn has_changes(&self) -> bool { pub fn has_changes(&self) -> bool {
!(self.abandoned_commits.is_empty() !(self.abandoned.is_empty()
&& self.parent_mapping.is_empty() && self.parent_mapping.is_empty()
&& self.view() == &self.base_repo.view) && self.view() == &self.base_repo.view)
} }
@ -853,17 +853,17 @@ impl MutableRepo {
/// `old_id` would be moved to the parent(s) of `old_id` as well. /// `old_id` would be moved to the parent(s) of `old_id` as well.
pub fn record_abandoned_commit(&mut self, old_id: CommitId) { pub fn record_abandoned_commit(&mut self, old_id: CommitId) {
assert_ne!(old_id, *self.store().root_commit_id()); assert_ne!(old_id, *self.store().root_commit_id());
self.abandoned_commits.insert(old_id); self.abandoned.insert(old_id);
} }
fn clear_descendant_rebaser_plans(&mut self) { fn clear_descendant_rebaser_plans(&mut self) {
self.parent_mapping.clear(); self.parent_mapping.clear();
self.divergent.clear(); self.divergent.clear();
self.abandoned_commits.clear(); self.abandoned.clear();
} }
pub fn has_rewrites(&self) -> bool { pub fn has_rewrites(&self) -> bool {
!(self.parent_mapping.is_empty() && self.abandoned_commits.is_empty()) !(self.parent_mapping.is_empty() && self.abandoned.is_empty())
} }
/// After the rebaser returned by this function is dropped, /// After the rebaser returned by this function is dropped,
@ -882,7 +882,7 @@ impl MutableRepo {
self, self,
self.parent_mapping.clone(), self.parent_mapping.clone(),
self.divergent.clone(), self.divergent.clone(),
self.abandoned_commits.clone(), self.abandoned.clone(),
); );
*rebaser.mut_options() = options; *rebaser.mut_options() = options;
rebaser.rebase_all()?; rebaser.rebase_all()?;