diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index 64dd13842..01e92a436 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -111,6 +111,15 @@ re-apply the patches. 6. Commit the updated submodule and patches to `code-server`. 7. Open a PR. +Tip: if you're certain all patches are applied correctly and you simply need to +refresh, you can use this trick: + +```shell +while quilt push; do quilt refresh; done +``` + +[Source](https://raphaelhertzog.com/2012/08/08/how-to-use-quilt-to-manage-patches-in-debian-packages/) + ### Patching Code 0. You can go through the patch stack with `quilt push` and `quilt pop`. diff --git a/lib/vscode b/lib/vscode index 784b0177c..a44493aed 160000 --- a/lib/vscode +++ b/lib/vscode @@ -1 +1 @@ -Subproject commit 784b0177c56c607789f9638da7b6bf3230d47a8c +Subproject commit a44493aed3c9ccdec18a4bc00869403736b29c64 diff --git a/patches/disable-builtin-ext-update.diff b/patches/disable-builtin-ext-update.diff index 69ea92048..adf6ca304 100644 --- a/patches/disable-builtin-ext-update.diff +++ b/patches/disable-builtin-ext-update.diff @@ -18,7 +18,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens if (!this.local.preRelease && this.gallery.properties.isPreReleaseVersion) { return false; } -@@ -1121,6 +1125,10 @@ export class ExtensionsWorkbenchService +@@ -1121,6 +1125,10 @@ export class ExtensionsWorkbenchService // Skip if check updates only for builtin extensions and current extension is not builtin. continue; } diff --git a/patches/logout.diff b/patches/logout.diff index 999ebdf03..400708885 100644 --- a/patches/logout.diff +++ b/patches/logout.diff @@ -68,7 +68,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/client.ts constructor ( @ILogService private logService: ILogService, @INotificationService private notificationService: INotificationService, -@@ -82,6 +86,10 @@ export class CodeServerClient extends Di +@@ -81,6 +85,10 @@ export class CodeServerClient extends Di if (this.productService.updateEndpoint) { this.checkUpdates(this.productService.updateEndpoint) } @@ -79,7 +79,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/client.ts } private checkUpdates(updateEndpoint: string) { -@@ -133,4 +141,25 @@ export class CodeServerClient extends Di +@@ -132,4 +140,25 @@ export class CodeServerClient extends Di updateLoop(); } diff --git a/patches/service-worker.diff b/patches/service-worker.diff index 8d39a827d..967e51b7d 100644 --- a/patches/service-worker.diff +++ b/patches/service-worker.diff @@ -36,7 +36,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/client.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/workbench/browser/client.ts +++ code-server/lib/vscode/src/vs/workbench/browser/client.ts -@@ -90,6 +90,10 @@ export class CodeServerClient extends Di +@@ -89,6 +89,10 @@ export class CodeServerClient extends Di if (this.productService.logoutEndpoint) { this.addLogoutCommand(this.productService.logoutEndpoint); } @@ -47,7 +47,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/client.ts } private checkUpdates(updateEndpoint: string) { -@@ -162,4 +166,17 @@ export class CodeServerClient extends Di +@@ -161,4 +165,17 @@ export class CodeServerClient extends Di }); } } diff --git a/patches/update-check.diff b/patches/update-check.diff index 63c55921e..ba81a4b4c 100644 --- a/patches/update-check.diff +++ b/patches/update-check.diff @@ -29,7 +29,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/client.ts ) { super(); } -@@ -72,5 +78,59 @@ export class CodeServerClient extends Di +@@ -71,5 +77,59 @@ export class CodeServerClient extends Di }, }); }