Select all my branches with the goal of rebasing them all on the trunk

[jennings]

After fetching the latest main, I want to rebase all of my work onto it.

[jennings]

The revset mutable() & mine() may be enough to select all branches you're interested in. Use --branch to rebase all branches containing those commits (short form: -b).

$ jj rebase -b 'all:mutable() & mine()' -d trunk()

This revset was written by pelme in Discord.

[jennings]

After thinking about this problem more, I think the safer version of this is:

$ jj rebase -d main -s 'all:(::main)+ & mutable()'

---

At first, it might seem like simply rebasing mutable() would work:

# WARNING: May cause problems, see below
$ jj rebase -d main -r mutable()

However, that can accidentally transplant revisions. Suppose you pushed two revisions, and someone else put a bookmark on the first:

◆    M (main)
|
| ○  C (my-branch)
| |
| ◆  B (someone-else@origin)
|/
◆    A

jj's default settings would make revision B immutable because an untracked remote bookmark points to it. If you rebase -r mutable(), revision C will be transplanted:

○    C' (my-branch)
|
◆    M (main)
|
| ◆  B (someone-else@origin)
|/
◆

So, you probably want to rebase all mutable changes whose parent is in the main branch. The revset below will select the base of each branch off main, as long as it's mutable. We use -s instead of -r so we only have to select the base of the branch, not the entire thing.

$ jj rebase -d main -s 'all:(::main)+ & mutable()'

Explanation:

     ::main                     Start with all commits in the main branch
    (::main)+                   All immediate children of those...
    (::main)+ & mutable()       ...as long as they're mutable (anything in ::main will be excluded)
all:(::main)+ & mutable()       Allows `-s` to operate on multiple commits

This does lose the mine() filter. You could update the revset to (::main)+ & mutable() & mine(), though that filter will only apply to the first revision in the branch.