OXYGENHUB

0.17.1: back to oxygenhub.oxygen-vscode 3701d06abc9b

The Marketplace lists Oxygen VCS as oxygenhub.oxygen-vscode, so the
extension keeps that id and updates in place; two copies under different
ids registered the same commands and the second failed to start.
Author
Andy McCall @andymccall <[email protected]>
When
· 2026-09-30 19:06 UTC
Signature
✔ signed by Andy McCall
Hash
3701d06abc9beb64b1368807c4635c12aaab3455b019fdf08c12d550d975c526
Depends on
196392053c9f 26410312ce16 bed495a96408 f532c4266f21
Depended on by
390a91e2e39c
In bookmarks
main
In tags
v0.17.1 v0.18.0
Edits
13 atoms, 0 tree operations, 5 files

Browse the tree at this change

modified CHANGELOG.md +4 −0
1 1
# Changelog
2 2
3 +
## 0.17.1 (2026-09-30)
4 +
5 +
- **Back to `oxygenhub.oxygen-vscode`**, the id the Visual Studio Marketplace lists as Oxygen VCS, so it updates in place. Uninstall `oxygenhub.oxygen` if VS Code shows it: two copies register the same commands, and the second fails to start.
6 +
3 7
## 0.17.0 (2026-09-30)
4 8
5 9
- **A new id: `oxygenhub.oxygen`.** The Visual Studio Marketplace keeps a deleted extension's name reserved, so the extension is now named `oxygen` beside OxygenHub's `oxygenhub`. It is still Oxygen VCS, and OxygenHub's `vscode://` links use the new id. Uninstall `oxygenhub.oxygen-vscode` if VS Code shows both.
…
111 unchanged lines
modified package-lock.json +2 −2
1 1
{
2 -
  "name": "oxygen",
2 +
  "name": "oxygen-vscode",
3 3
  "version": "0.1.0",
4 4
  "lockfileVersion": 3,
5 5
  "requires": true,
6 6
  "packages": {
7 7
    "": {
8 -
      "name": "oxygen",
8 +
      "name": "oxygen-vscode",
9 9
      "version": "0.1.0",
10 10
      "license": "MIT OR Apache-2.0",
11 11
      "devDependencies": {
…
2361 unchanged lines
modified package.json +2 −2
1 1
{
2 -
  "name": "oxygen",
2 +
  "name": "oxygen-vscode",
3 3
  "displayName": "Oxygen VCS",
4 4
  "description": "Oxygen version control: source control view, diffs, decorations, bookmarks and history for oxy repositories",
5 -
  "version": "0.17.0",
5 +
  "version": "0.17.1",
6 6
  "publisher": "oxygenhub",
7 7
  "author": {
8 8
    "name": "OxygenHub.io",
…
1219 unchanged lines
modified src/extension.ts +2 −2
…
742 unchanged lines
743 743
}
744 744
745 745
/**
746 -
 * vscode://oxygenhub.oxygen/resolve?url=…&bookmark=…&path=… from
746 +
 * vscode://oxygenhub.oxygen-vscode/resolve?url=…&bookmark=…&path=… from
747 747
 * OxygenHub's conflict resolver: find the open repository with that remote
748 748
 * (or offer to clone it), switch to the bookmark if asked to, pull it, and
749 749
 * open the file, where the conflict lenses take over.
…
67 unchanged lines
817 817
}
818 818
819 819
/**
820 -
 * vscode://oxygenhub.oxygen/plan?… from OxygenHub's swimlanes: squash
820 +
 * vscode://oxygenhub.oxygen-vscode/plan?… from OxygenHub's swimlanes: squash
821 821
 * or rebase a change of a proposal's bookmark here, where it is signed as
822 822
 * you, then push the rewritten bookmark.
823 823
 */
…
804 unchanged lines
modified src/handoff.ts +2 −2
1 1
// "Resolve in VS Code" (OxygenHub's conflict resolver hands a conflict to
2 -
// the extension): vscode://oxygenhub.oxygen/resolve?url=…&bookmark=…&path=…
2 +
// the extension): vscode://oxygenhub.oxygen-vscode/resolve?url=…&bookmark=…&path=…
3 3
// Parsing and matching live here, apart from VS Code, so they are tested.
4 4
5 5
export interface ResolveRequest {
…
46 unchanged lines
52 52
53 53
/**
54 54
 * A rewrite planned on OxygenHub's swimlanes:
55 -
 * vscode://oxygenhub.oxygen/plan?url=…&bookmark=…&kind=…&change=…&target=…
55 +
 * vscode://oxygenhub.oxygen-vscode/plan?url=…&bookmark=…&kind=…&change=…&target=…
56 56
 */
57 57
export function parsePlanQuery(query: string): PlanRequest | string {
58 58
  const q = new URLSearchParams(query);
…
16 unchanged lines