Fix Jujutsu remote bookmark detection with jj > 0.35

Review Request #14706 — Created Nov. 24, 2025 and submitted

Information

RBTools
master

Reviewers

Jujutsu now creates colocated repositories by default (repositories
which can be treated as either jj or git repos), and the
remote_bookmarks template method is now returning the git-tracking
bookmark in addition to the real remote ref name. This broke the remote
bookmark detection because we were now getting results as "main@origin
main@git" instead of just "main@origin", which didn't parse correctly
when passed in to other commands.

This change fixes this by updating the commands that fetch remote
bookmarks to filter out the "git" remote from the results. Things which
expect to fetch a single result will now also split lines and choose the
first result. In practice what was there before should be fine after the
filter change, but I'd rather be cautious.

Unit tests pass again.

Summary ID
Fix Jujutsu remote bookmark detection with jj > 0.35
Jujutsu now creates colocated repositories by default (repositories which can be treated as either jj or git repos), and the `remote_bookmarks` template method is now returning the git-tracking bookmark in addition to the real remote ref name. This broke the remote bookmark detection because we were now getting results as "main@origin main@git" instead of just "main@origin", which didn't parse correctly when passed in to other commands. This change fixes this by updating the commands that fetch remote bookmarks to filter out the "git" remote from the results. Things which expect to fetch a single result will now also split lines and choose the first result. In practice what was there before should be fine after the filter change, but I'd rather be cautious. Testing Done: Unit tests pass again.
komnkttzpqnlvvzvzpyptszmtqnpypqo
Description From Last Updated

Looks fine, but can we have unit tests for these code paths?

chipx86chipx86
chipx86
  1. 
      
  2. Show all issues

    Looks fine, but can we have unit tests for these code paths?

    1. These code paths are exercised by a lot of the existing tests. I discovered the 0.35 change because we had 14 failures after I updated my version.

  3. 
      
chipx86
  1. Ship It!
  2. 
      
maubin
  1. Ship It!
  2. 
      
david
Review request changed
Status:
Completed
Change Summary:
Pushed to master (a43a29f)