From dd755d18ac7ebc621a719a3fd52361bc657853e5 Mon Sep 17 00:00:00 2001 From: Mattias Granlund Date: Tue, 16 Apr 2024 10:24:05 +0200 Subject: [PATCH] Fix bug where occasionally locked commit info is missing - happens when the commit is already pushed --- app/src/lib/components/FileStatusIcons.svelte | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/src/lib/components/FileStatusIcons.svelte b/app/src/lib/components/FileStatusIcons.svelte index 9fb26e785..e399b0949 100644 --- a/app/src/lib/components/FileStatusIcons.svelte +++ b/app/src/lib/components/FileStatusIcons.svelte @@ -3,7 +3,7 @@ import Icon from '$lib/components/Icon.svelte'; import { computeFileStatus } from '$lib/utils/fileStatus'; import { tooltip } from '$lib/utils/tooltip'; - import { getLocalCommits } from '$lib/vbranches/contexts'; + import { getLocalCommits, getRemoteCommits } from '$lib/vbranches/contexts'; import { getLockText } from '$lib/vbranches/tooltip'; import { type AnyFile, LocalFile } from '$lib/vbranches/types'; @@ -11,9 +11,13 @@ // TODO: Refactor this into something more meaningful. const localCommits = file instanceof LocalFile ? getLocalCommits() : undefined; + const remoteCommits = file instanceof LocalFile ? getRemoteCommits() : undefined; $: lockedIds = file.lockedIds; - $: lockText = lockedIds.length > 0 && $localCommits ? getLockText(lockedIds, $localCommits) : ''; + $: lockText = + lockedIds.length > 0 && $localCommits + ? getLockText(lockedIds, ($localCommits || []).concat($remoteCommits || [])) + : '';