gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-19 15:41:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

chore: remove user-facing config for using diff contexts infavor of automatic migration

Browse Source
This commit is contained in:
Kiril Videlov 2024-02-25 21:37:51 +01:00 committed by Kiril Videlov
parent 08d22de40e
commit 000ddeff91
4 changed files with 191 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gitbutler-app/src/virtual_branches/tests.rs
View File

@ -2412,7 +2412,7 @@ fn test_verify_branch_commits_to_integration() -> Result<()> {
integration::verify_branch(&gb_repository, &project_repository).unwrap();
// one virtual branch with two commits was created
let virtual_(branches, _) = list_virtual_branches(&gb_repository, &project_repository)?;
let (virtual_branches, _) = list_virtual_branches(&gb_repository, &project_repository)?;
assert_eq!(virtual_branches.len(), 1);
let branch = &virtual_branches.first().unwrap();

306
gitbutler-app/tests/virtual_branches.rs
View File

File diff suppressed because it is too large Load Diff

23
gitbutler-ui/src/lib/components/PreferencesForm.svelte
View File

@ -8,14 +8,12 @@
let allowForcePushing = project?.ok_with_force_push;
let omitCertificateCheck = project?.omit_certificate_check;
let useDiffContext = project?.use_diff_context;
const runCommitHooks = projectRunCommitHooks(project.id);
const dispatch = createEventDispatcher<{
updated: {
ok_with_force_push?: boolean;
omit_certificate_check?: boolean;
use_diff_context?: boolean;
};
}>();
</script>
@ -71,25 +69,4 @@
<p class="ml-7 text-light-700 dark:text-dark-200">
Enabling this will run any git pre and post commit hooks you have configured in your repository.
</p>
<form class="flex items-center gap-1">
<Checkbox
name="use-diff-context"
checked={useDiffContext}
disabled={useDiffContext}
on:change={() => {
useDiffContext = !useDiffContext;
dispatch('updated', { use_diff_context: useDiffContext });
}}
/>
<label class="ml-2" for="allow-force-pushing">
<div>
Use diffs with context lines internally (for migration purposes, can only be enabled)
</div>
</label>
</form>
<p class="ml-7 text-light-700 dark:text-dark-200">
Only toggle this with an empty workspace. If enabled, the application will use diffs with
context lines internally.
</p>
</div>

6
gitbutler-ui/src/routes/[projectId]/settings/+page.svelte
View File

@ -48,11 +48,7 @@
const onCloudUpdated = (e: { detail: Project }) =>
projectService.updateProject({ ...$project$, ...e.detail });
const onPreferencesUpdated = (e: {
detail: {
ok_with_force_push?: boolean;
omit_certificate_check?: boolean;
use_diff_context?: boolean;
};
detail: { ok_with_force_push?: boolean; omit_certificate_check?: boolean };
}) => projectService.updateProject({ ...$project$, ...e.detail });
const onDetailsUpdated = async (e: { detail: Project }) => {
const api =