add untracked branch message (#38)

* add untracked branch message

* lint

* fix tests

src/commands/branch/new.test.tsx

@@ -18,6 +18,11 @@ const mocks = vi.hoisted(() => {
                         setTimeout(resolve, ARBITRARY_DELAY / 4)
                     );
                 },
+                currentBranch: async () => {
+                    return new Promise((resolve) =>
+                        setTimeout(() => resolve('root'), ARBITRARY_DELAY / 4)
+                    );
+                },
                 createBranch: async () => {
                     return new Promise((resolve) =>
                         setTimeout(resolve, ARBITRARY_DELAY / 4)

src/commands/branch/new.tsx

@@ -10,17 +10,22 @@ import {
 import { Loading } from '../../components/loading.js';
 import { SelectRootBranch } from '../../components/select-root-branch.js';
 import { Text } from 'ink';
+import { UntrackedBranch } from '../../components/untracked-branch.js';
 import { safeBranchNameFromCommitMessage } from '../../utils/naming.js';
 import { useGit } from '../../hooks/use-git.js';
 import { useTree } from '../../hooks/use-tree.js';
 
 const BranchNew = (props: CommandProps) => {
-    const { rootBranchName } = useTree();
+    const { rootBranchName, isCurrentBranchTracked } = useTree();
 
     if (!rootBranchName) {
         return <SelectRootBranch />;
     }
 
+    if (!isCurrentBranchTracked) {
+        return <UntrackedBranch />;
+    }
+
     return <DoBranchNew {...props} />;
 };
 

src/commands/changes/commit.test.tsx

@@ -12,15 +12,30 @@ const mocks = vi.hoisted(() => {
     return {
         createGitService: vi.fn(({}) => {
             return {
+                checkout: async () => {
+                    return new Promise((resolve) =>
+                        setTimeout(resolve, ARBITRARY_DELAY / 4)
+                    );
+                },
+                currentBranch: async () => {
+                    return new Promise((resolve) =>
+                        setTimeout(() => resolve('root'), ARBITRARY_DELAY / 4)
+                    );
+                },
+                createBranch: async () => {
+                    return new Promise((resolve) =>
+                        setTimeout(resolve, ARBITRARY_DELAY / 4)
+                    );
+                },
                 addAllFiles: async () => {
                     return new Promise((resolve) =>
-                        setTimeout(resolve, ARBITRARY_DELAY / 2)
+                        setTimeout(resolve, ARBITRARY_DELAY / 4)
                     );
                 },
                 commit: async ({ message }: { message: string }) => {
                     console.log(message);
                     return new Promise((resolve) =>
-                        setTimeout(resolve, ARBITRARY_DELAY / 2)
+                        setTimeout(resolve, ARBITRARY_DELAY / 4)
                     );
                 },
             };
@@ -101,7 +116,7 @@ describe('correctly renders changes commit UI', () => {
 
         const expected = render(<Loading />);
 
-        await delay(ARBITRARY_DELAY / 2);
+        await delay(ARBITRARY_DELAY / 4);
         expect(actual1.lastFrame()).to.equal(expected.lastFrame());
         expect(actual2.lastFrame()).to.equal(expected.lastFrame());
     });

src/components/untracked-branch.tsx

@@ -0,0 +1,31 @@
+import React, { useCallback } from 'react';
+import { Box, Text, useInput } from 'ink';
+import { useAsyncValue } from '../hooks/use-async-value.js';
+import { useGit } from '../hooks/use-git.js';
+
+const TRACK_BRANCH_COMMAND = 'gum branch track';
+
+export const UntrackedBranch = () => {
+    const git = useGit();
+
+    const getCurrentBranch = useCallback(async () => {
+        return await git.currentBranch();
+    }, [git.currentBranch]);
+
+    const { value: currentBranch } = useAsyncValue({
+        getValue: getCurrentBranch,
+    });
+
+    return (
+        <Box flexDirection="column">
+            <Text color="red">
+                Cannot perform this operation on untracked branch{' '}
+                <Text color="yellow">{currentBranch}</Text>.
+            </Text>
+            <Text color="red">
+                You can start tracking it with{' '}
+                <Text color="cyan">{TRACK_BRANCH_COMMAND}</Text>.
+            </Text>
+        </Box>
+    );
+};

src/hooks/use-async-value.ts

@@ -2,6 +2,7 @@ import { useEffect, useState } from 'react';
 
 type State<T> = { type: 'LOADING' } | { type: 'COMPLETE'; value: T };
 type Result<T> = { value?: T };
+
 export const useAsyncValue = <T>({
     getValue,
 }: {

src/hooks/use-tree.ts

@@ -1,13 +1,27 @@
 import { Tree, TreeService, createTreeService } from '../services/tree.js';
-import { useMemo, useState } from 'react';
+import { useAsyncValue } from './use-async-value.js';
+import { useCallback, useMemo, useState } from 'react';
+import { useGit } from './use-git.js';
 
 interface UseTreeResult extends TreeService {
     currentTree: Tree;
     rootBranchName: string | undefined;
+    isCurrentBranchTracked: boolean;
+    isLoading: boolean;
 }
 
 export const useTree = (): UseTreeResult => {
     const [currentTree, setCurrentTree] = useState<Tree>([]);
+    const git = useGit();
+
+    const getCurrentBranchTracked = useCallback(async () => {
+        const currentBranch = await git.currentBranch();
+        return Boolean(currentTree.find((b) => b.key === currentBranch));
+    }, [currentTree, git.currentBranch]);
+
+    const currentBranchTrackedResult = useAsyncValue({
+        getValue: getCurrentBranchTracked,
+    });
 
     const service = useMemo(() => createTreeService({ setCurrentTree }), []);
 
@@ -21,5 +35,7 @@ export const useTree = (): UseTreeResult => {
         currentTree,
         ...computed,
         ...service,
+        isCurrentBranchTracked: Boolean(currentBranchTrackedResult.value),
+        isLoading: !('value' in currentBranchTrackedResult),
     };
 };

src/services/git.ts

@@ -10,6 +10,7 @@ export const DEFAULT_OPTIONS: Partial<SimpleGitOptions> = {
 export interface GitService {
     _git: SimpleGit;
     branchLocal: () => Promise<ReturnType<SimpleGit['branchLocal']>>;
+    currentBranch: () => Promise<string>;
     checkout: (branch: string) => Promise<ReturnType<SimpleGit['checkout']>>;
     addAllFiles: () => Promise<void>;
     commit: (args: { message: string }) => Promise<void>;
@@ -25,13 +26,17 @@ export const createGitService = ({
     return {
         _git: gitEngine,
         // @ts-expect-error - being weird about the return type
-        checkout: async (branch: string) => {
-            return gitEngine.checkout(branch);
-        },
-        // @ts-expect-error - being weird about the return type
         branchLocal: async () => {
             return gitEngine.branchLocal();
         },
+        currentBranch: async () => {
+            const { current } = await gitEngine.branchLocal();
+            return current;
+        },
+        // @ts-expect-error - being weird about the return type
+        checkout: async (branch: string) => {
+            return gitEngine.checkout(branch);
+        },
         addAllFiles: async () => {
             await gitEngine.add('.');
         },