How can I restore a specific fileset using an operation ID?

[zx8]

I want to restore a specific set of files to the state they were previously in, at a particular operation I have picked out of jj op log...

jj op restore restores the entire repository to the state it was in at the time - it does not allow me to pick the files i want

jj restore accepts filesets, but expects a revset, so I can't use the operation ID

I managed to get specific files back one-by-one with jj file show --at-op=627fe476fe76 [FILE] > [FILE] in the end, but is there an easier way to do this that I have missed in the documentation?

[arxanas]

Maybe this works?

$ jj restore --from 'at_operation(op, @)' <paths>

I can't link directly to the at_operation function, but it's the last function here: https://jj-vcs.github.io/jj/v0.26.0/revsets/#functions

[zx8]

This did the trick! Thank you.

[emilazy]

Another option that you may not know about is jj op show to get the commit ID that was changed in that operation, which you can then jj restore --from; that works even if the commit you were changing wasn’t @ at the time of the operation. Both jj op show and jj op log support -p/--patch to show the changes to commits, and jj op log supports --op-diff to show what jj op show does, which can help you navigate the operation log.

[zx8]

This is very useful too. It's a shame I can't mark both as the answer! 😁

I was able to create an alias to tie these methods together to make restoring from an operation much easier now.

[alias]
recover = ["util", "exec", "--", "bash", "-ec", '''
if [[ $# -eq 0 ]]; then
  echo "usage: jj recover <OPERATION> [FILESETS]..." >&2
  exit
fi

operation=$1
shift

if [[ $# -eq 0 ]]; then
  filesets=(.)
else
  filesets=("$@")
fi

commit=$(jj --at-op="$operation" log --no-graph --ignore-working-copy --revisions=@ --template='commit_id')

jj restore --from="$commit" -- "${filesets[@]}"
''', ""]