BrewingBytes · hateofhades · Dec 26, 2024 · Dec 26, 2024 · Dec 26, 2024 · Dec 26, 2024
diff --git a/index.html b/index.html
@@ -4,7 +4,10 @@
     <meta charset="UTF-8" />
     <link rel="icon" type="image/svg+xml" href="/vite.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Tauri + Vue + Typescript App</title>
+    <title>BranchWise</title>
+    <script>
+      document.addEventListener('contextmenu', event => event.preventDefault());
+    </script>
   </head>
 
   <body>

diff --git a/src-tauri/src/git/git_branch.rs b/src-tauri/src/git/git_branch.rs
@@ -1,5 +1,14 @@
+use std::{fs::OpenOptions, io::Write, path::PathBuf};
+
 use serde::{Deserialize, Serialize};
 
+use crate::errors::git_object_error::{CommitError, GitObjectError};
+
+use super::{
+    git_commit::GitCommit, git_files::GitFilesRequired, git_folders::GIT_FOLDER,
+    git_project::GitProject, object::GitObject,
+};
+
 #[derive(Debug, PartialEq, Serialize, Deserialize, Clone)]
 #[serde(rename_all = "camelCase")]
 pub struct GitBranch {
@@ -11,6 +20,22 @@
     pub fn new(name: String, commit: String) -> GitBranch {
         GitBranch { name, commit }
     }
+
+    pub fn checkout(&self, project: &GitProject) -> Result<(), GitObjectError> {
+        GitCommit::from_hash(project, &self.commit)?.checkout(project)?;
+
+        let head_path = PathBuf::from(project.get_directory())
+            .join(GIT_FOLDER)
+            .join(GitFilesRequired::HEAD.as_ref());
+        OpenOptions::new()
+            .write(true)
+            .open(head_path)
+            .map_err(|_| GitObjectError::InvalidCommitFile(CommitError::InvalidContent))?
+            .write_all(self.name.as_bytes())
+            .map_err(|_| GitObjectError::InvalidHash)?;
+
+        Ok(())
+    }
 }
 
 #[cfg(test)]

diff --git a/src-tauri/src/git/git_commit.rs b/src-tauri/src/git/git_commit.rs
@@ -1,11 +1,15 @@
 use super::{
     git_commit_author::{GitCommitAuthor, GitCommitAuthorType},
+    git_files::GitFilesRequired,
+    git_folders::GIT_FOLDER,
     git_project::GitProject,
+    git_tree::GitTree,
     object::{GitObject, Header},
 };
 use crate::errors::git_object_error::{CommitError, GitObjectError};
 use core::fmt;
 use serde::{Deserialize, Serialize};
+use std::{fs::OpenOptions, io::Write, path::PathBuf};
 
 pub enum CommitPrefix {
     Tree,
@@ -149,6 +153,39 @@
 
         Ok(history)
     }
+
+    /**
+     * Checkout all the files in a commit
+     */
+    pub fn checkout(&self, project: &GitProject) -> Result<(), GitObjectError> {
+        let files =
+            GitTree::from_hash(project, self.get_tree_hash())?.get_object_blobs(project, None);
+
+        files.iter().for_each(|file| {
+            let path = PathBuf::from(project.get_directory()).join(&file.0);
+            let file_in_fs = OpenOptions::new()
+                .write(true)
+                .truncate(true)
+                .create(true)
+                .open(path);
+
+            if let Ok(mut file_in_fs) = file_in_fs {
+                let _ = file_in_fs.write_all(file.1.data());
+            }
+        });
+
+        let head_path = PathBuf::from(project.get_directory())
+            .join(GIT_FOLDER)
+            .join(GitFilesRequired::HEAD.as_ref());
+        OpenOptions::new()
+            .write(true)
+            .open(head_path)
+            .map_err(|_| GitObjectError::InvalidCommitFile(CommitError::InvalidContent))?
+            .write_all(self.get_hash().as_bytes())
+            .map_err(|_| GitObjectError::InvalidHash)?;
+
+        Ok(())
+    }
 }
 
 impl GitObject for GitCommit {

diff --git a/src-tauri/src/git/project_folder.rs b/src-tauri/src/git/project_folder.rs
@@ -1,4 +1,5 @@
 use super::{
+    git_branch::GitBranch,
     git_commit::{GitCommit, GitCommitWithHash},
     git_folders::GitBranchType,
     git_project::GitProject,
@@ -83,6 +84,22 @@
         .map_err(|_| GitError::InvalidHistory)
 }
 
+#[tauri::command]
+pub fn checkout_branch(project: GitProject, branch: GitBranch) -> Result<(), GitError> {
+    branch
+        .checkout(&project)
+        .map_err(|_| GitError::NoLocalBranches)
+}
+
+#[tauri::command]
+pub fn checkout_commit(project: GitProject, hash: &str) -> Result<(), GitError> {
+    let commit = GitCommit::from_hash(&project, hash).map_err(|_| GitError::InvalidHistory)?;
+
+    commit
+        .checkout(&project)
+        .map_err(|_| GitError::InvalidHistory)
+}
+
 #[cfg(test)]
 mod tests {
     use std::{

diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
@@ -11,7 +11,7 @@ use database::storage::DATABASE;
 use errors::git_error::GitErrorProject;
 use git::project_folder::{
     get_commit_history, get_database_projects, open_git_project, remove_database_project,
-    set_current_project,
+    set_current_project, checkout_branch, checkout_commit
 };
 use tauri::{AppHandle, Emitter, Manager};
 
@@ -89,6 +89,8 @@ fn main() {
             remove_database_project,
             set_current_project,
             get_commit_history,
+            checkout_branch,
+            checkout_commit
         ])
         .run(tauri::generate_context!())
         .expect("error while running tauri application");

diff --git a/src/App.vue b/src/App.vue
@@ -13,11 +13,13 @@
       {{ snackbar.text }}
     </v-snackbar>
     <DialogComponent />
+    <ContextMenu />
   </v-app>
 </template>
 
 <script lang="ts">
 import DialogComponent from "@/components/DialogComponent.vue";
+import ContextMenu from "@/components/Dialogs/ContextMenu.vue";
 import SidebarComponent from "@/components/SidebarComponent.vue";
 import TopbarComponent from "@/components/TopbarComponent.vue";
 import { registerListeners, unregisterListeners } from "@/listeners";
@@ -35,7 +37,8 @@ export default defineComponent({
 	components: {
 		SidebarComponent,
 		TopbarComponent,
-		DialogComponent
+		DialogComponent,
+		ContextMenu
 	},
 	data() {
 		return {
@@ -63,14 +66,14 @@ export default defineComponent({
 
 <style>
 html {
-    overflow: scroll;
-    overflow-x: hidden;
+	overflow: scroll;
+	overflow-x: hidden;
 	overflow-y: hidden;
 }
 
 ::-webkit-scrollbar {
-    width: 0;
-    background: transparent;
+	width: 0;
+	background: transparent;
 	display: none;
 }
 </style>
diff --git a/src/components/Dialogs/ContextMenu.vue b/src/components/Dialogs/ContextMenu.vue
@@ -0,0 +1,58 @@
+<template>
+  <v-menu 
+    :model-value="isShowing" 
+    :target="[posX, posY]"
+    @update:model-value="closeMenu"
+  >
+    <v-list>
+      <v-list-item>
+        <v-list-item-title @click="checkout">
+          Checkout
+        </v-list-item-title>
+      </v-list-item>
+    </v-list>
+  </v-menu>
+</template>
+
+<script lang="ts">
+import { useDialogStore } from "@/stores/dialogs";
+import { useProjectStore } from "@/stores/project";
+import { TauriCommands } from "@/types/tauri";
+import { invoke } from "@tauri-apps/api/core";
+import { mapState } from "pinia";
+import { defineComponent } from "vue";
+
+export default defineComponent({
+	name: "ContextMenu",
+	computed: {
+		isShowing: {
+			get() {
+				return this.contextMenu.isOpen;
+			},
+			set(value: boolean) {
+				if (value === false) {
+					useDialogStore().closeContextMenu();
+				}
+			}
+		},
+		posX() {
+			return useDialogStore().contextMenu.position.x;
+		},
+		posY() {
+			return useDialogStore().contextMenu.position.y;
+		},
+		...mapState(useDialogStore, ["contextMenu"])
+	},
+	methods: {
+		closeMenu() {
+			useDialogStore().closeContextMenu();
+		},
+		checkout() {
+			invoke(TauriCommands.CheckoutCommit, {
+				project: useProjectStore().getSelectedProject,
+				hash: useDialogStore().contextMenu.commitHash
+			});
+		}
+	}
+});
+</script>
diff --git a/src/components/Project/Commit/CommitListItem.vue b/src/components/Project/Commit/CommitListItem.vue
@@ -5,6 +5,7 @@
     style="height: 10vh;"
     :class="commitClass"
     @click="setCommit"
+    @click.right="showContextMenu"
   >
     <v-col
       style="height: 85%;"
@@ -42,14 +43,15 @@
           {{ getHash }}
         </p>
         <v-spacer />
-        
+
         {{ getMessage }}
       </v-row>
     </v-col>
   </v-row>
 </template>
 
 <script lang="ts">
+import { useDialogStore } from "@/stores/dialogs";
 import { useProjectStore } from "@/stores/project";
 import { getAuthorDate } from "@/types/gitAuthor";
 import { getHash, IGitCommit } from "@/types/gitCommit";
@@ -93,26 +95,29 @@ export default defineComponent({
 	methods: {
 		setCommit() {
 			useProjectStore().setCommit(this.commit.hash);
+		},
+		showContextMenu(event: MouseEvent) {
+			useDialogStore().showContextMenu(getHash(this.commit), event.clientX, event.clientY);
 		}
 	}
 });
 </script>
 
 <style scoped>
 .hoverable:hover {
-    background-color: black;
-    cursor: pointer;
-    border-radius: 25px;
+		background-color: black;
+		cursor: pointer;
+		border-radius: 25px;
 }
 
 .selected {
-    background-color: #112233;
-    border-radius: 25px;
+		background-color: #112233;
+		border-radius: 25px;
 }
 
 .selected:hover {
-    background-color: #112233;
-    cursor: default !important;
+		background-color: #112233;
+		cursor: default !important;
 }
 
 </style>
diff --git a/src/stores/dialogs.ts b/src/stores/dialogs.ts
@@ -13,7 +13,15 @@ interface IDialogState {
         title: string;
         message: string;
         onConfirm: () => void;
-    }
+    },
+	contextMenu: {
+		isOpen: boolean;
+		commitHash: string;
+		position: {
+			x: number;
+			y: number;
+		};
+	}
 }
 
 export const useDialogStore = defineStore("dialog", {
@@ -30,6 +38,14 @@ export const useDialogStore = defineStore("dialog", {
 				title: "",
 				message: "",
 				onConfirm: () => { return; }
+			},
+			contextMenu: {
+				isOpen: false,
+				commitHash: "",
+				position: {
+					x: 0,
+					y: 0
+				}
 			}
 		}),
 	actions: {
@@ -57,6 +73,19 @@ export const useDialogStore = defineStore("dialog", {
 		},
 		closeConfirmationDialog() {
 			this.confirmationDialog.isOpen = false;
+		},
+		showContextMenu(hash: string, x: number, y: number) {
+			this.contextMenu = {
+				position: {
+					x,
+					y
+				},
+				commitHash: hash,
+				isOpen: true
+			};
+		},
+		closeContextMenu() {
+			this.contextMenu.isOpen = false;
 		}
 	}
 });
diff --git a/src/types/tauri.ts b/src/types/tauri.ts
@@ -5,6 +5,8 @@ export enum TauriCommands {
     RemoveDatabaseProject = "remove_database_project",
     SetCurrentBranch = "set_current_branch",
     SetCurrentProject = "set_current_project",
+    CheckoutBranch = "checkout_branch",
+    CheckoutCommit = "checkout_commit",
 }
 
 export enum TauriListen {