Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .vscode-test.mjs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { defineConfig } from '@vscode/test-cli';
import { defineConfig } from "@vscode/test-cli";

export default defineConfig({
files: 'out/test/**/*.test.js',
files: "out/test/**/*.test.js",
});
6 changes: 5 additions & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
{
// See http://go.microsoft.com/fwlink/?LinkId=827846
// for the documentation about the extensions.json format
"recommendations": ["dbaeumer.vscode-eslint", "connor4312.esbuild-problem-matchers", "ms-vscode.extension-test-runner"]
"recommendations": [
"dbaeumer.vscode-eslint",
"connor4312.esbuild-problem-matchers",
"ms-vscode.extension-test-runner"
]
}
26 changes: 11 additions & 15 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,15 @@
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
{
"version": "0.2.0",
"configurations": [
{
"name": "Run Extension",
"type": "extensionHost",
"request": "launch",
"args": [
"--extensionDevelopmentPath=${workspaceFolder}"
],
"outFiles": [
"${workspaceFolder}/dist/**/*.js"
],
"preLaunchTask": "${defaultBuildTask}"
}
]
"version": "0.2.0",
"configurations": [
{
"name": "Run Extension",
"type": "extensionHost",
"request": "launch",
"args": ["--extensionDevelopmentPath=${workspaceFolder}"],
"outFiles": ["${workspaceFolder}/dist/**/*.js"],
"preLaunchTask": "${defaultBuildTask}"
}
]
}
114 changes: 54 additions & 60 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -1,64 +1,58 @@
// See https://go.microsoft.com/fwlink/?LinkId=733558
// for the documentation about the tasks.json format
{
"version": "2.0.0",
"tasks": [
{
"label": "watch",
"dependsOn": [
"npm: watch:tsc",
"npm: watch:esbuild"
],
"presentation": {
"reveal": "never"
},
"group": {
"kind": "build",
"isDefault": true
}
},
{
"type": "npm",
"script": "watch:esbuild",
"group": "build",
"problemMatcher": "$esbuild-watch",
"isBackground": true,
"label": "npm: watch:esbuild",
"presentation": {
"group": "watch",
"reveal": "never"
}
},
{
"type": "npm",
"script": "watch:tsc",
"group": "build",
"problemMatcher": "$tsc-watch",
"isBackground": true,
"label": "npm: watch:tsc",
"presentation": {
"group": "watch",
"reveal": "never"
}
},
{
"type": "npm",
"script": "watch-tests",
"problemMatcher": "$tsc-watch",
"isBackground": true,
"presentation": {
"reveal": "never",
"group": "watchers"
},
"group": "build"
},
{
"label": "tasks: watch-tests",
"dependsOn": [
"npm: watch",
"npm: watch-tests"
],
"problemMatcher": []
}
]
"version": "2.0.0",
"tasks": [
{
"label": "watch",
"dependsOn": ["npm: watch:tsc", "npm: watch:esbuild"],
"presentation": {
"reveal": "never"
},
"group": {
"kind": "build",
"isDefault": true
}
},
{
"type": "npm",
"script": "watch:esbuild",
"group": "build",
"problemMatcher": "$esbuild-watch",
"isBackground": true,
"label": "npm: watch:esbuild",
"presentation": {
"group": "watch",
"reveal": "never"
}
},
{
"type": "npm",
"script": "watch:tsc",
"group": "build",
"problemMatcher": "$tsc-watch",
"isBackground": true,
"label": "npm: watch:tsc",
"presentation": {
"group": "watch",
"reveal": "never"
}
},
{
"type": "npm",
"script": "watch-tests",
"problemMatcher": "$tsc-watch",
"isBackground": true,
"presentation": {
"reveal": "never",
"group": "watchers"
},
"group": "build"
},
{
"label": "tasks: watch-tests",
"dependsOn": ["npm: watch", "npm: watch-tests"],
"problemMatcher": []
}
]
}
40 changes: 20 additions & 20 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,77 +2,77 @@

## 0.0.11

* Prevent switching the view to SCM view after changes. by @sbarfurth in https://github.com/sbarfurth/ukemi/pull/47
- Prevent switching the view to SCM view after changes. by @sbarfurth in https://github.com/sbarfurth/ukemi/pull/47

**Full Changelog**: https://github.com/sbarfurth/ukemi/compare/0.0.10...0.0.11

## 0.0.10

* Use icons to denote change state in graph. by @sbarfurth in https://github.com/sbarfurth/ukemi/pull/45
* Disable file tracking on custom backends. by @sbarfurth in https://github.com/sbarfurth/ukemi/pull/41
- Use icons to denote change state in graph. by @sbarfurth in https://github.com/sbarfurth/ukemi/pull/45
- Disable file tracking on custom backends. by @sbarfurth in https://github.com/sbarfurth/ukemi/pull/41

**Full Changelog**: https://github.com/sbarfurth/ukemi/compare/0.0.9...0.0.10

## 0.0.9

* Don't focus tree view after selection. by @sbarfurth in https://github.com/sbarfurth/ukemi/pull/42
* Fix incorrect calculation of root items in graph tree view. by @sbarfurth in https://github.com/sbarfurth/ukemi/pull/43
- Don't focus tree view after selection. by @sbarfurth in https://github.com/sbarfurth/ukemi/pull/42
- Fix incorrect calculation of root items in graph tree view. by @sbarfurth in https://github.com/sbarfurth/ukemi/pull/43

**Full Changelog**: https://github.com/sbarfurth/ukemi/compare/0.0.8...0.0.9

## 0.0.8

* Prevent showing immutable parent in SCM panel. by @sbarfurth in https://github.com/sbarfurth/ukemi/pull/36
* Provide more customization on change nodes in graph. by @sbarfurth in https://github.com/sbarfurth/ukemi/pull/37
* Show progress indicator when checking out a revision by @dakhlopkau in https://github.com/sbarfurth/ukemi/pull/35
* Add commit tree view. by @sbarfurth in https://github.com/sbarfurth/ukemi/pull/39
- Prevent showing immutable parent in SCM panel. by @sbarfurth in https://github.com/sbarfurth/ukemi/pull/36
- Provide more customization on change nodes in graph. by @sbarfurth in https://github.com/sbarfurth/ukemi/pull/37
- Show progress indicator when checking out a revision by @dakhlopkau in https://github.com/sbarfurth/ukemi/pull/35
- Add commit tree view. by @sbarfurth in https://github.com/sbarfurth/ukemi/pull/39

### New Contributors

* @dakhlopkau made their first contribution in https://github.com/sbarfurth/ukemi/pull/35
- @dakhlopkau made their first contribution in https://github.com/sbarfurth/ukemi/pull/35

**Full Changelog**: https://github.com/sbarfurth/ukemi/compare/0.0.7...0.0.8

## 0.0.7

* Allow configuring graph revset. by @sbarfurth in https://github.com/sbarfurth/ukemi/pull/28
* Open working copy on right side of diff editors. by @sbarfurth in https://github.com/sbarfurth/ukemi/pull/30
* Switch open and diff actions on SCM file resources. by @sbarfurth in https://github.com/sbarfurth/ukemi/pull/31
- Allow configuring graph revset. by @sbarfurth in https://github.com/sbarfurth/ukemi/pull/28
- Open working copy on right side of diff editors. by @sbarfurth in https://github.com/sbarfurth/ukemi/pull/30
- Switch open and diff actions on SCM file resources. by @sbarfurth in https://github.com/sbarfurth/ukemi/pull/31

**Full Changelog**: https://github.com/sbarfurth/ukemi/compare/0.0.6...0.0.7

## 0.0.6

* add bookmarks to graph view by @sesceu in https://github.com/sbarfurth/ukemi/pull/25
* fix missing working copy indicator by @sesceu in https://github.com/sbarfurth/ukemi/pull/26
- add bookmarks to graph view by @sesceu in https://github.com/sbarfurth/ukemi/pull/25
- fix missing working copy indicator by @sesceu in https://github.com/sbarfurth/ukemi/pull/26

### New Contributors

* @sesceu made their first contribution in https://github.com/sbarfurth/ukemi/pull/25
- @sesceu made their first contribution in https://github.com/sbarfurth/ukemi/pull/25

**Full Changelog**: https://github.com/sbarfurth/ukemi/compare/0.0.5...0.0.6

## 0.0.5

* *no user-visible changes*
- _no user-visible changes_

**Full Changelog**: https://github.com/sbarfurth/ukemi/compare/0.0.3...0.0.5

## 0.0.3

* Fix remaining references to "Kaisen" in codebase. by @sbarfurth in https://github.com/sbarfurth/ukemi/pull/11
- Fix remaining references to "Kaisen" in codebase. by @sbarfurth in https://github.com/sbarfurth/ukemi/pull/11

**Full Changelog**: https://github.com/sbarfurth/ukemi/compare/0.0.2...0.0.3

## 0.0.2

* *no user-visible changes*
- _no user-visible changes_

**Full Changelog**: https://github.com/sbarfurth/ukemi/compare/0.0.1...0.0.2

## 0.0.1

* Show open button on parent commit. by @sbarfurth in https://github.com/sbarfurth/ukemi/pull/1
- Show open button on parent commit. by @sbarfurth in https://github.com/sbarfurth/ukemi/pull/1

**Full Changelog**: https://github.com/sbarfurth/ukemi/commits/0.0.1

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ Feel free to contribute to the extension.

### Requirements

* [Node.js](https://nodejs.org/en) 22
* [zig](https://ziglang.org/) 15.2
- [Node.js](https://nodejs.org/en) 22
- [zig](https://ziglang.org/) 15.2

### Setup

Expand Down
38 changes: 19 additions & 19 deletions languages/jj-commit.language-configuration.json
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{
"comments": {
"lineComment": "JJ:",
"blockComment": [ "JJ:", " " ]
},
"brackets": [
["{", "}"],
["[", "]"],
["(", ")"]
],
"autoClosingPairs": [
{ "open": "{", "close": "}" },
{ "open": "[", "close": "]" },
{ "open": "(", "close": ")" },
{ "open": "'", "close": "'", "notIn": ["string", "comment"] },
{ "open": "\"", "close": "\"", "notIn": ["string"] },
{ "open": "`", "close": "`", "notIn": ["string", "comment"] },
]
}
{
"comments": {
"lineComment": "JJ:",
"blockComment": ["JJ:", " "]
},
"brackets": [
["{", "}"],
["[", "]"],
["(", ")"]
],
"autoClosingPairs": [
{ "open": "{", "close": "}" },
{ "open": "[", "close": "]" },
{ "open": "(", "close": ")" },
{ "open": "'", "close": "'", "notIn": ["string", "comment"] },
{ "open": "\"", "close": "\"", "notIn": ["string"] },
{ "open": "`", "close": "`", "notIn": ["string", "comment"] }
]
}
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -723,7 +723,8 @@
"pretest": "npm run compile-tests && npm run compile",
"check-types": "tsc --noEmit",
"lint": "eslint src",
"test": "node out/test/runTest.js"
"test": "node out/test/runTest.js",
"format": "prettier --write ."
},
"devDependencies": {
"@types/cross-spawn": "^6.0.6",
Expand Down
2 changes: 1 addition & 1 deletion src/decorationProvider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
Event,
ThemeColor,
} from "vscode";
import { FileStatus, FileStatusType } from "./repository";
import { FileStatus, FileStatusType } from "./jj/types";
import { getParams, toJJUri } from "./uri";

const colorOfType = (type: FileStatusType) => {
Expand Down
Loading
Loading