Add a sort option popup to branch list view

CHANGELOG.md

@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+### Added
+* add sort_by popup to branchlist [[@UUGTech](https://github.com/UUGTech)]([#2146](https://github.com/extrawurst/gitui/issues/2146))
+
 ## [0.26.0+1] - 2024-04-14
 
 **0.26.1** 

Cargo.toml

@@ -49,6 +49,8 @@ serde = "1.0"
 shellexpand = "3.1"
 simplelog = { version = "0.12", default-features = false }
 struct-patch = "0.4"
+strum = "0.25"
+strum_macros = "0.25"
 syntect = { version = "5.2", default-features = false, features = [
  "parsing",
  "default-syntaxes",

asyncgit/Cargo.toml

@@ -13,6 +13,7 @@ keywords = ["git"]
 
 [dependencies]
 bitflags = "2"
+chrono = { version = "0.4", default-features = false, features = ["clock"] }
 crossbeam-channel = "0.5"
 dirs = "5.0"
 easy-cast = "0.5"

asyncgit/src/sync/branch/mod.rs

@@ -11,8 +11,10 @@ use crate::{
 	sync::{
  remotes::get_default_remote_for_push_in_repo,
  repository::repo, utils::get_head_repo, CommitId,
+ CommitSignature,
 	},
 };
+use chrono::{DateTime, Local, TimeZone};
 use git2::{Branch, BranchType, Repository};
 use scopetime::scope_time;
 use std::collections::HashSet;
@@ -92,6 +94,12 @@ pub struct BranchInfo {
 	///
 	pub top_commit: CommitId,
 	///
+	pub top_commit_time: i64,
+	///
+	pub top_commit_time_local: Option<DateTime<Local>>,
+	///
+	pub top_commit_author: String,
+	///
 	pub details: BranchDetails,
 }
 
@@ -181,13 +189,20 @@ pub fn get_branches_info(
  })
  };
 
+ let author = CommitSignature::from(&top_commit.author());
+
  Ok(BranchInfo {
  name: bytes2string(name_bytes)?,
  reference,
  top_commit_message: bytes2string(
  top_commit.summary_bytes().unwrap_or_default(),
  )?,
  top_commit: top_commit.id().into(),
+ top_commit_time: top_commit.time().seconds(),
+ top_commit_time_local: Local
+ .timestamp_opt(top_commit.time().seconds(), 0)
+ .earliest(),
+ top_commit_author: author.name,
  details,
  })
  })

src/app.rs

@@ -10,14 +10,15 @@ use crate::{
 	options::{Options, SharedOptions},
 	popup_stack::PopupStack,
 	popups::{
- AppOption, BlameFilePopup, BranchListPopup, CommitPopup,
- CompareCommitsPopup, ConfirmPopup, CreateBranchPopup,
- ExternalEditorPopup, FetchPopup, FileRevlogPopup,
- FuzzyFindPopup, HelpPopup, InspectCommitPopup,
- LogSearchPopupPopup, MsgPopup, OptionsPopup, PullPopup,
- PushPopup, PushTagsPopup, RenameBranchPopup, ResetPopup,
- RevisionFilesPopup, StashMsgPopup, SubmodulesListPopup,
- TagCommitPopup, TagListPopup,
+ AppOption, BlameFilePopup, BranchListPopup, BranchSortPopup,
+ CommitPopup, CompareCommitsPopup, ConfirmPopup,
+ CreateBranchPopup, ExternalEditorPopup, FetchPopup,
+ FileRevlogPopup, FuzzyFindPopup, HelpPopup,
+ InspectCommitPopup, LogSearchPopupPopup, MsgPopup,
+ OptionsPopup, PullPopup, PushPopup, PushTagsPopup,
+ RenameBranchPopup, ResetPopup, RevisionFilesPopup,
+ StashMsgPopup, SubmodulesListPopup, TagCommitPopup,
+ TagListPopup,
 	},
 	queue::{
  Action, AppTabs, InternalEvent, NeedsUpdate, Queue,
@@ -88,6 +89,7 @@ pub struct App {
 	create_branch_popup: CreateBranchPopup,
 	rename_branch_popup: RenameBranchPopup,
 	select_branch_popup: BranchListPopup,
+	sort_branch_popup: BranchSortPopup,
 	options_popup: OptionsPopup,
 	submodule_popup: SubmodulesListPopup,
 	tags_popup: TagListPopup,
@@ -196,6 +198,7 @@ impl App {
  submodule_popup: SubmodulesListPopup::new(&env),
  log_search_popup: LogSearchPopupPopup::new(&env),
  fuzzy_find_popup: FuzzyFindPopup::new(&env),
+ sort_branch_popup: BranchSortPopup::new(&env),
  do_quit: QuitState::None,
  cmdbar: RefCell::new(CommandBar::new(
  env.theme.clone(),
@@ -468,6 +471,7 @@ impl App {
  [
  log_search_popup,
  fuzzy_find_popup,
+ sort_branch_popup,
  msg_popup,
  confirm_popup,
  commit_popup,
@@ -517,6 +521,7 @@ impl App {
  reset_popup,
  create_branch_popup,
  rename_branch_popup,
+ sort_branch_popup,
  revision_files_popup,
  fuzzy_find_popup,
  log_search_popup,
@@ -803,6 +808,17 @@ impl App {
  flags
  .insert(NeedsUpdate::ALL | NeedsUpdate::COMMANDS);
  }
+ InternalEvent::OpenBranchSortPopup(sort_by) => {
+ self.sort_branch_popup.open(sort_by)?;
+ flags
+ .insert(NeedsUpdate::ALL | NeedsUpdate::COMMANDS);
+ }
+ InternalEvent::BranchListSort(sort_by) => {
+ self.select_branch_popup.change_sort_by(sort_by);
+ self.select_branch_popup.sort()?;
+ flags
+ .insert(NeedsUpdate::ALL | NeedsUpdate::COMMANDS);
+ }
  InternalEvent::OptionSwitched(o) => {
  match o {
  AppOption::StatusShowUntracked => {

src/components/mod.rs

@@ -18,6 +18,8 @@ pub use commitlist::CommitList;
 pub use cred::CredComponent;
 pub use diff::DiffComponent;
 pub use revision_files::RevisionFilesComponent;
+use strum::EnumIter;
+use strum_macros::{EnumCount, EnumIs};
 pub use syntax_text::SyntaxTextComponent;
 pub use textinput::{InputType, TextInputComponent};
 pub use utils::{
@@ -191,6 +193,16 @@ pub enum FuzzyFinderTarget {
 	Files,
 }
 
+#[derive(Copy, Clone, EnumCount, EnumIs, EnumIter)]
+pub enum BranchListSortBy {
+	BranchNameAsc,
+	BranchNameDesc,
+	LastCommitTimeDesc,
+	LastCommitTimeAsc,
+	LastCommitAuthorAsc,
+	LastCommitAuthorDesc,
+}
+
 impl EventState {
 	pub fn is_consumed(&self) -> bool {
  *self == Self::Consumed

src/keys/key_list.rs

@@ -108,6 +108,7 @@ pub struct KeysList {
 	pub open_file_tree: GituiKeyEvent,
 	pub file_find: GituiKeyEvent,
 	pub branch_find: GituiKeyEvent,
+	pub branch_sort: GituiKeyEvent,
 	pub force_push: GituiKeyEvent,
 	pub fetch: GituiKeyEvent,
 	pub pull: GituiKeyEvent,
@@ -205,6 +206,7 @@ impl Default for KeysList {
  open_file_tree: GituiKeyEvent::new(KeyCode::Char('F'), KeyModifiers::SHIFT),
  file_find: GituiKeyEvent::new(KeyCode::Char('f'), KeyModifiers::empty()),
  branch_find: GituiKeyEvent::new(KeyCode::Char('f'), KeyModifiers::empty()),
+ branch_sort: GituiKeyEvent::new(KeyCode::Char('S'), KeyModifiers::SHIFT),
  diff_hunk_next: GituiKeyEvent::new(KeyCode::Char('n'), KeyModifiers::empty()),
  diff_hunk_prev: GituiKeyEvent::new(KeyCode::Char('p'), KeyModifiers::empty()),
  stage_unstage_item: GituiKeyEvent::new(KeyCode::Enter, KeyModifiers::empty()),