Skip to content

Highlighting of the current selection gets confused with "elided revisions" #101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ilyagr opened this issue Feb 20, 2025 · 11 comments
Open
Labels
bug Something isn't working

Comments

@ilyagr
Copy link

ilyagr commented Feb 20, 2025

I tried out lazyjj 0.5, and it got confused with my weird log. The (elided commits) message might be the source of confusion. (I have not tested previous versions of lazyjj)

All the entries below the (elided revisions) also get highlighted wrong (offset by a line)

Image

https://asciinema.org/a/Mc8ZOWXHpZaed6n23KmdAAW9R

@Cretezy Cretezy added the bug Something isn't working label Feb 25, 2025
@Cretezy
Copy link
Owner

Cretezy commented Feb 25, 2025

Definitely a bug, this shouldn't be happening. Will take a look

@Cretezy
Copy link
Owner

Cretezy commented Mar 1, 2025

Can you provide a repo + revset where this happens? It seems to be working as expected for me (using the jj repo and the default revset)

@ilyagr
Copy link
Author

ilyagr commented Mar 1, 2025

Try this revset: main|main--|main---.

@Cretezy
Copy link
Owner

Cretezy commented Mar 1, 2025

Seems to be working for me. What OS/terminal/shell are you on?

@ilyagr
Copy link
Author

ilyagr commented Mar 1, 2025

Hmm, weird. Maybe it's because I'm on nightly jj?

I use ARM Mac OS Sonoma, tmux, fish shell. Though I also might have SHELL=dash set.

Image

@Cretezy
Copy link
Owner

Cretezy commented Mar 1, 2025

Might be nightly. I'll try this out myself on macOS too (I use fish too)

@ilyagr
Copy link
Author

ilyagr commented Mar 1, 2025

I think it's something about my config. JJ_CONFIG=/dev/null lazyjj seems to fix it (note the longer email addresses).

Image

@Cretezy
Copy link
Owner

Cretezy commented Mar 1, 2025

Can you share your config? I'm thinking it's likely something to do with the built-in templates being overriden

@ilyagr
Copy link
Author

ilyagr commented Mar 1, 2025

@Cretezy
Copy link
Owner

Cretezy commented Mar 2, 2025

I still can't reproduce this with a freshly built jj (commit 6261d576da39e5f290b064b850012bfb3c08ad5f) and with your config on Linux with fish and kitty.

cargo run -- --path ~/code/jj -r "main|main--|main---" --jj-bin ~/code/jj/target/release/jj

Going to try on macOS soon. Can you share your jj --version?

Edit: Can't reproduce with same config and nightly jj on macOS either. I use fish and kitty

@ilyagr
Copy link
Author

ilyagr commented Mar 5, 2025

Actually, I suddenly have trouble reproducing it as well. I'm not sure what changed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

No branches or pull requests

2 participants