Add pop stash command on Staches tab

Author: brunogouveia

Diff for: assets/vim_style_key_config.ron

@@ -61,6 +61,7 @@
 
     stash_open: ( code: Char('l'), modifiers: ( bits: 0,),),
     stash_drop: ( code: Char('D'), modifiers: ( bits: 1,),),
+    stash_pop: ( code: Char('P'), modifiers: ( bits: 1,),),
 
     cmd_bar_toggle: ( code: Char('.'), modifiers: ( bits: 0,),),
     log_tag_commit: ( code: Char('t'), modifiers: ( bits: 0,),),

Diff for: asyncgit/src/sync/mod.rs

@@ -51,7 +51,9 @@ pub use remotes::{
 };
 pub use reset::{reset_stage, reset_workdir};
 pub use staging::{discard_lines, stage_lines};
-pub use stash::{get_stashes, stash_apply, stash_drop, stash_save};
+pub use stash::{
+    get_stashes, stash_apply, stash_drop, stash_pop, stash_save,
+};
 pub use state::{repo_state, RepoState};
 pub use tags::{get_tags, CommitTags, Tags};
 pub use utils::{

Diff for: asyncgit/src/sync/stash.rs

@@ -44,6 +44,28 @@ pub fn stash_drop(repo_path: &str, stash_id: CommitId) -> Result<()> {
     Ok(())
 }
 
+///
+pub fn stash_pop(
+    repo_path: &str,
+    stash_id: CommitId,
+    allow_conflicts: bool,
+) -> Result<()> {
+    scope_time!("stash_pop");
+
+    let mut repo = repo(repo_path)?;
+
+    let index = get_stash_index(&mut repo, stash_id.into())?;
+
+    let mut checkout = CheckoutBuilder::new();
+    checkout.allow_conflicts(allow_conflicts);
+
+    let mut opt = StashApplyOptions::default();
+    opt.checkout_options(checkout);
+    repo.stash_pop(index, Some(&mut opt))?;
+
+    Ok(())
+}
+
 ///
 pub fn stash_apply(
     repo_path: &str,

Diff for: src/app.rs

@@ -494,8 +494,8 @@ impl App {
                         flags.insert(NeedsUpdate::ALL);
                     }
                 }
-                Action::StashDrop(s) => {
-                    if StashList::drop(s) {
+                Action::StashDrop(_) | Action::StashPop(_) => {
+                    if StashList::action_confirmed(&action) {
                         flags.insert(NeedsUpdate::ALL);
                     }
                 }

Diff for: src/components/reset.rs

@@ -147,6 +147,10 @@ impl ResetComponent {
                     ),
                     strings::confirm_msg_stashdrop(&self.key_config),
                 ),
+                Action::StashPop(_) => (
+                    strings::confirm_title_stashpop(&self.key_config),
+                    strings::confirm_msg_stashpop(&self.key_config),
+                ),
                 Action::ResetHunk(_, _) => (
                     strings::confirm_title_reset(&self.key_config),
                     strings::confirm_msg_resethunk(&self.key_config),

Diff for: src/keys.rs

@@ -58,6 +58,7 @@ pub struct KeyConfig {
     pub stashing_toggle_index: KeyEvent,
     pub stash_open: KeyEvent,
     pub stash_drop: KeyEvent,
+    pub stash_pop: KeyEvent,
     pub cmd_bar_toggle: KeyEvent,
     pub log_tag_commit: KeyEvent,
     pub commit_amend: KeyEvent,
@@ -114,6 +115,7 @@ impl Default for KeyConfig {
 			stashing_toggle_index: KeyEvent { code: KeyCode::Char('i'), modifiers: KeyModifiers::empty()},
 			stash_open: KeyEvent { code: KeyCode::Right, modifiers: KeyModifiers::empty()},
 			stash_drop: KeyEvent { code: KeyCode::Char('D'), modifiers: KeyModifiers::SHIFT},
+			stash_pop: KeyEvent { code: KeyCode::Char('P'), modifiers: KeyModifiers::SHIFT},
 			cmd_bar_toggle: KeyEvent { code: KeyCode::Char('.'), modifiers: KeyModifiers::empty()},
 			log_tag_commit: KeyEvent { code: KeyCode::Char('t'), modifiers: KeyModifiers::empty()},
 			commit_amend: KeyEvent { code: KeyCode::Char('a'), modifiers: KeyModifiers::CONTROL},

Diff for: src/queue.rs

@@ -29,6 +29,7 @@ pub enum Action {
     ResetHunk(String, u64),
     ResetLines(String, Vec<DiffLinePosition>),
     StashDrop(CommitId),
+    StashPop(CommitId),
     DeleteBranch(String),
     ForcePush(String, bool),
     PullMerge { incoming: usize, rebase: bool },

Diff for: src/strings.rs

@@ -96,6 +96,11 @@ pub fn confirm_title_stashdrop(
 ) -> String {
     "Drop".to_string()
 }
+pub fn confirm_title_stashpop(
+    _key_config: &SharedKeyConfig,
+) -> String {
+    "Pop".to_string()
+}
 pub fn confirm_title_merge(
     _key_config: &SharedKeyConfig,
     rebase: bool,
@@ -134,6 +139,10 @@ pub fn confirm_msg_stashdrop(
 ) -> String {
     "confirm stash drop?".to_string()
 }
+pub fn confirm_msg_stashpop(_key_config: &SharedKeyConfig) -> String {
+    "The stash will be applied and then remove from the stash list. Confirm stash pop?"
+        .to_string()
+}
 pub fn confirm_msg_resethunk(
     _key_config: &SharedKeyConfig,
 ) -> String {
@@ -766,6 +775,18 @@ pub mod commands {
             CMD_GROUP_STASHES,
         )
     }
+    pub fn stashlist_pop(
+        key_config: &SharedKeyConfig,
+    ) -> CommandText {
+        CommandText::new(
+            format!(
+                "Pop [{}]",
+                key_config.get_hint(key_config.stash_pop),
+            ),
+            "pop selected stash",
+            CMD_GROUP_STASHES,
+        )
+    }
     pub fn stashlist_inspect(
         key_config: &SharedKeyConfig,
     ) -> CommandText {

Diff for: src/tabs/stashlist.rs

@@ -10,7 +10,7 @@ use crate::{
 };
 use anyhow::Result;
 use asyncgit::{
-    sync::{self, CommitId},
+    sync::{self},
     CWD,
 };
 use crossterm::event::Event;
@@ -83,6 +83,14 @@ impl StashList {
         }
     }
 
+    fn pop_stash(&mut self) {
+        if let Some(e) = self.list.selected_entry() {
+            self.queue.borrow_mut().push_back(
+                InternalEvent::ConfirmAction(Action::StashPop(e.id)),
+            );
+        }
+    }
+
     fn inspect(&mut self) {
         if let Some(e) = self.list.selected_entry() {
             self.queue
@@ -91,9 +99,17 @@ impl StashList {
         }
     }
 
-    ///
-    pub fn drop(id: CommitId) -> bool {
-        sync::stash_drop(CWD, id).is_ok()
+    /// Called when a pending stash action has been confirmed
+    pub fn action_confirmed(action: &Action) -> bool {
+        match *action {
+            Action::StashDrop(id) => {
+                sync::stash_drop(CWD, id).is_ok()
+            }
+            Action::StashPop(id) => {
+                sync::stash_pop(CWD, id, false).is_ok()
+            }
+            _ => false,
+        }
     }
 }
 
@@ -130,6 +146,12 @@ impl Component for StashList {
                 selection_valid,
                 true,
             ));
+
+            out.push(CommandInfo::new(
+                strings::commands::stashlist_pop(&self.key_config),
+                selection_valid,
+                true,
+            ));
             out.push(CommandInfo::new(
                 strings::commands::stashlist_inspect(
                     &self.key_config,
@@ -151,6 +173,8 @@ impl Component for StashList {
             if let Event::Key(k) = ev {
                 if k == self.key_config.enter {
                     self.apply_stash()
+                } else if k == self.key_config.stash_pop {
+                    self.pop_stash()
                 } else if k == self.key_config.stash_drop {
                     self.drop_stash()
                 } else if k == self.key_config.stash_open {