Add UI for feature flag

Author: Caleb-T-Owens

apps/desktop/src/lib/backend/projects.ts

@@ -28,6 +28,7 @@ export class Project {
 	use_diff_context: boolean | undefined;
 	snapshot_lines_threshold!: number | undefined;
 	use_new_branch_integration_algorithm: boolean | undefined;
+	use_new_integration_check!: boolean;
 	// Produced just for the frontend to determine if the project is open in any window.
 	is_open!: boolean;
 

apps/desktop/src/routes/settings/experimental/+page.svelte

@@ -1,16 +1,27 @@
 <script lang="ts">
+	import { ProjectService, ProjectsService } from '$lib/backend/projects';
 	import {
 		cloudFunctionality,
 		cloudCommunicationFunctionality,
 		cloudReviewFunctionality
 	} from '$lib/config/uiFeatureFlags';
 	import SettingsPage from '$lib/layout/SettingsPage.svelte';
 	import { User } from '$lib/stores/user';
-	import { getContextStore } from '@gitbutler/shared/context';
+	import { getContext, getContextStore } from '@gitbutler/shared/context';
 	import SectionCard from '@gitbutler/ui/SectionCard.svelte';
 	import Toggle from '@gitbutler/ui/Toggle.svelte';
 
 	const user = getContextStore(User);
+	const projectService = getContext(ProjectService);
+	const projectsService = getContext(ProjectsService);
+	const project = projectService.project;
+
+	function toggleUseNewIntegrationCheck() {
+		const updatedProject = structuredClone($project);
+		if (!updatedProject) return;
+		updatedProject.use_new_integration_check = !updatedProject.use_new_integration_check;
+		projectsService.updateProject(updatedProject);
+	}
 
 	function toggleCloudFunctionality() {
 		if ($cloudFunctionality) {
@@ -88,6 +99,20 @@
 			</div>
 		</div>
 	{/if}
+
+	<SectionCard labelFor="newIntegrationAlgorithm" orientation="row" roundedTop={false}>
+		{#snippet title()}New Integration Algorithm{/snippet}
+		{#snippet caption()}
+			A new algorithm for finding integrated commits
+		{/snippet}
+		{#snippet actions()}
+			<Toggle
+				id="newIntegrationAlgorithm"
+				checked={$project?.use_new_integration_check}
+				onclick={toggleUseNewIntegrationCheck}
+			/>
+		{/snippet}
+	</SectionCard>
 </SettingsPage>
 
 <style>

crates/gitbutler-branch-actions/src/integration_check.rs

@@ -7,6 +7,7 @@ use gitbutler_commit::commit_ext::CommitExt as _;
 use gitbutler_oxidize::{git2_to_gix_object_id, GixRepositoryExt as _, ObjectIdExt as _, OidExt};
 use gitbutler_repo::{signature, GixRepositoryExt};
 use itertools::Itertools as _;
+use tracing::instrument;
 
 use crate::commit_ops::{get_exclusive_tree, get_first_parent, is_subset, SubsetKind};
 
@@ -377,6 +378,7 @@ impl IsCommitIntegrated<'_, '_, '_> {
 
 /// Used to switch between the old and new algorithms. We will be able to
 /// get rid of all of this when we are confident in the new algorithm.
+#[instrument(skip(gix_repository, repository, graph))]
 pub(crate) fn compat_find_integrated_commits<'repo>(
     gix_repository: &'repo gix::Repository,
     repository: &'repo git2::Repository,

crates/gitbutler-project/src/storage.rs

@@ -28,6 +28,7 @@ pub struct UpdateRequest {
     pub use_diff_context: Option<bool>,
     pub snapshot_lines_threshold: Option<usize>,
     pub use_new_branch_integration_algorithm: Option<bool>,
+    pub use_new_integration_check: Option<bool>,
 }
 
 impl Storage {
@@ -130,6 +131,10 @@ impl Storage {
             project.use_new_branch_integration_algorithm = Some(new_branch_integration_algorithm);
         }
 
+        if let Some(use_new_integration_check) = update_request.use_new_integration_check {
+            project.use_new_integration_check = use_new_integration_check;
+        }
+
         self.inner
             .write(PROJECTS_FILE, &serde_json::to_string_pretty(&projects)?)?;