[WIP] Add command for tagging commit

Author: cruessler

asyncgit/src/sync/commit.rs

@@ -1,6 +1,6 @@
 use super::{get_head, utils::repo, CommitId};
 use crate::error::Result;
-use git2::{ErrorCode, Repository, Signature};
+use git2::{ErrorCode, ObjectType, Repository, Signature};
 use scopetime::scope_time;
 
 ///
@@ -80,6 +80,23 @@ pub fn commit(repo_path: &str, msg: &str) -> Result<CommitId> {
         .into())
 }
 
+pub fn tag(
+    repo_path: &str,
+    commit_id: &CommitId,
+    tag: &str,
+) -> Result<CommitId> {
+    scope_time!("tag");
+
+    let repo = repo(repo_path)?;
+
+    let signature = signature_allow_undefined_name(&repo)?;
+    let object_id = commit_id.get_oid();
+    let target =
+        repo.find_object(object_id, Some(ObjectType::Commit))?;
+
+    Ok(repo.tag(tag, &target, &signature, "", false)?.into())
+}
+
 #[cfg(test)]
 mod tests {
 

src/components/mod.rs

@@ -30,6 +30,7 @@ pub use inspect_commit::InspectCommitComponent;
 pub use msg::MsgComponent;
 pub use reset::ResetComponent;
 pub use stashmsg::StashMsgComponent;
+pub use textinput::TextInputComponent;
 pub use utils::filetree::FileTreeItemKind;
 
 use crate::ui::style::Theme;

src/keys.rs

@@ -66,5 +66,6 @@ pub const STASH_DROP: KeyEvent =
     with_mod(KeyCode::Char('D'), KeyModifiers::SHIFT);
 pub const CMD_BAR_TOGGLE: KeyEvent = no_mod(KeyCode::Char('.'));
 pub const LOG_COMMIT_DETAILS: KeyEvent = no_mod(KeyCode::Enter);
+pub const LOG_TAG_COMMIT: KeyEvent = no_mod(KeyCode::Char('t'));
 pub const COMMIT_AMEND: KeyEvent =
     with_mod(KeyCode::Char('a'), KeyModifiers::CONTROL);

src/strings.rs

@@ -27,6 +27,8 @@ pub static CONFIRM_MSG_STASHDROP: &str = "confirm stash drop?";
 pub static CONFIRM_MSG_RESETHUNK: &str = "confirm reset hunk?";
 
 pub static LOG_TITLE: &str = "Commit";
+pub static LOG_TAG_COMMIT: &str = "type tag..";
+
 pub static STASHLIST_TITLE: &str = "Stashes";
 
 pub static HELP_TITLE: &str = "Help: all commands";
@@ -295,4 +297,7 @@ pub mod commands {
         "inspect selected commit in detail",
         CMD_GROUP_LOG,
     );
+    ///
+    pub static LOG_TAG_COMMIT: CommandText =
+        CommandText::new("Tag [t]", "tag commit", CMD_GROUP_LOG);
 }

src/tabs/revlog.rs

@@ -2,7 +2,7 @@ use crate::{
     components::{
         visibility_blocking, CommandBlocking, CommandInfo,
         CommitDetailsComponent, CommitList, Component,
-        DrawableComponent,
+        DrawableComponent, TextInputComponent,
     },
     keys,
     queue::{InternalEvent, Queue},
@@ -28,6 +28,7 @@ const SLICE_SIZE: usize = 1200;
 ///
 pub struct Revlog {
     commit_details: CommitDetailsComponent,
+    tag_input: TextInputComponent,
     list: CommitList,
     git_log: AsyncLog,
     queue: Queue,
@@ -49,6 +50,11 @@ impl Revlog {
                 sender,
                 theme.clone(),
             ),
+            tag_input: TextInputComponent::new(
+                theme.clone(),
+                "",
+                strings::LOG_TAG_COMMIT,
+            ),
             list: CommitList::new(strings::LOG_TITLE, theme),
             git_log: AsyncLog::new(sender),
             visible: false,
@@ -133,6 +139,10 @@ impl Revlog {
     fn selected_commit(&self) -> Option<CommitId> {
         self.list.selected_entry().map(|e| e.id)
     }
+
+    fn tag(&mut self) -> Result<()> {
+        Ok(())
+    }
 }
 
 impl DrawableComponent for Revlog {
@@ -159,13 +169,19 @@ impl DrawableComponent for Revlog {
             self.list.draw(f, area)?;
         }
 
+        self.tag_input.draw(f, area)?;
+
         Ok(())
     }
 }
 
 impl Component for Revlog {
     fn event(&mut self, ev: Event) -> Result<bool> {
         if self.visible {
+            if self.tag_input.event(ev)? {
+                return Ok(true);
+            }
+
             let event_used = self.list.event(ev)?;
 
             if event_used {
@@ -194,6 +210,11 @@ impl Component for Revlog {
                         };
                     }
 
+                    Event::Key(keys::LOG_TAG_COMMIT) => {
+                        self.tag_input.show()?;
+                        return Ok(true);
+                    }
+
                     _ => (),
                 }
             }
@@ -224,6 +245,12 @@ impl Component for Revlog {
                 || force_all,
         ));
 
+        out.push(CommandInfo::new(
+            commands::LOG_TAG_COMMIT,
+            true,
+            self.visible || force_all,
+        ));
+
         visibility_blocking(self)
     }