showing upstream changes

[brianmay]

Given I just run jj git fetch, I would like to display a log of all new revisions made upstream, and also a diff of all changes upstream. This is something I commonly do in git by copying and pasting the rev range output by the fetch command. But jj doesn't do that.

I think the following command would display the log (assuming I am on the main branch here):

jj log -r "..main@origin~..@"

(is this the best way of doing this?)

But is there any easy way to show the diff of all these changes?

I tried:

jj diff -r "..main@origin~..@"

But that won't work. Unless there is only one change upstream, I think that might work. But in general, it complains that there are too many revisions given. Which is not surprising.

But I can't think right now how to get this to work.

[scott2000]

I think ..b ~ ..a is equivalent to a..b, so you could use jj log -r @..main@origin to make the log revset a bit simpler. For the diff, I think you'd currently have to explicitly use the fork point like jj diff --from 'fork_point(@ | main@origin)' --to main@origin?

In the next release of jj, I believe jj diff -r will support multiple revisions though, so I think you could also do jj diff -r @..main@origin in the next release and it should work as expected now.

That revset will show all of the changes on main@origin that aren't on your branch, regardless of whether they were from the most recent fetch or not. You might also want something like jj log -r 'at_operation(@-, main@origin)..main@origin' to show the changes in main@origin that weren't in main@origin before the last operation (the fetch operation). This would only work immediately after the fetch though.

[brianmay]

Thanks for that. These commands do look good. And the at_operation is not something I was expecting to see.

Look forward to trying the new diff support after the next version is released.