feat(undoMerge) complete

Author: jpukin

components/DropDownOther.js

@@ -25,6 +25,10 @@ const dropDown = ({ refreshTab, accentColor, defaultColor }) => {
             label: 'Stash Changes',
             value: 'stashChanges'
         },
+        {
+            label: 'Undo Stash',
+            value: 'undoStash'
+        },
         {
             label: 'Undo Merge',
             value: 'undoMerge'

components/MergeRevert.js

@@ -1,29 +1,38 @@
 const React = require('react')
+const { useState } = require("react");
 const { Box, Text, NewLine } = require('ink')
 const { execSync, exec } =require("child_process")
 const TextInput = require("ink-text-input").default;
 
 const MergeRevert = (props) => {
     const [commitId, setCommitId] = useState("");
 
+    let { refreshTab } = props;
 
     //reverts merge based on git log merge-id
     let singleBranch = execSync(
+        //most recent commit id
         'git log --all --decorate --oneline --graph'
         ).toString().split('\n', 1)
-    // let branchRevert = execSync(
-    //     `git git revert -m 1 {}`
-    // )
+    const branchRevert = () => {
+        //reverts commit
+        try {
+            execSync(`git revert -m 1 ${commitId}`)
+        } catch (error) {
+            console.error('Oops, something went wrong.')
+        }
+    }
     return (
         <Box flexDirection='column'>
             <Box><Text> </Text></Box>
-            <Box><Text>   Please be on master branch. </Text></Box>
+            {/* <Box><Text>   Please be on master branch. </Text></Box> */}
+            <Box><Text color='redBright'>   THIS WILL DELETE ALL FILES/CHANGES MADE IN THIS COMMIT </Text></Box>
             <Box flexDirection='row'>
                 <Text>   Latest Commit Id: </Text> 
                 <Text color='#f09e8c'>{singleBranch}</Text>
             </Box>
             <Box flexDirection='row'>
-                <Text>   Please enter your desired commit Id: </Text>
+                <Text>   Please enter your commit Id: </Text>
                 <TextInput 
                     value={commitId}
 					onChange={setCommitId}

styleFile.js

@@ -9,5 +9,5 @@ module.exports = {
 	accentColor: 'red', // accepted values include ['red', 'blue', 'white', 'green', etc.]
 
 	// setting to determine whether app dynamically adjusts to screen resizing; setting to false may improve performance
-	appResize: true, // acepted values include [true, false]
+	appResize: false, // acepted values include [true, false]
 }