rename fixes

src-tauri/src/virtual_branches/tests.rs

@@ -79,7 +79,6 @@ fn test_commit_on_branch_then_change_file_then_get_status() -> Result<()> {
         branch_name: "master".to_string(),
         remote_url: "origin".to_string(),
         sha: repository.head().unwrap().target().unwrap(),
-        behind: 0,
     })?;
     update_gitbutler_integration(&gb_repo, &project_repository)?;
 
@@ -163,7 +162,6 @@ fn test_track_binary_files() -> Result<()> {
         branch_name: "master".to_string(),
         remote_url: "origin".to_string(),
         sha: repository.head().unwrap().target().unwrap(),
-        behind: 0,
     })?;
     update_gitbutler_integration(&gb_repo, &project_repository)?;
 
@@ -260,7 +258,6 @@ fn test_create_branch_with_ownership() -> Result<()> {
         branch_name: "master".to_string(),
         remote_url: "origin".to_string(),
         sha: repository.head().unwrap().target().unwrap(),
-        behind: 0,
     })?;
     update_gitbutler_integration(&gb_repo, &project_repository)?;
 
@@ -327,7 +324,6 @@ fn test_create_branch_in_the_middle() -> Result<()> {
         remote_name: "origin".to_string(),
         remote_url: "origin".to_string(),
         sha: repository.head().unwrap().target().unwrap(),
-        behind: 0,
     })?;
     update_gitbutler_integration(&gb_repo, &project_repository)?;
 
@@ -381,7 +377,6 @@ fn test_create_branch_no_arguments() -> Result<()> {
         remote_name: "origin".to_string(),
         remote_url: "origin".to_string(),
         sha: repository.head().unwrap().target().unwrap(),
-        behind: 0,
     })?;
     update_gitbutler_integration(&gb_repo, &project_repository)?;
 
@@ -425,7 +420,6 @@ fn test_hunk_expantion() -> Result<()> {
         remote_name: "origin".to_string(),
         remote_url: "origin".to_string(),
         sha: repository.head().unwrap().target().unwrap(),
-        behind: 0,
     })?;
     update_gitbutler_integration(&gb_repo, &project_repository)?;
 
@@ -514,7 +508,6 @@ fn test_get_status_files_by_branch_no_hunks_no_branches() -> Result<()> {
         remote_name: "origin".to_string(),
         remote_url: "origin".to_string(),
         sha: repository.head().unwrap().target().unwrap(),
-        behind: 0,
     })?;
     update_gitbutler_integration(&gb_repo, &project_repository)?;
 
@@ -548,7 +541,6 @@ fn test_get_status_files_by_branch() -> Result<()> {
         remote_name: "origin".to_string(),
         remote_url: "origin".to_string(),
         sha: repository.head().unwrap().target().unwrap(),
-        behind: 0,
     })?;
     update_gitbutler_integration(&gb_repo, &project_repository)?;
 
@@ -609,7 +601,6 @@ fn test_updated_ownership_should_bubble_up() -> Result<()> {
         remote_name: "origin".to_string(),
         remote_url: "origin".to_string(),
         sha: repository.head().unwrap().target().unwrap(),
-        behind: 0,
     })?;
     update_gitbutler_integration(&gb_repo, &project_repository)?;
 
@@ -732,7 +723,6 @@ fn test_move_hunks_multiple_sources() -> Result<()> {
         remote_name: "origin".to_string(),
         remote_url: "origin".to_string(),
         sha: repository.head().unwrap().target().unwrap(),
-        behind: 0,
     })?;
     update_gitbutler_integration(&gb_repo, &project_repository)?;
 
@@ -849,7 +839,6 @@ fn test_move_hunks_partial_explicitly() -> Result<()> {
         remote_name: "origin".to_string(),
         remote_url: "origin".to_string(),
         sha: repository.head().unwrap().target().unwrap(),
-        behind: 0,
     })?;
     update_gitbutler_integration(&gb_repo, &project_repository)?;
 
@@ -946,7 +935,6 @@ fn test_add_new_hunk_to_the_end() -> Result<()> {
         remote_name: "origin".to_string(),
         remote_url: "origin".to_string(),
         sha: repository.head().unwrap().target().unwrap(),
-        behind: 0,
     })?;
     update_gitbutler_integration(&gb_repo, &project_repository)?;
 
@@ -1013,7 +1001,6 @@ fn test_update_branch_target_base() -> Result<()> {
         remote_name: "origin".to_string(),
         remote_url: "origin".to_string(),
         sha: repository.head().unwrap().target().unwrap(),
-        behind: 0,
     })?;
     update_gitbutler_integration(&gb_repo, &project_repository)?;
     repository.set_head("refs/heads/master")?;
@@ -1120,7 +1107,6 @@ fn test_update_branch_target_detect_integrated_branches() -> Result<()> {
         remote_name: "origin".to_string(),
         remote_url: "origin".to_string(),
         sha: repository.head().unwrap().target().unwrap(),
-        behind: 0,
     })?;
     update_gitbutler_integration(&gb_repo, &project_repository)?;
 
@@ -1206,7 +1192,6 @@ fn test_update_branch_target_detect_integrated_branches_with_more_work() -> Resu
         remote_name: "origin".to_string(),
         remote_url: "origin".to_string(),
         sha: repository.head().unwrap().target().unwrap(),
-        behind: 0,
     })?;
     update_gitbutler_integration(&gb_repo, &project_repository)?;
 
@@ -1302,7 +1287,6 @@ fn test_update_target_with_conflicts_in_vbranches() -> Result<()> {
         remote_name: "origin".to_string(),
         remote_url: "origin".to_string(),
         sha: repository.head().unwrap().target().unwrap(),
-        behind: 0,
     })?;
     update_gitbutler_integration(&gb_repo, &project_repository)?;
 
@@ -1623,7 +1607,6 @@ fn test_apply_unapply_branch() -> Result<()> {
         remote_name: "origin".to_string(),
         remote_url: "origin".to_string(),
         sha: repository.head().unwrap().target().unwrap(),
-        behind: 0,
     })?;
     update_gitbutler_integration(&gb_repo, &project_repository)?;
 
@@ -1730,7 +1713,6 @@ fn test_apply_unapply_added_deleted_files() -> Result<()> {
         remote_name: "origin".to_string(),
         remote_url: "origin".to_string(),
         sha: repository.head().unwrap().target().unwrap(),
-        behind: 0,
     })?;
     update_gitbutler_integration(&gb_repo, &project_repository)?;
 
@@ -1821,7 +1803,6 @@ fn test_detect_mergeable_branch() -> Result<()> {
         remote_name: "origin".to_string(),
         remote_url: "origin".to_string(),
         sha: repository.head().unwrap().target().unwrap(),
-        behind: 0,
     })?;
     update_gitbutler_integration(&gb_repo, &project_repository)?;
 
@@ -2000,7 +1981,6 @@ fn test_detect_remote_commits() -> Result<()> {
         remote_name: "origin".to_string(),
         remote_url: "http://origin.com/project".to_string(),
         sha: repository.head().unwrap().target().unwrap(),
-        behind: 0,
     })?;
     update_gitbutler_integration(&gb_repo, &project_repository)?;
 
@@ -2101,7 +2081,6 @@ fn test_create_vbranch_from_remote_branch() -> Result<()> {
         remote_name: "origin".to_string(),
         remote_url: "http://origin.com/project".to_string(),
         sha: repository.head().unwrap().target().unwrap(),
-        behind: 0,
     })?;
     repository.remote("origin", "http://origin.com/project")?;
     update_gitbutler_integration(&gb_repo, &project_repository)?;
@@ -2257,7 +2236,6 @@ fn test_create_vbranch_from_behind_remote_branch() -> Result<()> {
         branch_name: "master".to_string(),
         remote_url: "http://origin.com/project".to_string(),
         sha: upstream_commit,
-        behind: 0,
     })?;
     repository.remote("origin", "http://origin.com/project")?;
     update_gitbutler_integration(&gb_repo, &project_repository)?;
@@ -2363,7 +2341,6 @@ fn test_partial_commit() -> Result<()> {
         remote_name: "origin".to_string(),
         remote_url: "origin".to_string(),
         sha: repository.head().unwrap().target().unwrap(),
-        behind: 0,
     })?;
     update_gitbutler_integration(&gb_repo, &project_repository)?;
 
@@ -2506,7 +2483,6 @@ fn test_commit_add_and_delete_files() -> Result<()> {
         remote_name: "origin".to_string(),
         remote_url: "origin".to_string(),
         sha: commit1_oid,
-        behind: 0,
     })?;
     update_gitbutler_integration(&gb_repo, &project_repository)?;
 
@@ -2583,7 +2559,6 @@ fn test_commit_executable_and_symlinks() -> Result<()> {
         remote_name: "origin".to_string(),
         remote_url: "origin".to_string(),
         sha: commit1_oid,
-        behind: 0,
     })?;
     update_gitbutler_integration(&gb_repo, &project_repository)?;
 
@@ -2723,7 +2698,6 @@ fn test_apply_out_of_date_vbranch() -> Result<()> {
         remote_name: "origin".to_string(),
         remote_url: "http://origin.com/project".to_string(),
         sha: base_commit,
-        behind: 0,
     })?;
     repository.remote("origin", "http://origin.com/project")?;
     update_gitbutler_integration(&gb_repo, &project_repository)?;
@@ -2866,7 +2840,6 @@ fn test_apply_out_of_date_conflicting_vbranch() -> Result<()> {
         remote_name: "origin".to_string(),
         remote_url: "http://origin.com/project".to_string(),
         sha: base_commit,
-        behind: 0,
     })?;
     repository.remote("origin", "http://origin.com/project")?;
     update_gitbutler_integration(&gb_repo, &project_repository)?;
@@ -3044,7 +3017,6 @@ fn test_apply_conflicting_vbranch() -> Result<()> {
         remote_name: "origin".to_string(),
         remote_url: "http://origin.com/project".to_string(),
         sha: base_commit,
-        behind: 0,
     })?;
     update_gitbutler_integration(&gb_repo, &project_repository)?;
 

src/lib/vbranches/branchController.ts

@@ -1,7 +1,7 @@
 import type { Refreshable } from './branchStoresCache';
 import type { Readable } from '@square/svelte-store';
 import type { Loadable } from 'svelte-loadable-store';
-import type { Branch, BranchData, Target } from './types';
+import type { Branch, BranchData, BaseBranch } from './types';
 import { toasts } from '$lib';
 import { invoke } from '$lib/ipc';
 

src/routes/repo/[projectId]/Board.svelte

@@ -1,7 +1,7 @@
 <script lang="ts" async="true">
 	import Lane from './BranchLane.svelte';
 	import NewBranchDropZone from './NewBranchDropZone.svelte';
-	import type { Branch, Target } from '$lib/vbranches';
+	import type { Branch, BaseBranch } from '$lib/vbranches';
 	import { dzHighlight } from './dropZone';
 	import type { BranchController } from '$lib/vbranches';
 	import { getContext } from 'svelte';
@@ -10,7 +10,7 @@
 	export let projectId: string;
 	export let projectPath: string;
 	export let branches: Branch[];
-	export let target: Target;
+	export let target: BaseBranch;
 
 	const branchController = getContext<BranchController>(BRANCH_CONTROLLER_KEY);
 

src/routes/repo/[projectId]/BranchLane.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { toasts } from '$lib';
-	import type { Commit, File, Target } from '$lib/vbranches';
+	import type { Commit, File, BaseBranch } from '$lib/vbranches';
 	import { getContext, onMount } from 'svelte';
 	import { IconAISparkles, IconBranch } from '$lib/icons';
 	import { Button, Link, Modal } from '$lib/components';
@@ -24,7 +24,7 @@
 	export let projectId: string;
 	export let order: number;
 	export let conflicted: boolean;
-	export let target: Target;
+	export let target: BaseBranch;
 
 	const branchController = getContext<BranchController>(BRANCH_CONTROLLER_KEY);
 
@@ -109,7 +109,7 @@
 			.join('');
 	}
 
-	function url(target: Target, branchName: string) {
+	function url(target: BaseBranch, branchName: string) {
 		const baseBranchName = target.branchName.split('/')[1];
 		const repoBaseUrl = target.remoteUrl
 			.replace(':', '/')

src/routes/repo/[projectId]/Tray.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Button, Checkbox, Modal } from '$lib/components';
-	import type { Branch, BranchData, Target } from '$lib/vbranches';
+	import type { Branch, BranchData, BaseBranch } from '$lib/vbranches';
 	import { formatDistanceToNow } from 'date-fns';
 	import { IconGitBranch, IconRemote, IconRefresh } from '$lib/icons';
 	import { IconTriangleDown, IconTriangleUp } from '$lib/icons';
@@ -12,7 +12,7 @@
 	import { getContext } from 'svelte';
 	import { BRANCH_CONTROLLER_KEY } from '$lib/vbranches/branchController';
 
-	export let target: Target;
+	export let target: BaseBranch;
 	export let branches: Branch[];
 	export let remoteBranches: BranchData[];