Skip to content

Avoid exposing internal tuple in CommitList.marked #2638

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 29, 2025
Merged

Avoid exposing internal tuple in CommitList.marked #2638

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b71734
Document tuple used in CommitList.marked
peso Apr 29, 2025
e695b0d
Remove CommitList::marked() to avoid exposing internal structure
peso Apr 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions src/components/commitlist.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ pub struct CommitList {
items: ItemBatch,
highlights: Option<Rc<IndexSet<CommitId>>>,
commits: IndexSet<CommitId>,
/// The marked commits.
/// `self.marked[].0` holds the commit index into `self.items.items` - used for ordering the list.
/// `self.marked[].1` is the commit id of the marked commit.
marked: Vec<(usize, CommitId)>,
scroll_state: (Instant, f32),
tags: Option<Tags>,
Expand Down Expand Up @@ -114,15 +117,6 @@ impl CommitList {
self.marked.len()
}

///
#[expect(
clippy::missing_const_for_fn,
reason = "as of 1.86.0 clippy wants this to be const even though that breaks"
)]
pub fn marked(&self) -> &[(usize, CommitId)] {
&self.marked
}

///
pub fn clear_marked(&mut self) {
self.marked.clear();
Expand Down
8 changes: 4 additions & 4 deletions src/tabs/revlog.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -586,19 +586,19 @@ impl Component for Revlog {
self.queue.push(InternalEvent::OpenPopup(
StackablePopupOpen::CompareCommits(
InspectCommitOpen::new(
self.list.marked()[0].1,
self.list.marked_commits()[0],
),
),
));
return Ok(EventState::Consumed);
} else if self.list.marked_count() == 2 {
//compare two marked commits
let marked = self.list.marked();
let marked = self.list.marked_commits();
self.queue.push(InternalEvent::OpenPopup(
StackablePopupOpen::CompareCommits(
InspectCommitOpen {
commit_id: marked[0].1,
compare_id: Some(marked[1].1),
commit_id: marked[0],
compare_id: Some(marked[1]),
tags: None,
},
),
Expand Down
Loading