Skip to content

Squash commits in commit log #403

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

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Squash commits in commit log #403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d768127
Add ability to select multiple commits
WizardOhio24 Nov 5, 2020
729d5c2
Re-add Home and End selection
WizardOhio24 Nov 5, 2020
958d9f3
Remove unnecessary comment
WizardOhio24 Nov 5, 2020
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
98 changes: 65 additions & 33 deletions src/components/commitlist.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const ELEMENTS_PER_LINE: usize = 10;
///
pub struct CommitList {
title: String,
selection: usize,
selection: (usize, usize),
branch: Option<String>,
count_total: usize,
items: ItemBatch,
Expand All @@ -50,7 +50,7 @@ impl CommitList {
) -> Self {
Self {
items: ItemBatch::default(),
selection: 0,
selection: (0, 0),
branch: None,
count_total: 0,
scroll_state: (Instant::now(), 0_f32),
Expand All @@ -75,7 +75,7 @@ impl CommitList {

///
pub const fn selection(&self) -> usize {
self.selection
self.selection.0
}

///
Expand All @@ -86,8 +86,10 @@ impl CommitList {
///
pub fn set_count_total(&mut self, total: usize) {
self.count_total = total;
self.selection =
cmp::min(self.selection, self.selection_max());
self.selection = (
cmp::min(self.selection.0, self.selection_max()),
self.selection.1,
);
}

///
Expand Down Expand Up @@ -117,7 +119,9 @@ impl CommitList {
///
pub fn selected_entry(&self) -> Option<&LogEntry> {
self.items.iter().nth(
self.selection.saturating_sub(self.items.index_offset()),
self.selection
.0
.saturating_sub(self.items.index_offset()),
)
}

Expand All @@ -132,26 +136,43 @@ impl CommitList {
usize::from(self.current_size.get().1).saturating_sub(1);

let new_selection = match scroll {
ScrollType::Up => {
self.selection.saturating_sub(speed_int)
}
ScrollType::Down => {
self.selection.saturating_add(speed_int)
}
ScrollType::PageUp => {
self.selection.saturating_sub(page_offset)
ScrollType::Up => (
self.selection.1.saturating_sub(speed_int),
self.selection.1.saturating_sub(speed_int),
),
ScrollType::Down => (
self.selection.1.saturating_add(speed_int),
self.selection.1.saturating_add(speed_int),
),
ScrollType::ShiftUp => (
self.selection.0,
self.selection.1.saturating_sub(speed_int),
),
ScrollType::ShiftDown => (
self.selection.0,
self.selection.1.saturating_add(speed_int),
),
ScrollType::PageUp => (
self.selection.0.saturating_sub(page_offset),
self.selection.0.saturating_sub(page_offset),
),
ScrollType::PageDown => (
self.selection.0.saturating_add(page_offset),
self.selection.0.saturating_add(page_offset),
),
ScrollType::Home => (0, 0),
ScrollType::End => {
(self.selection_max(), self.selection_max())
}
ScrollType::PageDown => {
self.selection.saturating_add(page_offset)
}
ScrollType::Home => 0,
ScrollType::End => self.selection_max(),
};

let new_selection =
cmp::min(new_selection, self.selection_max());
let new_selection = (
cmp::min(new_selection.0, self.selection_max()),
cmp::min(new_selection.1, self.selection_max()),
);

let needs_update = new_selection != self.selection;
let needs_update = new_selection.0 != self.selection.0
|| new_selection.1 != self.selection.1;

self.selection = new_selection;

Expand Down Expand Up @@ -263,7 +284,11 @@ impl CommitList {
.map(|tags| tags.join(" "));
txt.push(Self::get_entry_to_add(
e,
idx + self.scroll_top.get() == selection,
(idx + self.scroll_top.get() >= selection.0
&& idx + self.scroll_top.get() <= selection.1)
|| (idx + self.scroll_top.get() <= selection.0
&& idx + self.scroll_top.get()
>= selection.1),
tags,
&self.theme,
width,
Expand All @@ -274,8 +299,15 @@ impl CommitList {
}

#[allow(clippy::missing_const_for_fn)]
fn relative_selection(&self) -> usize {
self.selection.saturating_sub(self.items.index_offset())
fn relative_selection(&self) -> (usize, usize) {
(
self.selection
.0
.saturating_sub(self.items.index_offset()),
self.selection
.1
.saturating_sub(self.items.index_offset()),
)
}
}

Expand All @@ -297,7 +329,7 @@ impl DrawableComponent for CommitList {
self.scroll_top.set(calc_scroll_top(
self.scroll_top.get(),
height_in_lines,
selection,
selection.0,
));

let branch_post_fix =
Expand All @@ -306,7 +338,7 @@ impl DrawableComponent for CommitList {
let title = format!(
"{} {}/{} {}",
self.title,
self.count_total.saturating_sub(self.selection),
self.count_total.saturating_sub(self.selection.0),
self.count_total,
branch_post_fix.as_deref().unwrap_or(""),
);
Expand Down Expand Up @@ -342,13 +374,13 @@ impl Component for CommitList {
self.move_selection(ScrollType::Up)?
} else if k == self.key_config.move_down {
self.move_selection(ScrollType::Down)?
} else if k == self.key_config.shift_up
|| k == self.key_config.home
{
} else if k == self.key_config.shift_up {
self.move_selection(ScrollType::ShiftUp)?
} else if k == self.key_config.shift_down {
self.move_selection(ScrollType::ShiftDown)?
} else if k == self.key_config.home {
self.move_selection(ScrollType::Home)?
} else if k == self.key_config.shift_down
|| k == self.key_config.end
{
} else if k == self.key_config.end {
self.move_selection(ScrollType::End)?
} else if k == self.key_config.page_up {
self.move_selection(ScrollType::PageUp)?
Expand Down
2 changes: 1 addition & 1 deletion src/components/diff.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,6 @@ impl DiffComponent {
ScrollType::Up => {
self.selection.get_top().saturating_sub(1)
}
ScrollType::Home => 0,
ScrollType::End => max,
ScrollType::PageDown => {
self.selection.get_bottom().saturating_add(
Expand All @@ -212,6 +211,7 @@ impl DiffComponent {
as usize,
)
}
ScrollType::Home | _ => 0,
};

let new_start = cmp::min(max, new_start);
Expand Down
2 changes: 2 additions & 0 deletions src/components/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,8 @@ pub enum ScrollType {
End,
PageUp,
PageDown,
ShiftUp,
ShiftDown,
}

#[derive(Copy, Clone)]
Expand Down