1
1
mirror of https://github.com/kahole/edamagit.git synced 2024-10-05 19:47:53 +03:00
Commit Graph

747 Commits

Author SHA1 Message Date
Kristian Andersen Hole
f25a828366 v0.6.62 2024-09-12 13:12:24 +02:00
Kristian Andersen Hole
75597b9dd6
Merge pull request #305 from RichardDRJ/develop 2024-09-09 18:59:06 +02:00
Richard Jones 🎵
7a1fa5454c Fix: Don't pass ELECTRON_RUN_AS_NODE to subprocess
This change addresses #303, preventing commit messages from being written in remote hosts.

In VSCode's `server-cli.js`, it checks for the `ELECTRON_RUN_AS_NODE` environment variable, and if it's present it maps the `fs` module to point to the `original-fs` module:

```javascript
(process.env.ELECTRON_RUN_AS_NODE || process.versions.electron) &&
  c.define("fs", ["original-fs"], function (r) {
    return r;
  }),
```

This module is present in Electron, but not in base NodeJS; base NodeJS is what's used by the VSCode remote server, so having this environment variable present when `code` is called from a subprocess will cause failure.

An alternative, but more involved, fix here might be to move to using `ShellExecution` or `ProcessExecution` rather than `child_process`; I expect that they will support calling `code` from a nested process, but they have a fairly different API.
2024-08-13 12:14:03 +00:00
Kristian Andersen Hole
c9dd914b77 changelog 2024-04-03 16:56:22 +02:00
Kristian Andersen Hole
dd36f9e471
Merge pull request #294 from bezbac/develop
Improve `magit-branch-spinoff` implementation
2024-04-03 16:55:24 +02:00
Ben Bachem
e0faf63d85
address pr comments 2024-03-29 15:25:55 +01:00
Ben Bachem
dc5cd8ddf7
improve magit-branch-spinoff implementation 2024-03-27 23:20:55 +01:00
Kristian Andersen Hole
0fd309db0a changelog 2024-03-25 18:30:28 +01:00
Kristian Andersen Hole
cce3727048
Merge pull request #290 from bezbac/develop
Adds support for `magit-branch-spinoff`
2024-03-25 18:28:01 +01:00
Kristian Andersen Hole
d02ed6fd95
Merge pull request #293 from garymm/develop
Set --no-ext-diff when running git diff
2024-03-25 18:27:22 +01:00
Gary Miguel
4ee6091b36
Set --no-ext-diff when running git diff
If a user has the following set in their git config:

```properties
[diff]
  external = difft
```

edmagit will fail to parse the `git diff` output. This should fix that.

Fixes https://github.com/kahole/edamagit/issues/228
2024-03-25 10:08:15 -07:00
Ben Bachem
1a323ef4fa
adds support for magit-branch-spinoff 2024-03-07 16:34:29 +01:00
Kristian Andersen Hole
5254658934
Merge pull request #289 from black7375/monorepo-setting
Update README for monorepo setting
2024-03-04 22:45:35 +01:00
MS_Y
cd6b2e5fcf
Update README for monorepo setting 2024-03-01 16:00:10 +09:00
Kristian Andersen Hole
b968cfda62 fixup! adds no verify to merge commit 2024-01-23 14:13:00 +01:00
Kristian Andersen Hole
7c9edfecd1 changelog 2024-01-23 13:50:03 +01:00
Kristian Andersen Hole
63c1ea1cd5 adds no verify to merge commit 2024-01-23 13:40:18 +01:00
Kristian Andersen Hole
cc51974ce9 changelog 2024-01-18 22:25:45 +01:00
Kristian Andersen Hole
12617656c6 adds no verify switch to merging commands 2024-01-18 22:23:52 +01:00
Kristian Andersen Hole
3f66cd1cb5 check cursor-word chooseRef is actually a commit, otherwise throw away 2024-01-18 22:23:06 +01:00
Kristian Andersen Hole
153b0d6751 adds git -c diff.noprefix=false to raw commands (adressing #276) 2024-01-18 22:21:26 +01:00
Kristian Andersen Hole
f026de4e19
Merge pull request #287 from ajmcmiddlin/patch-1
Update extensions.vim_tab entry in README.md.
2024-01-08 08:39:52 +01:00
Andrew
9b4639a5e9
Update extensions.vim_tab entry in README.md.
The keybindings for `extensions.vim_tab` did not work for me. The tab key didn't toggle folding of sections as expected. Removing the `when` field in the `-extensions.vim_tab` entry seemed to fix the problem for me.
2024-01-02 13:18:30 +10:00
Kristian Andersen Hole
4fff85a512 changelog 2023-12-29 13:35:53 +01:00
Kristian Andersen Hole
1e3efab596 fix commitDetail overwrite loss of control issue 2023-12-29 13:34:09 +01:00
Kristian Andersen Hole
7d575c50be changelog 2023-12-27 11:19:14 +01:00
Kristian Andersen Hole
d438b66fd8 fix "visit change" uris for commit and stash detail views 2023-12-27 11:17:56 +01:00
Kristian Andersen Hole
6d4125795e new logo 2023-12-09 19:10:04 +01:00
Kristian Andersen Hole
584a5eeee5 changelog 2023-12-09 15:48:10 +01:00
Kristian Andersen Hole
31bd62b4c0 make commit and stash detail view update on changes (fixes #282) 2023-12-09 15:48:10 +01:00
Kristian Andersen Hole
4d059d141f changelog 2023-12-04 17:16:24 +01:00
Kristian Andersen Hole
550083724f
Merge pull request #285 from bzy-debug/fix-233
Check all editors when computing viewColumn, so that one magit status buffer won't be open in different editors (@bzy-debug
Bao Zhiyuan)
2023-12-04 17:15:37 +01:00
Kristian Andersen Hole
0d17f57d62
Merge pull request #267 from ianic/fix-remote-insiders-path
fix vscode-insiders path for the remote environment
2023-12-04 17:10:49 +01:00
Kristian Andersen Hole
12e901b7cf
Merge pull request #284 from bzy-debug/cursor-commit-hash
feat: show commit hash under cursor when checkout
2023-12-04 17:06:01 +01:00
bzy-debug
154822599b add commit hash under curosr in chooseRef 2023-12-01 23:26:57 +08:00
bzy-debug
6532b4a1dc Check all editors when computing viewColumn 2023-12-01 23:23:26 +08:00
Kristian Andersen Hole
64cd537db2 changelog 2023-11-29 12:46:52 +01:00
Kristian Andersen Hole
d62043a2c3 adds context id to commit detail change section
To avoid conflict with status view folding states
2023-11-29 12:45:46 +01:00
Kristian Andersen Hole
8cecd1e443 changelog 2023-11-06 15:26:19 +01:00
Kristian Andersen Hole
0951c000e3 parse untracked paths as paths and not uris (fixes #281) 2023-11-06 15:23:36 +01:00
Kristian Andersen Hole
ebbd313532
Update README.md 2023-10-26 02:53:12 +02:00
Kristian Andersen Hole
16012c39ee changelog 2023-10-12 00:32:52 +02:00
Kristian Andersen Hole
a0c21e7fee Properly dispose "Running git" status bar messages
This fixes issue #279 meaning messages won't get stuck
in the status bar any longer.
This commit also disables status messages for magit status, to
reduce noise.
2023-10-12 00:30:59 +02:00
Kristian Andersen Hole
53d8f64ae1 changelog 2023-10-08 17:57:06 +02:00
Kristian Andersen Hole
e82f11094c update links to tutorial 2023-10-08 17:44:04 +02:00
Kristian Andersen Hole
8829229881
Merge pull request #278 from jdanbrown/more-move-commands
More move commands: section/change/hunk, unstaged/staged changes
2023-10-08 17:40:16 +02:00
Kristian Andersen Hole
fe1a861861
Update macros.ts 2023-10-08 17:34:02 +02:00
Kristian Andersen Hole
9a12bc3b15
Merge branch 'develop' into more-move-commands 2023-10-08 17:31:16 +02:00
Kristian Andersen Hole
7308619938
Merge pull request #271 from evannjohnson/conciseLogDecorate
Concise log decorate
2023-10-08 17:29:18 +02:00
Kristian Andersen Hole
9578299b88
Merge pull request #268 from Rutherther/feat/fold-commit-detail
Support fold/unfold diff hunks in commit detail view
2023-10-08 17:28:58 +02:00