File tree Expand file tree Collapse file tree 2 files changed +7
-13
lines changed Expand file tree Collapse file tree 2 files changed +7
-13
lines changed Original file line number Diff line number Diff line change @@ -45,6 +45,9 @@ pub struct CommitList {
4545 items : ItemBatch ,
4646 highlights : Option < Rc < IndexSet < CommitId > > > ,
4747 commits : IndexSet < CommitId > ,
48+ /// The marked commits.
49+ /// `self.marked[].0` holds the commit index into `self.items.items` - used for ordering the list.
50+ /// `self.marked[].1` is the commit id of the marked commit.
4851 marked : Vec < ( usize , CommitId ) > ,
4952 scroll_state : ( Instant , f32 ) ,
5053 tags : Option < Tags > ,
@@ -114,15 +117,6 @@ impl CommitList {
114117 self . marked . len ( )
115118 }
116119
117- ///
118- #[ expect(
119- clippy:: missing_const_for_fn,
120- reason = "as of 1.86.0 clippy wants this to be const even though that breaks"
121- ) ]
122- pub fn marked ( & self ) -> & [ ( usize , CommitId ) ] {
123- & self . marked
124- }
125-
126120 ///
127121 pub fn clear_marked ( & mut self ) {
128122 self . marked . clear ( ) ;
Original file line number Diff line number Diff line change @@ -586,19 +586,19 @@ impl Component for Revlog {
586586 self . queue . push ( InternalEvent :: OpenPopup (
587587 StackablePopupOpen :: CompareCommits (
588588 InspectCommitOpen :: new (
589- self . list . marked ( ) [ 0 ] . 1 ,
589+ self . list . marked_commits ( ) [ 0 ] ,
590590 ) ,
591591 ) ,
592592 ) ) ;
593593 return Ok ( EventState :: Consumed ) ;
594594 } else if self . list . marked_count ( ) == 2 {
595595 //compare two marked commits
596- let marked = self . list . marked ( ) ;
596+ let marked = self . list . marked_commits ( ) ;
597597 self . queue . push ( InternalEvent :: OpenPopup (
598598 StackablePopupOpen :: CompareCommits (
599599 InspectCommitOpen {
600- commit_id : marked[ 0 ] . 1 ,
601- compare_id : Some ( marked[ 1 ] . 1 ) ,
600+ commit_id : marked[ 0 ] ,
601+ compare_id : Some ( marked[ 1 ] ) ,
602602 tags : None ,
603603 } ,
604604 ) ,
You can’t perform that action at this time.
0 commit comments