Skip to content

Add Compare link to README.md - #35

Open
edrex wants to merge 35 commits into
usagi-flow:mainfrom
edrex:patch-2
Open

Add Compare link to README.md#35
edrex wants to merge 35 commits into
usagi-flow:mainfrom
edrex:patch-2

Conversation

@edrex

@edrex edrex commented Jul 16, 2024

Copy link
Copy Markdown

I added a link to compare changes in main vs upstream master, which shows no changes. You can select another head branch from the /compare menu, and feel free to make any changes.

So I'm a little confused. Is there code? Was there a PR that made this unnecessary? Please update the docs with the latest status, in the interest of transparency. Thanks!

usagi-flow added 30 commits May 18, 2024 20:35
commit a750143
Author: usagi-flow <2804556+usagi-flow@users.noreply.github.com>
Date:   Wed May 15 20:56:11 2024 +0200

    doc(evil): add a notice regarding the branch being rebased

commit 88e3b5f
Author: usagi-flow <2804556+usagi-flow@users.noreply.github.com>
Date:   Wed May 15 20:56:11 2024 +0200

    doc(evil): add a screenshot

commit 1227eeb
Author: usagi-flow <2804556+usagi-flow@users.noreply.github.com>
Date:   Wed May 15 20:56:11 2024 +0200

    doc(evil): fix links in README.md

commit 5ca6c2c
Author: usagi-flow <2804556+usagi-flow@users.noreply.github.com>
Date:   Wed May 15 20:56:11 2024 +0200

    doc(evil): Update README.md
commit 13654f9
Author: usagi-flow <2804556+usagi-flow@users.noreply.github.com>
Date:   Sat May 18 00:03:44 2024 +0200

    feat(ci): pr test/build workflow

commit 80f3586
Author: usagi-flow <2804556+usagi-flow@users.noreply.github.com>
Date:   Sat May 18 00:03:44 2024 +0200

    fix(ci): x86_64 macos build

commit 26d458b
Author: usagi-flow <2804556+usagi-flow@users.noreply.github.com>
Date:   Thu Apr 25 20:44:51 2024 +0200

    fix(ci): build and create a release when a release tag is pushed

commit b89d1e3
Author: usagi-flow <2804556+usagi-flow@users.noreply.github.com>
Date:   Thu Apr 25 20:44:51 2024 +0200

    fix(ci): mac builds

commit 4fee940
Author: usagi-flow <2804556+usagi-flow@users.noreply.github.com>
Date:   Thu Apr 25 20:44:51 2024 +0200

    feat(commands): ci
commit f107739
Author: usagi-flow <2804556+usagi-flow@users.noreply.github.com>
Date:   Mon Jul 18 16:43:24 2022 +0200

    feat(tui): minimalistic vertical window separator
commit 3c50f91
Author: usagi-flow <2804556+usagi-flow@users.noreply.github.com>
Date:   Fri Oct 21 22:52:20 2022 +0200

    feat(statusline): if color_modes is enabled, color the file type as well
commit 33162d4
Author: usagi-flow <2804556+usagi-flow@users.noreply.github.com>
Date:   Thu May 16 23:28:26 2024 +0200

    feat(defaults): use `catppuccin_macchiato` as the default theme

commit b719768
Author: usagi-flow <2804556+usagi-flow@users.noreply.github.com>
Date:   Thu May 16 23:28:26 2024 +0200

    fix(defaults): smart tab shouldn't be enabled by default
commit b4d065f
Author: usagi-flow <2804556+usagi-flow@users.noreply.github.com>
Date:   Thu Apr 25 20:44:51 2024 +0200

    feat(commands): implement partial line-based selection

commit 62881a8
Author: usagi-flow <2804556+usagi-flow@users.noreply.github.com>
Date:   Sun Feb 11 15:44:20 2024 +0100

    feat(commands): introduce an `evil` configuration option

    Introduce an `evil` configuration option and respective defaults

commit 7217fad
Author: usagi-flow <2804556+usagi-flow@users.noreply.github.com>
Date:   Sun Feb 11 15:44:20 2024 +0100

    feat(commands): ensure the last character remains selected when pressing 'b' in select mode

commit 2852cf8
Author: usagi-flow <2804556+usagi-flow@users.noreply.github.com>
Date:   Fri Mar 31 19:17:20 2023 +0200

    feat(commands): avoid selections in the normal/insert mode

commit c8f4b11
Author: usagi-flow <2804556+usagi-flow@users.noreply.github.com>
Date:   Fri Mar 31 18:21:13 2023 +0200

    feat(command): don't crash when using an unsupported motion key

commit 06dee1c
Author: usagi-flow <2804556+usagi-flow@users.noreply.github.com>
Date:   Fri Mar 31 17:58:38 2023 +0200

    feat(commands): avoid crash when using a count after the action key which includes 0

    - The 0-key would be incorrectly interpreted as a motion key.

commit 72e2cd6
Author: usagi-flow <2804556+usagi-flow@users.noreply.github.com>
Date:   Fri Mar 31 14:35:41 2023 +0200

    feat(commands): better word movement

    - Do not move the anchor when performing a word-based movement in selection mode.

commit 51833cd
Author: usagi-flow <2804556+usagi-flow@users.noreply.github.com>
Date:   Sun Mar 26 17:01:12 2023 +0200

    feat(commands): implement "delete_immediate" (x)

commit e10ce6e
Author: usagi-flow <2804556+usagi-flow@users.noreply.github.com>
Date:   Sat Nov 19 15:00:53 2022 +0100

    feat(commands): adjust writing to the register following upstream API changes

commit de0c9c2
Author: usagi-flow <2804556+usagi-flow@users.noreply.github.com>
Date:   Sat Oct 22 14:01:11 2022 +0200

    feat(commands): evil-specific movement (no normal-mode selection)

commit 750b68d
Author: usagi-flow <2804556+usagi-flow@users.noreply.github.com>
Date:   Sat Oct 22 00:27:05 2022 +0200

    feat(commands): initial change (replace) implementation

commit 9925128
Author: usagi-flow <2804556+usagi-flow@users.noreply.github.com>
Date:   Fri Oct 21 22:42:30 2022 +0200

    feat(commands): word-based selection

commit d37bd99
Author: usagi-flow <2804556+usagi-flow@users.noreply.github.com>
Date:   Wed Oct 19 22:00:39 2022 +0200

    feat(commands): initial word-based selection

commit e6bc49e
Author: usagi-flow <2804556+usagi-flow@users.noreply.github.com>
Date:   Sun Oct 16 12:43:44 2022 +0200

    feat(commands): prepare for word-based motions

commit 548333f
Author: usagi-flow <2804556+usagi-flow@users.noreply.github.com>
Date:   Sat Oct 1 15:14:14 2022 +0200

    feat(commands): code adjustments following API changes

commit aeb0bf7
Author: usagi-flow <2804556+usagi-flow@users.noreply.github.com>
Date:   Tue Aug 16 23:07:25 2022 +0200

    feat(commands): delete command, refactoring

commit f595eed
Author: usagi-flow <2804556+usagi-flow@users.noreply.github.com>
Date:   Sun Aug 14 14:39:36 2022 +0200

    feat(commands): better count handling in evil mode

commit b445a1c
Author: usagi-flow <2804556+usagi-flow@users.noreply.github.com>
Date:   Sat May 14 18:25:21 2022 +0200

    feat(commands): evil mode
commit cdc53f42e8e9eeb19f7411bd3d026d75188cd8f5
Author: Jesse Luehrs <doy@tozt.net>
Date:   Sun Sep 17 13:25:52 2023 -0400

    add a separate "helix:" modeline for setting helix-specific config

    for example, if the language name differs between vim and helix

commit 01554579e9ffdb2922b68bc55a42c36be76d3f4f
Author: Jesse Luehrs <doy@tozt.net>
Date:   Sun Sep 17 12:35:57 2023 -0400

    add basic modeline support

    currently only supports setting language, indent style, and line endings
When starting without a user configuration, the editor would load with `evil` set to `false`.
Fix this by not only adjusting the defaults, but by separating the defaults in respective `default_evil()` functions.
The editor is now evil by default.
…line` opt-in (usagi-flow#13)

* feat(defaults): statusline layout and colors

Adjust the default layout and enable mode/file-type colors by default

* refactor(defaults): treat the different smart-tab default as an evil-specific default

* feat(defaults): disable `insert_final_newline` by default

This is not a decision that the editor should take for the user. Make it opt-in instead.
* test(defaults): fix `keys_resolve_to_correct_defaults`

* test(defaults): fix `parsing_keymaps_config_file`
…ow#26)

* feat(evil): implement the long word motions (`W`, `B`, `E`)

* feat(evil): add support for word motions `e`, `W`, `B` and `E` when used with a command
usagi-flow and others added 5 commits June 15, 2024 10:32
I added a link to compare changes in `main` vs upstream `master`, which shows no changes. You can select another head branch from the `/compare` menu, and feel free to make any changes.

So I'm a little confused. Is there code? Was there a PR that made this unnecessary? Please update the docs with the latest status, in the interest of transparency. Thanks!
@usagi-flow

usagi-flow commented Jul 22, 2024

Copy link
Copy Markdown
Owner

Hmm the idea is great, but as you point out, GitHub fails to show the changes.

I'm not sure, but my guess would be that because this repository isn't registered as a "fork" of Helix, GH can't compare the repos. (See #9 for the reason why I changed the repo from a "fork" to a standalone repo).

The changes can be inspected quite easily with Git though, although that requires a local clone:

git clone https://github.com/usagi-flow/evil-helix.git
git remote add upstream https://github.com/helix-editor/helix.git
git fetch upstream
git diff --name-status upstream/master main

This will output something like this:

A       .forgejo/workflows/build.yaml
M       .github/workflows/build.yml
A       .github/workflows/evil-build-pr.yml
A       .github/workflows/evil-build-tag.yml
A       .github/workflows/evil-check-pr.yml
M       .github/workflows/gh-pages.yml
M       .github/workflows/release.yml
M       README.md
M       helix-core/src/lib.rs
A       helix-core/src/modeline.rs
M       helix-core/src/movement.rs
M       helix-core/src/syntax.rs
M       helix-loader/build.rs
M       helix-term/src/commands.rs
A       helix-term/src/commands/evil.rs
M       helix-term/src/config.rs
M       helix-term/src/keymap.rs
M       helix-term/src/keymap/default.rs
M       helix-term/src/main.rs
M       helix-term/src/ui/editor.rs
M       helix-term/src/ui/picker.rs
M       helix-term/src/ui/picker/handlers.rs
M       helix-term/src/ui/prompt.rs
M       helix-term/src/ui/statusline.rs
M       helix-tui/src/symbols.rs
M       helix-view/src/document.rs
M       helix-view/src/editor.rs
M       helix-view/src/theme.rs
M       languages.toml
M       runtime/themes/kanagawa.toml
M       runtime/tutor
M       screenshot.png

Of course, this is just an example. You can also remove --name-status for a complete diff, for instance.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants