wip

Author: brendan-kellam

packages/backend/src/git.ts

@@ -120,10 +120,21 @@ export const fetchRepository = async (
         await git.fetch([
             cloneUrl,
             "+refs/heads/*:refs/heads/*",
-            "+HEAD:HEAD",
             "--prune",
             "--progress"
         ]);
+
+        // Update HEAD to match the remote's default branch. This handles the case where the remote's
+        // default branch changes.
+        const remoteHead = await git.raw(['ls-remote', '--symref', cloneUrl, 'HEAD']);
+        const match = remoteHead.match(/^ref: refs\/heads\/(\S+)\s+HEAD/m);
+        if (match) {
+            const defaultBranch = match[1];
+            await git.raw(['symbolic-ref', 'HEAD', `refs/heads/${defaultBranch}`]);
+            return defaultBranch;
+        }
+
+        return undefined;
     } catch (error: unknown) {
         const baseLog = `Failed to fetch repository: ${path}`;
         if (env.SOURCEBOT_LOG_LEVEL !== "debug") {
@@ -298,4 +309,4 @@ export const getCommitHashForRefName = async ({
         logger.debug(error);
         return undefined;
     }
-}
+}

packages/backend/src/repoIndexManager.ts

@@ -337,6 +337,8 @@ export class RepoIndexManager {
             }
         }
 
+        let defaultBranch: string | undefined = undefined;
+
         if (existsSync(repoPath) && !isReadOnly) {
             // @NOTE: in #483, we changed the cloning method s.t., we _no longer_
             // write the clone URL (which could contain a auth token) to the
@@ -351,7 +353,7 @@ export class RepoIndexManager {
             });
 
             logger.info(`Fetching ${repo.name} (id: ${repo.id})...`);
-            const { durationMs } = await measure(() => fetchRepository({
+            const { durationMs, data: remoteDefaultBranch } = await measure(() => fetchRepository({
                 cloneUrl: cloneUrlMaybeWithToken,
                 authHeader,
                 path: repoPath,
@@ -365,6 +367,7 @@ export class RepoIndexManager {
             process.stdout.write('\n');
             logger.info(`Fetched ${repo.name} (id: ${repo.id}) in ${fetchDuration_s}s`);
 
+            defaultBranch = remoteDefaultBranch;
         } else if (!isReadOnly) {
             logger.info(`Cloning ${repo.name} (id: ${repo.id})...`);
 
@@ -394,9 +397,7 @@ export class RepoIndexManager {
             });
         }
 
-        let revisions = [
-            'HEAD'
-        ];
+        let revisions = defaultBranch ? [defaultBranch] : ['HEAD'];
 
         if (metadata.branches) {
             const branchGlobs = metadata.branches

packages/web/src/app/[domain]/components/pathHeader.tsx

@@ -31,6 +31,7 @@ interface FileHeaderProps {
         displayName?: string;
         webUrl?: string;
     },
+    isBranchDisplayNameVisible?: boolean;
     branchDisplayName?: string;
     branchDisplayTitle?: string;
     isCodeHostIconVisible?: boolean;
@@ -53,6 +54,7 @@ export const PathHeader = ({
     path,
     pathHighlightRange,
     branchDisplayName,
+    isBranchDisplayNameVisible = !!branchDisplayName,
     branchDisplayTitle,
     pathType = 'blob',
     isCodeHostIconVisible = true,
@@ -224,7 +226,7 @@ export const PathHeader = ({
             >
                 {info?.displayName}
             </Link>
-            {branchDisplayName && (
+            {(isBranchDisplayNameVisible && branchDisplayName) && (
                 <p
                     className="text-xs font-semibold text-gray-500 dark:text-gray-400 mt-[3px] flex items-center gap-0.5"
                     title={branchDisplayTitle}

packages/web/src/app/[domain]/search/components/searchResultsPage.tsx

@@ -104,10 +104,8 @@ export const SearchResultsPage = ({
 
     // Look for any files that are not on the default branch.
     const isBranchFilteringEnabled = useMemo(() => {
-        return files.some((file) => {
-            return file.branches?.some((branch) => branch !== 'HEAD') ?? false;
-        });
-    }, [files]);
+        return searchQuery.includes('rev:');
+    }, [searchQuery]);
 
     useEffect(() => {
         if (isStreaming || !stats) {

packages/web/src/app/[domain]/search/components/searchResultsPanel/fileMatchContainer.tsx

@@ -70,12 +70,12 @@ export const FileMatchContainer = ({
     }, [file.branches]);
 
     const branchDisplayName = useMemo(() => {
-        if (!isBranchFilteringEnabled || branches.length === 0) {
+        if (branches.length === 0) {
             return undefined;
         }
 
         return `${branches[0]}${branches.length > 1 ? ` +${branches.length - 1}` : ''}`;
-    }, [branches, isBranchFilteringEnabled]);
+    }, [branches]);
 
     const repo = useMemo(() => {
         return repoInfo[file.repositoryId];
@@ -99,6 +99,7 @@ export const FileMatchContainer = ({
                     }}
                     path={file.fileName.text}
                     pathHighlightRange={fileNameRange}
+                    isBranchDisplayNameVisible={isBranchFilteringEnabled}
                     branchDisplayName={branchDisplayName}
                     branchDisplayTitle={branches.join(", ")}
                 />