Skip to content
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.

Sign up for GitHub

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

Jump to bottom

FR: jj log respect the diff pager config #4142

Open
mycraftmw opened this issue Jul 24, 2024 · 3 comments
Open

FR: jj log respect the diff pager config #4142

mycraftmw opened this issue Jul 24, 2024 · 3 comments

Comments

@mycraftmw
Copy link

Is your feature request related to a problem? Please describe.
I config the jj diff pager to be delta, and it works like a charm for jj diff. However, when I use jj log -p file, it starts to print the patch in git style without using delta as pager.

Describe the solution you'd like
I'd like that jj log can respect the diff pager config.
@yuja
Copy link
Contributor

yuja commented Jul 24, 2024

iirc, delta can't parse graph output, so you'll probably need to pass --no-graph.

@ilyagr
Copy link
Contributor

ilyagr commented Jul 24, 2024 •
edited
Loading

You could also try using delta as jj log -p --tool delta file. This should work iff jj diff --tool delta works, though currently delta might not wrap lines at quite the right number of columns. (I find typing -S inside less very helpful when this becomes an issue)

@mycraftmw
Copy link
Author

Thanks for all these hint❤️, though indeed delta doesn't render the diff with the right width. And the file name is shown incorrectly as well.😢 It will have a prefix for both left and right files kind of like this

private/var/folders/73/ysn2m_2n7dv7mbw2yzfgm11m0000gp/T/jj-diff-ZJqo2w/left/

Anyway, maybe it's the time to try diff-so-fancy. 🙈

rwjblue added a commit to rwjblue/dotfiles that referenced this issue Mar 4, 2025
@rwjblue
feat(jj): Only use pager=delta for jj diff
076bc06 
Prior to this change, running `jj log` (where the results are large
enough to need a pager) would leverage `delta` as a pager (which
internally uses `less`). Without `delta`, `jj` invokes `less -FRX`.
Importantly, that `-X` means "preserve the view" when you quit the
pager. However, when you have `pager="delta"` configured delta is
internally calling `less` and does not pass `-X` option. This means that
the `jj log` output is _cleared_ from the terminal when `less` exits.
This is pretty frustrating because the most common workflow for me is to
use `jj log` to determine the changeset id that I need to rebase,
squash, etc into and when the output is cleared I just have to
"remember" it (which I get wrong often).

This change leverages a feature of jj@0.26.0 which allows `--scope` to
use `--when.command` to limit whatever configuration settings to a
specific `jj` subcommand. In this case, I am only configuring `ui.pager`
and `ui.diff.format` for the `jj diff` subcommand. This preserves the
(massively better) delta diff output, but allows for the better `jj log`
experience (leaving the last view on screen).

One thing to note is that `jj log` does support `-p` flag to show the
diff. At the moment, `-p` does not actually use the configured `pager`
anyways, but in the future if it does I may need to figure out how to
tweak this config to also apply to `jj log -p` as well (keep an eye on
jj-vcs/jj#4142 for that).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
3 participants
@yuja @ilyagr @mycraftmw