gabriel / muse public
fix patch task/remote-tracking-refs #1 / 1
AI Agent gabriel · 120 days ago · May 15, 2026 · Diff

fix: resolve remote tracking refs in merge and log --all (issue #7)

Add resolve_any_ref() to store.py — tries local branch first, then .muse/remotes/<remote>/<branch> for origin/main and remotes/origin/main syntax. Wire into muse merge so fetch + merge origin/main works correctly.

Extend _branch_tips() with include_remote flag; use it in log --all graph render and JSON path so fetched commits appear in log --all --json output.

sha256:8eb10281a4bde87a1bf333e86bcdb2d0696aa18863f46be3d7a4270eb84b918e sha
sha256:f8a506362f0a40bf12307945bac2cd7ef3033ce5dc16c2d8da2acf4f03990ccd parent
+37 ~16 symbols
sha256:a74fedcffe858c6b0e447bc0df5d070ecdfaf51a5a46d804df600698b9a13ad8 snapshot
+37
symbols added
~16
symbols modified
0
dead code introduced
Semantic Changes 53 symbols
~ tests/test_remote_tracking_refs.py .py 35 symbols added
+ TestRT1MergeRemoteTrackingRef class class TestRT1MergeRemoteTrackingRef L135–165
+ test_merge_origin_main_advances_head method method test_merge_origin_main_advances_head L146–157
+ test_merge_origin_main_applies_delta_file method method test_merge_origin_main_applies_delta_file L159–165
+ test_merge_origin_main_exits_zero method method test_merge_origin_main_exits_zero L136–144
+ TestRT2BranchListsRemoteTrackingRefs class class TestRT2BranchListsRemoteTrackingRefs L172–197
+ test_branch_all_includes_origin_main method method test_branch_all_includes_origin_main L173–183
+ test_branch_all_remote_has_correct_commit method method test_branch_all_remote_has_correct_commit L185–197
+ TestRT3LogAllIncludesRemoteCommits class class TestRT3LogAllIncludesRemoteCommits L204–229
+ test_log_all_includes_fetched_commit method method test_log_all_includes_fetched_commit L205–216
+ test_log_all_shows_both_local_and_remote_commits method method test_log_all_shows_both_local_and_remote_commits L218–229
+ _REPO_ID variable variable _REPO_ID L37–37
+ _make_repo function function _make_repo L44–50
+ _setup_fetch_state function function _setup_fetch_state L102–128
+ _write_commit function function _write_commit L55–99
+ CliRunner import import CliRunner L33–33
+ CommitRecord import import CommitRecord L25–25
+ InvokeResult import import InvokeResult L33–33
+ SnapshotRecord import import SnapshotRecord L25–25
+ _dt import import _dt L53–53
+ annotations import import annotations L14–14
+ blob_id import import blob_id L32–32
+ compute_commit_id import import compute_commit_id L24–24
+ compute_snapshot_id import import compute_snapshot_id L24–24
+ init_repo_dirs import import init_repo_dirs L23–23
+ json import import json L16–16
+ muse_dir import import muse_dir L23–23
+ pathlib import import pathlib L17–17
+ pytest import import pytest L19–19
+ set_remote import import set_remote L21–21
+ set_remote_head import import set_remote_head L21–21
+ write_branch_ref import import write_branch_ref L25–25
+ write_commit import import write_commit L25–25
+ write_object import import write_object L22–22
+ write_snapshot import import write_snapshot L25–25
+ runner variable variable runner L35–35
~ muse/cli/commands/log.py .py 3 symbols modified
~ _branch_tips
~ _render_graph
~ run
~ muse/cli/commands/merge.py .py 1 symbol added, 13 symbols modified
+ resolve_any_ref import import resolve_any_ref L81–81
~ _run_merge
~ CommitRecord
~ Manifest
~ RefConflictError
~ SnapshotRecord
~ get_head_commit_id
~ get_head_snapshot_manifest
~ read_commit
~ read_current_branch
~ read_snapshot
~ write_branch_ref
~ write_commit
~ write_snapshot
~ muse/core/store.py .py 1 symbol added
+ resolve_any_ref function function resolve_any_ref L1839–1872
← Older Oldest on task/remote-tracking-refs
All commits
Newer → Latest on task/remote-tracking-refs

0 comments

No comments yet. Be the first to start the discussion.

To add a comment, use the Muse CLI: muse hub commit comment sha256:8eb10281a4bde87a1bf333e86bcdb2d0696aa18863f46be3d7a4270eb84b918e --body "your comment"