Merge branch 'main' into fix/bitbucket-cloud-pagination-url-parsing

Author: bardock

CHANGELOG.md

@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [4.6.7] - 2025-09-08
+
+### Added
+- Added `exclude.userOwnedProjects` setting to GitLab configs. [#498](https://github.com/sourcebot-dev/sourcebot/pull/498)
+
+### Fixed
+- Fixed "couldn't find remote ref HEAD" errors when re-indexing certain repositories. [#497](https://github.com/sourcebot-dev/sourcebot/pull/497)
+
 ### Changed
 - Disable page scroll when using arrow keys on search suggestions box. [#493](https://github.com/sourcebot-dev/sourcebot/pull/493)
 

docs/docs/connections/gitlab.mdx

@@ -90,6 +90,8 @@ If you're not familiar with Sourcebot [connections](/docs/connections/overview),
                 "archived": true,
                 // projects that are forks
                 "forks": true,
+                // projects that are owned by users (not groups)
+                "userOwnedProjects": true,
                 // projects that match these glob patterns
                 "projects": [
                     "my-group/foo/**",

docs/snippets/schemas/v3/connection.schema.mdx

@@ -343,6 +343,11 @@
               "default": false,
               "description": "Exclude archived projects from syncing."
             },
+            "userOwnedProjects": {
+              "type": "boolean",
+              "default": false,
+              "description": "Exclude user-owned projects from syncing."
+            },
             "projects": {
               "type": "array",
               "items": {

docs/snippets/schemas/v3/gitlab.schema.mdx

@@ -126,6 +126,11 @@
           "default": false,
           "description": "Exclude archived projects from syncing."
         },
+        "userOwnedProjects": {
+          "type": "boolean",
+          "default": false,
+          "description": "Exclude user-owned projects from syncing."
+        },
         "projects": {
           "type": "array",
           "items": {

docs/snippets/schemas/v3/index.schema.mdx

@@ -606,6 +606,11 @@
                       "default": false,
                       "description": "Exclude archived projects from syncing."
                     },
+                    "userOwnedProjects": {
+                      "type": "boolean",
+                      "default": false,
+                      "description": "Exclude user-owned projects from syncing."
+                    },
                     "projects": {
                       "type": "array",
                       "items": {

packages/backend/src/git.ts

@@ -27,10 +27,6 @@ export const cloneRepository = async (
         );
 
         await unsetGitConfig(path, ["remote.origin.url"]);
-
-        await git.cwd({
-            path,
-        }).addConfig("remote.origin.fetch", "+refs/heads/*:refs/heads/*");
     } catch (error: unknown) {
         const baseLog = `Failed to clone repository: ${path}`;
 
@@ -59,6 +55,7 @@ export const fetchRepository = async (
 
         await git.fetch([
             remoteUrl.toString(),
+            "+refs/heads/*:refs/heads/*",
             "--prune",
             "--progress"
         ]);

packages/backend/src/gitlab.test.ts

@@ -41,3 +41,30 @@ test('shouldExcludeProject returns true when the project is excluded by exclude.
     })).toBe(true)
 });
 
+test('shouldExcludeProject returns true when the project is excluded by exclude.userOwnedProjects.', () => {
+    const project = {
+        path_with_namespace: 'test/project',
+        namespace: {
+            kind: 'user',
+        }
+    } as unknown as ProjectSchema;
+
+    expect(shouldExcludeProject({
+        project,
+        exclude: {
+            userOwnedProjects: true,
+        }
+    })).toBe(true)
+});
+
+test('shouldExcludeProject returns false when exclude.userOwnedProjects is true but project is group-owned.', () => {
+    const project = {
+        path_with_namespace: 'test/project',
+        namespace: { kind: 'group' },
+    } as unknown as ProjectSchema;
+
+    expect(shouldExcludeProject({
+        project,
+        exclude: { userOwnedProjects: true },
+    })).toBe(false);
+});

packages/backend/src/gitlab.ts

@@ -222,6 +222,11 @@ export const shouldExcludeProject = ({
             return true;
         }
 
+        if (exclude?.userOwnedProjects && project.namespace.kind === 'user') {
+            reason = `\`exclude.userOwnedProjects\` is true`;
+            return true;
+        }
+
         if (exclude?.projects) {
             if (micromatch.isMatch(projectName, exclude.projects)) {
                 reason = `\`exclude.projects\` contains ${projectName}`;

packages/backend/src/zoekt.ts

@@ -84,7 +84,9 @@ export const indexGitRepository = async (repo: Repo, settings: Settings, ctx: Ap
             }
             if (stderr) {
                 stderr.split('\n').filter(line => line.trim()).forEach(line => {
-                    logger.error(line);
+                    // TODO: logging as regular info here and not error because non error logs are being
+                    // streamed in stderr and incorrectly being logged as errors at a high level
+                    logger.info(line);
                 });
             }
 

packages/schemas/src/v3/connection.schema.ts

@@ -342,6 +342,11 @@ const schema = {
               "default": false,
               "description": "Exclude archived projects from syncing."
             },
+            "userOwnedProjects": {
+              "type": "boolean",
+              "default": false,
+              "description": "Exclude user-owned projects from syncing."
+            },
             "projects": {
               "type": "array",
               "items": {