diff --git a/src/components/Icon.svelte b/src/components/Icon.svelte index fd49098e2..f6424397d 100644 --- a/src/components/Icon.svelte +++ b/src/components/Icon.svelte @@ -12,6 +12,7 @@ | "chevron-up" | "clipboard" | "clipboard-small" + | "diff" | "ellipsis" | "exclamation" | "exclamation-circle" @@ -94,6 +95,16 @@ 10.5H8C7.72386 10.5 7.5 10.2761 7.5 10ZM7.5 13C7.5 12.7239 7.72386 12.5 8 12.5H13C13.2761 12.5 13.5 12.7239 13.5 13C13.5 13.2761 13.2761 13.5 13 13.5H8C7.72386 13.5 7.5 13.2761 7.5 13Z" /> + {:else if name === "diff"} + + + {:else if name === "ellipsis"}
+ + {utils.formatTimestamp(revisionTimestamp)} + {#if response?.diff.stats} {@const { insertions, deletions } = response.diff.stats} {/if} - - {utils.formatTimestamp(revisionTimestamp)} - + {#if previousRevOid} + + + + {/if} + + + + + + + + + {#if item.value === projectHead} + Compare to {projectDefaultBranch} ({utils.formatObjectId( + projectHead, + )}) + {:else if previousRevId} + Compare to previous revision ({utils.formatObjectId( + previousRevId, + )}) + {/if} + + + + +
{#if expanded} diff --git a/src/views/projects/Patch.svelte b/src/views/projects/Patch.svelte index 611fd6936..979862b74 100644 --- a/src/views/projects/Patch.svelte +++ b/src/views/projects/Patch.svelte @@ -67,8 +67,10 @@ export let baseUrl: BaseUrl; export let patch: Patch; export let projectHead: string; + export let projectDefaultBranch: string; export let revision: string; export let currentTab: "activity" | "commits" | "files"; + export let diff: string | undefined = undefined; const api = new HttpdClient(baseUrl); @@ -293,7 +295,7 @@ {option.title} @@ -308,6 +310,16 @@ {/if} {/each} + {#if diff} + + + Diff {diff.substr(0, 6)}..{diff.split("..")[1].substr(0, 6)} + + + {/if} {#if currentTab !== "activity"} @@ -347,23 +359,40 @@ {/if} {#if currentTab === "activity"} - {#each timelineTuple as [revision, timelines], index} - + {#if diff} + {#await api.project.getDiff(projectId, diff.split("..")[0], diff.split("..")[1]) then diff} +
+ +
+ {:catch e} + + {/await} {:else} - -
No activity
-
No activity on this patch yet
-
- {/each} + {#each timelineTuple as [revision, timelines], index} + {@const previousRevision = + index > 0 ? patch.revisions[index - 1] : undefined} + + {:else} + +
No activity
+
No activity on this patch yet
+
+ {/each} + {/if} {:else if currentTab === "commits"} {#await api.project.getDiff(projectId, currentRevision.base, currentRevision.oid) then diff}
diff --git a/src/views/projects/View.svelte b/src/views/projects/View.svelte index 1b781a36a..7269d7013 100644 --- a/src/views/projects/View.svelte +++ b/src/views/projects/View.svelte @@ -38,6 +38,7 @@ $: patchTabFilter = (searchParams.get("tab") as "activity" | "commits" | "files") || "activity"; $: patchFilter = (searchParams.get("state") as PatchStatus) || "open"; + $: patchDiffFilter = searchParams.get("diff") || undefined; $: baseUrl = utils.extractBaseUrl(activeRoute.params.hostnamePort); $: api = new HttpdClient(baseUrl); @@ -271,10 +272,12 @@ {patch} {baseUrl} projectId={project.id} + projectDefaultBranch={project.defaultBranch} projectHead={project.head} revision={activeRoute.params.view.params.revision ?? latestRevision.id} - currentTab={patchTabFilter} /> + currentTab={patchTabFilter} + diff={patchDiffFilter} /> {:catch e}