lazyjj icon indicating copy to clipboard operation
lazyjj copied to clipboard

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

Open ilyagr opened this issue 10 months ago • 11 comments

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

ilyagr avatar Feb 20 '25 22:02 ilyagr

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

Cretezy avatar Feb 25 '25 04:02 Cretezy

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)

Cretezy avatar Mar 01 '25 19:03 Cretezy

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

ilyagr avatar Mar 01 '25 19:03 ilyagr

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

Cretezy avatar Mar 01 '25 20:03 Cretezy

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

ilyagr avatar Mar 01 '25 20:03 ilyagr

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

Cretezy avatar Mar 01 '25 20:03 Cretezy

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

Image

ilyagr avatar Mar 01 '25 21:03 ilyagr

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

Cretezy avatar Mar 01 '25 21:03 Cretezy

My current config: https://gist.github.com/ilyagr/9f214ac8d0bd8211170979de44602906

ilyagr avatar Mar 01 '25 21:03 ilyagr

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

Cretezy avatar Mar 02 '25 17:03 Cretezy

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

ilyagr avatar Mar 05 '25 08:03 ilyagr