add continue command (#53)

VISION.md

@@ -80,8 +80,8 @@ branches are stacked on which branches.
 
 This is now v0.
 
-5. Build `branch attach`
-6. Build `continue`
+5. Build `branch attach` (Scope creep) - `branch delete` & `branch switch`
+6. Build `continue` ✅
 
 This is now v0.1.X
 
@@ -93,10 +93,10 @@ This is now v0.1.X
 This is v0.2.X
 
 11. Build GitHub integration to make/track PRs
-12. Build `branch submit`
+12. Build `branch submit` ❌
 
 This is v0.3.X
 
-13. Build `sync`
+13. Build `sync` 🟠
 
 This is v1.

src/command-registry.ts

@@ -4,6 +4,7 @@ import ChangesAdd, { changesAddConfig } from './commands/changes/add.js';
 import ChangesCommit, {
     changesCommitConfig,
 } from './commands/changes/commit.js';
+import Continue, { continueConfig } from './commands/continue.js';
 import Help, { helpConfig } from './commands/help.js';
 import Hop, { hopConfig } from './commands/hop.js';
 import Sync, { syncConfig } from './commands/sync.js';
@@ -31,6 +32,10 @@ export const REGISTERED_COMMANDS: CommandGroup = {
         component: List,
         config: listConfig,
     },
+    continue: {
+        component: Continue,
+        config: continueConfig,
+    },
     changes: {
         _group: {
             alias: 'c',

src/commands/continue.tsx

@@ -0,0 +1,67 @@
+import ErrorDisplay from '../components/error-display.js';
+import React, { useCallback, useState } from 'react';
+import { Action, useAction } from '../hooks/use-action.js';
+import { CommandConfig, CommandProps } from '../types.js';
+import { Loading } from '../components/loading.js';
+import { Text } from 'ink';
+import { useGit } from '../hooks/use-git.js';
+
+const Continue = (_: CommandProps) => {
+    const result = useRebaseContinue();
+
+    if (result.isError) {
+        return <ErrorDisplay error={result.error} />;
+    }
+
+    if (result.isLoading) {
+        return <Loading />;
+    }
+
+    if (!result.isRebaseInProgress) {
+        return <Text color="yellow">No ongoing rebase found.</Text>;
+    }
+
+    return null;
+};
+
+type UseRebaseContinueResult = Action & {
+    isRebaseInProgress: boolean;
+};
+const useRebaseContinue = (): UseRebaseContinueResult => {
+    const git = useGit();
+    // assume a rebase is in action when this is called until proven otherwise
+    const [isRebaseInProgress, setIsRebaseInProgress] = useState(true);
+
+    const performAction = useCallback(async () => {
+        const isRebasing = await git.isRebasing();
+        if (!isRebasing) {
+            setIsRebaseInProgress(false);
+            return;
+        }
+
+        await git.rebaseContinue();
+    }, [git]);
+
+    const action = useAction({
+        asyncAction: performAction,
+    });
+
+    return {
+        ...action,
+        isRebaseInProgress,
+    } as UseRebaseContinueResult;
+};
+
+export const continueConfig: CommandConfig = {
+    description: 'Continues a rebase',
+    usage: 'continue',
+    key: 'continue',
+    getProps: () => {
+        return {
+            valid: true,
+            props: {},
+        };
+    },
+};
+
+export default Continue;

src/components/rebase-conflict.tsx

@@ -9,11 +9,11 @@ export const RebaseConflict = () => {
                 1. Please resolve the conflict before proceeding
             </Text>
             <Text color="yellow">
-                2. Add all files with <Text color="cyan">git add .</Text>
+                2. Add all files with <Text color="cyan">gum changes add</Text>
             </Text>
             <Text color="yellow">
                 3. Continue the rebase with{' '}
-                <Text color="cyan">git rebase --continue</Text>
+                <Text color="cyan">gum continue</Text>
             </Text>
         </Box>
     );

src/services/git.ts

@@ -21,6 +21,7 @@ export interface GitService {
         ontoBranch: string;
     }) => Promise<void>;
     isRebasing: () => Promise<boolean>;
+    rebaseContinue: () => Promise<void>;
 }
 
 export const createGitService = ({
@@ -77,5 +78,8 @@ export const createGitService = ({
                 return false;
             }
         },
+        rebaseContinue: async () => {
+            await gitEngine.rebase(['--continue']);
+        },
     };
 };