mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
tvl-depot/third_party/gerrit/0002-Syntax-highlight-nix.patch

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

25 lines
874 B
Diff
Raw Normal View History

chore(3p/gerrit): update gerrit and plugins This reverts commit 9551b628d02323b01ecb80220342eea488f7200e (i.e. this is a rollfoward for https://cl.tvl.fyi/c/depot/+/2817) Change-Id: Iaffcf1cdbe119d26ecb09cc88f9a56436b374c08 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2870 Reviewed-by: tazjin <mail@tazj.in> Tested-by: BuildkiteCI
2021-04-06 11:27:20 +02:00
From 556c4f189d0ed41fb5ad59545ffcf5e957bbb820 Mon Sep 17 00:00:00 2001
fix(gerrit): return HTML titles in more cases At present, we don't return HTML titles if there's a trailing slash, or a patchset. Instead, just consume the / and anything after it. This also fixes /123, because this is HTTP redirected to the full path *with a trailing slash* which otherwise wouldn't get the title injected. Change-Id: Idfd0e67752880a37dce0b400a3c1cfc53fac2912 Reviewed-on: https://cl.tvl.fyi/c/depot/+/859 Reviewed-by: BuildkiteCI Reviewed-by: tazjin <mail@tazj.in> Tested-by: BuildkiteCI
2020-07-03 00:28:39 +02:00
From: Luke Granger-Brown <git@lukegb.com>
Date: Thu, 2 Jul 2020 23:02:32 +0100
chore(3p/gerrit): update gerrit and plugins This reverts commit 9551b628d02323b01ecb80220342eea488f7200e (i.e. this is a rollfoward for https://cl.tvl.fyi/c/depot/+/2817) Change-Id: Iaffcf1cdbe119d26ecb09cc88f9a56436b374c08 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2870 Reviewed-by: tazjin <mail@tazj.in> Tested-by: BuildkiteCI
2021-04-06 11:27:20 +02:00
Subject: [PATCH 2/7] Syntax highlight nix
fix(gerrit): return HTML titles in more cases At present, we don't return HTML titles if there's a trailing slash, or a patchset. Instead, just consume the / and anything after it. This also fixes /123, because this is HTTP redirected to the full path *with a trailing slash* which otherwise wouldn't get the title injected. Change-Id: Idfd0e67752880a37dce0b400a3c1cfc53fac2912 Reviewed-on: https://cl.tvl.fyi/c/depot/+/859 Reviewed-by: BuildkiteCI Reviewed-by: tazjin <mail@tazj.in> Tested-by: BuildkiteCI
2020-07-03 00:28:39 +02:00
---
chore(3p/gerrit): update to latest upstream HEAD Change-Id: Ia7b17ca83ace164881a4dd8b0288741489bc467c Reviewed-on: https://cl.tvl.fyi/c/depot/+/2164 Tested-by: BuildkiteCI Reviewed-by: glittershark <grfn@gws.fyi> Reviewed-by: tazjin <mail@tazj.in>
2020-11-27 18:39:35 +01:00
.../app/elements/diff/gr-syntax-layer/gr-syntax-layer.ts | 1 +
fix(gerrit): return HTML titles in more cases At present, we don't return HTML titles if there's a trailing slash, or a patchset. Instead, just consume the / and anything after it. This also fixes /123, because this is HTTP redirected to the full path *with a trailing slash* which otherwise wouldn't get the title injected. Change-Id: Idfd0e67752880a37dce0b400a3c1cfc53fac2912 Reviewed-on: https://cl.tvl.fyi/c/depot/+/859 Reviewed-by: BuildkiteCI Reviewed-by: tazjin <mail@tazj.in> Tested-by: BuildkiteCI
2020-07-03 00:28:39 +02:00
1 file changed, 1 insertion(+)
chore(3p/gerrit): update to latest upstream HEAD Change-Id: Ia7b17ca83ace164881a4dd8b0288741489bc467c Reviewed-on: https://cl.tvl.fyi/c/depot/+/2164 Tested-by: BuildkiteCI Reviewed-by: glittershark <grfn@gws.fyi> Reviewed-by: tazjin <mail@tazj.in>
2020-11-27 18:39:35 +01:00
diff --git a/polygerrit-ui/app/elements/diff/gr-syntax-layer/gr-syntax-layer.ts b/polygerrit-ui/app/elements/diff/gr-syntax-layer/gr-syntax-layer.ts
chore(3p/gerrit): update gerrit and plugins This reverts commit 9551b628d02323b01ecb80220342eea488f7200e (i.e. this is a rollfoward for https://cl.tvl.fyi/c/depot/+/2817) Change-Id: Iaffcf1cdbe119d26ecb09cc88f9a56436b374c08 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2870 Reviewed-by: tazjin <mail@tazj.in> Tested-by: BuildkiteCI
2021-04-06 11:27:20 +02:00
index 081d28d749..2762ccc625 100644
chore(3p/gerrit): update to latest upstream HEAD Change-Id: Ia7b17ca83ace164881a4dd8b0288741489bc467c Reviewed-on: https://cl.tvl.fyi/c/depot/+/2164 Tested-by: BuildkiteCI Reviewed-by: glittershark <grfn@gws.fyi> Reviewed-by: tazjin <mail@tazj.in>
2020-11-27 18:39:35 +01:00
--- a/polygerrit-ui/app/elements/diff/gr-syntax-layer/gr-syntax-layer.ts
+++ b/polygerrit-ui/app/elements/diff/gr-syntax-layer/gr-syntax-layer.ts
chore(3p/gerrit): update gerrit and plugins This reverts commit 9551b628d02323b01ecb80220342eea488f7200e (i.e. this is a rollfoward for https://cl.tvl.fyi/c/depot/+/2817) Change-Id: Iaffcf1cdbe119d26ecb09cc88f9a56436b374c08 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2870 Reviewed-by: tazjin <mail@tazj.in> Tested-by: BuildkiteCI
2021-04-06 11:27:20 +02:00
@@ -99,6 +99,7 @@ const LANGUAGE_MAP = new Map<string, string>([
chore(3p/gerrit): update to latest upstream HEAD Change-Id: Ia7b17ca83ace164881a4dd8b0288741489bc467c Reviewed-on: https://cl.tvl.fyi/c/depot/+/2164 Tested-by: BuildkiteCI Reviewed-by: glittershark <grfn@gws.fyi> Reviewed-by: tazjin <mail@tazj.in>
2020-11-27 18:39:35 +01:00
['text/x-vhdl', 'vhdl'],
['text/x-yaml', 'yaml'],
['text/vbscript', 'vbscript'],
+ ['application/x-mix-transfer', 'nix'],
]);
feat(gerrit): Syntax highlight .nix files. highlight.js supports syntax highlighting .nix files, but the Gerrit diff components doesn't map the .nix mimetype onto the nix language. .nix appears to already be taken by another mimetype that isn't Nix-related, but we just map that onto nix anyway. https://usercontent.irccloud-cdn.com/file/AVhoPvrb/highlighted.png Change-Id: I842b29c78355e5bec580e711e25d693284ab6f59 Reviewed-on: https://cl.tvl.fyi/c/depot/+/253 Reviewed-by: tazjin <mail@tazj.in> Reviewed-by: q3k <q3k@q3k.org>
2020-06-14 13:36:04 +02:00
const ASYNC_DELAY = 10;
fix(gerrit): return HTML titles in more cases At present, we don't return HTML titles if there's a trailing slash, or a patchset. Instead, just consume the / and anything after it. This also fixes /123, because this is HTTP redirected to the full path *with a trailing slash* which otherwise wouldn't get the title injected. Change-Id: Idfd0e67752880a37dce0b400a3c1cfc53fac2912 Reviewed-on: https://cl.tvl.fyi/c/depot/+/859 Reviewed-by: BuildkiteCI Reviewed-by: tazjin <mail@tazj.in> Tested-by: BuildkiteCI
2020-07-03 00:28:39 +02:00
--
chore(3p/gerrit): update to latest upstream HEAD Change-Id: Ia7b17ca83ace164881a4dd8b0288741489bc467c Reviewed-on: https://cl.tvl.fyi/c/depot/+/2164 Tested-by: BuildkiteCI Reviewed-by: glittershark <grfn@gws.fyi> Reviewed-by: tazjin <mail@tazj.in>
2020-11-27 18:39:35 +01:00
2.29.2
fix(gerrit): return HTML titles in more cases At present, we don't return HTML titles if there's a trailing slash, or a patchset. Instead, just consume the / and anything after it. This also fixes /123, because this is HTTP redirected to the full path *with a trailing slash* which otherwise wouldn't get the title injected. Change-Id: Idfd0e67752880a37dce0b400a3c1cfc53fac2912 Reviewed-on: https://cl.tvl.fyi/c/depot/+/859 Reviewed-by: BuildkiteCI Reviewed-by: tazjin <mail@tazj.in> Tested-by: BuildkiteCI
2020-07-03 00:28:39 +02:00
Reference in a new issue Copy permalink