graph -> stacks: conformity

[Byron]

Bring the new Graph based backend for workspaces to conformity with the existing implementation - it shouldn't be worse, but ideally can be the daily driver for ws3 users.

Tasks

• remaining fixes
  • test commit-ownership for 'virtual' branches and remote-ref special case
    • Fixed underlying commit classification, without actually special casing this.
  • ref_info2 workspace should never be ignored (i.e. find workspace, but set entrypoint, or start at workspace and extract what's needed)
  • respect stack order
  • integrated dependent base branch should still show up
    • in-workspaces with all-integrated by identity (remote merged) stay visible (integrated_tips_stop_early)
      • assure sibling-id is set for target local tracking as well then
    • add reasonable base as first reachable integrated commit (simplified), maybe the merge-base between all workspace branches?
• add 'insert multi-segments above' capability for more natural reconciled graphs
  • Avoid remote segments inside the workspace, prefer to put them on top.
• split across stacks (those that are resting at the target ref (or maybe the merge base?))
  • We must be able to split out stacks of empty commits resting at the base, that is segments that will be mapped into stacks later. For that we connect them to the governing workspace.
  • This is also related to having a single commit with lots of refs on top, they all need to be split into stacks.
• 'archived' out-of-workspace refs are forcefully added (and marked) accordingly - archived segments can still be used for reconcilation if they are reachable, it's really about the frontend having this data even after a workspace update
• in-workspace segments with all-integrated-by-similarity (remote rebased + merged) stay visible (two_dependent_branches_first_rebased_and_merged_into_target)
• Validate that using the local tracking branch of target to compute the merge-base is the right choice
• ⚠️ fix related TODOs and known issues
• ⚠️assure parent-order is correct during traversal (must match parents in merge commits)
• delete now unused code

Not to forget

• There might be an issue with the way it uses searches - a tip with a search might be blocked at an existing commit, discovered by a tip with a different search, and even though the thing it searches is reachable through that, it stops looking.
• ⚠️ the amount of commits of remotes ahead of their local branch doesn't seem to always match git (particularly when it's a lot of them)
• ⚠️handle the archived flag
• ⚠️ current implementation supports multiple workspaces in theory, but it's not tested with them as the underlying ref-metadata is still VB-toml. So before supporting this, we probably already want to have migrated away from vb.toml, to then port the ref-metadata to something that can support more workspaces (also for testing).
• ⚠️ we probably don't correctly handle workspaces that include other workspaces.
• ⚠️ we probably don't handle dot-repositories correctly, by merit of not really having them in mind. At least they shouldn't be in the way of handling normal remotes.

Related

• ref-info: normal workflow #8905

Previous

• graph segmentation spike #8919
• graph segmentation #8935
• Full access needed to create Pull Requests #9096
• graph -> stacks #9122

[vercel]

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name	Status	Preview	Comments	Updated (UTC)
gitbutler-components	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Jul 8, 2025 6:10pm

[vercel]

@Byron is attempting to deploy a commit to the GitButler Team on Vercel.

A member of the Team first needs to authorize it.