Skip to content

Commit 7ecfb95

Browse files
authored
chore: update Code to 1.71.1 (#5558)
* chore: update Code to 1.71.1 * chore: refresh patches * docs: add quilt refresh tip
1 parent 309a3b2 commit 7ecfb95

File tree

6 files changed

+16
-7
lines changed

6 files changed

+16
-7
lines changed

docs/CONTRIBUTING.md

+9
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,15 @@ re-apply the patches.
111111
6. Commit the updated submodule and patches to `code-server`.
112112
7. Open a PR.
113113

114+
Tip: if you're certain all patches are applied correctly and you simply need to
115+
refresh, you can use this trick:
116+
117+
```shell
118+
while quilt push; do quilt refresh; done
119+
```
120+
121+
[Source](https://raphaelhertzog.com/2012/08/08/how-to-use-quilt-to-manage-patches-in-debian-packages/)
122+
114123
### Patching Code
115124

116125
0. You can go through the patch stack with `quilt push` and `quilt pop`.

patches/disable-builtin-ext-update.diff

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
1818
if (!this.local.preRelease && this.gallery.properties.isPreReleaseVersion) {
1919
return false;
2020
}
21-
@@ -1121,6 +1125,10 @@ export class ExtensionsWorkbenchService
21+
@@ -1121,6 +1125,10 @@ export class ExtensionsWorkbenchService
2222
// Skip if check updates only for builtin extensions and current extension is not builtin.
2323
continue;
2424
}

patches/logout.diff

+2-2
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/client.ts
6868
constructor (
6969
@ILogService private logService: ILogService,
7070
@INotificationService private notificationService: INotificationService,
71-
@@ -82,6 +86,10 @@ export class CodeServerClient extends Di
71+
@@ -81,6 +85,10 @@ export class CodeServerClient extends Di
7272
if (this.productService.updateEndpoint) {
7373
this.checkUpdates(this.productService.updateEndpoint)
7474
}
@@ -79,7 +79,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/client.ts
7979
}
8080

8181
private checkUpdates(updateEndpoint: string) {
82-
@@ -133,4 +141,25 @@ export class CodeServerClient extends Di
82+
@@ -132,4 +140,25 @@ export class CodeServerClient extends Di
8383

8484
updateLoop();
8585
}

patches/service-worker.diff

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/client.ts
3636
===================================================================
3737
--- code-server.orig/lib/vscode/src/vs/workbench/browser/client.ts
3838
+++ code-server/lib/vscode/src/vs/workbench/browser/client.ts
39-
@@ -90,6 +90,10 @@ export class CodeServerClient extends Di
39+
@@ -89,6 +89,10 @@ export class CodeServerClient extends Di
4040
if (this.productService.logoutEndpoint) {
4141
this.addLogoutCommand(this.productService.logoutEndpoint);
4242
}
@@ -47,7 +47,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/client.ts
4747
}
4848

4949
private checkUpdates(updateEndpoint: string) {
50-
@@ -162,4 +166,17 @@ export class CodeServerClient extends Di
50+
@@ -161,4 +165,17 @@ export class CodeServerClient extends Di
5151
});
5252
}
5353
}

patches/update-check.diff

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/client.ts
2929
) {
3030
super();
3131
}
32-
@@ -72,5 +78,59 @@ export class CodeServerClient extends Di
32+
@@ -71,5 +77,59 @@ export class CodeServerClient extends Di
3333
},
3434
});
3535
}

0 commit comments

Comments
 (0)