refactor and more cleanup

Author: jasonhawkharris

client/web-sveltekit/src/lib/repo/HistoryPanel.svelte

@@ -65,19 +65,18 @@
                     {@const revURL = isPerforceDepot ? commit.perforceChangelist?.canonicalURL : commit.canonicalURL}
                     {@const revID = isPerforceDepot ? commit.perforceChangelist?.cid : commit.abbreviatedOID}
                     {@const revType = isPerforceDepot ? 'changelist' : 'commit'}
+                    {@const revQueryParams = isPerforceDepot
+                        ? `?rev=changelist%2f${revID}&diff=1`
+                        : `?rev=${revID}&diff=1`}
+                    {@const revSlug = isPerforceDepot ? `${revType}/${revID}` : revID || ''}
 
                     <tr class:selected use:scrollIntoViewOnMount={selected}>
                         <td class="revision">
                             <Badge variant="link"><a href={revURL}>{revID}</a></Badge>
                         </td>
                         <td class="subject">
                             {#if enableInlineDiff}
-                                <a
-                                    href={selected
-                                        ? closeURL
-                                        : `?rev=${isPerforceDepot ? `${revType}%2f${revID}` : revID}&diff=1`}
-                                    >{commit.subject}</a
-                                >
+                                <a href={selected ? closeURL : revQueryParams}>{commit.subject}</a>
                             {:else}
                                 {commit.subject}
                             {/if}
@@ -90,7 +89,7 @@
                         <td class="actions">
                             {#if enableViewAtCommit}
                                 <Tooltip tooltip={selected && !diffEnabled ? `Close ${revType}` : `View at ${revType}`}>
-                                    <a href={selected && !diffEnabled ? closeURL : `?rev=${commit.oid}`}
+                                    <a href={selected && !diffEnabled ? closeURL : revQueryParams}
                                         ><Icon icon={ILucideFileText} inline aria-hidden /></a
                                     >
                                 </Tooltip>
@@ -99,7 +98,7 @@
                                 <a
                                     href={replaceRevisionInURL(
                                         SourcegraphURL.from($page.url).deleteSearchParameter('rev', 'diff').toString(),
-                                        isPerforceDepot ? `changelist/${revID}` : revID || ''
+                                        revSlug
                                     )}><Icon icon={ILucideFolderGit} inline aria-hidden /></a
                                 >
                             </Tooltip>

client/web-sveltekit/src/routes/[...repo=reporev]/(validrev)/(code)/-/blob/[...path]/+page.ts

@@ -38,33 +38,33 @@ async function loadDiffView({ params, url }: PageLoadEvent) {
 
     assertNonNullable(revisionOverride, 'revisionOverride is set')
 
-    return cid
-        ? {
-              type: 'DiffView' as const,
-              enableInlineDiff: true,
-              enableViewAtCommit: true,
-              filePath,
-              commit: client
-                  .query(BlobDiffViewChangelistQuery, {
-                      repoName,
-                      cid: cid,
-                      path: filePath,
-                  })
-                  .then(mapOrThrow(result => result.data?.repository?.changelist?.commit ?? null)),
-          }
-        : {
-              type: 'DiffView' as const,
-              enableInlineDiff: true,
-              enableViewAtCommit: true,
-              filePath,
-              commit: client
-                  .query(BlobDiffViewCommitQuery, {
-                      repoName,
-                      revspec: revisionOverride,
-                      path: filePath,
-                  })
-                  .then(mapOrThrow(result => result.data?.repository?.commit ?? null)),
-          }
+    const getRevision = () => {
+        if (cid) {
+            return client
+                .query(BlobDiffViewChangelistQuery, {
+                    repoName,
+                    cid: cid,
+                    path: filePath,
+                })
+                .then(mapOrThrow(result => result.data?.repository?.changelist?.commit ?? null))
+        }
+
+        return client
+            .query(BlobDiffViewCommitQuery, {
+                repoName,
+                revspec: revisionOverride,
+                path: filePath,
+            })
+            .then(mapOrThrow(result => result.data?.repository?.commit ?? null))
+    }
+
+    return {
+        type: 'DiffView' as const,
+        enableInlineDiff: true,
+        enableViewAtCommit: true,
+        filePath,
+        commit: getRevision(),
+    }
 }
 
 async function fetchCodeGraphData(