fix: complete merge — include all dev files missing from merge commit
The merge commit missed 21 new files and 16 modified files from dev because muse resolve + commit only applied the conflict-resolved file (pyproject.toml) without staging the rest of the working tree changes. This commit adds the missing files to bring main into parity with dev.
sha256:fe3a3f7ad220f1dd8d13a946e7bc9c84988ad5908b011c98edc688ded4c8bbc4
sha
+813
~189
−1
symbols
sha256:96e7e180a05dd6b0740f3837335bba9c5fbbba8899f2467f2bb5e3d9042095a0
snapshot
+813
symbols added
~189
symbols modified
−1
symbol removed
0
dead code introduced
Semantic Changes
1003 symbols
+
muse branch -c / -m — reflog parity with git for copy and rename
section muse branch -c / -m — reflog parity with git for copy and rename L1–165
+
What git branch -c does that muse does not
section What git branch -c does that muse does not L7–16
+
What git branch -m does that muse does not
section What git branch -m does that muse does not L16–25
+
Phase 1 — muse branch -c/-C: copy the reflog
section Phase 1 — muse branch -c/-C: copy the reflog L41–78
+
Phase 2 — muse branch -m/-M: move the reflog
section Phase 2 — muse branch -m/-M: move the reflog L78–119
+
Phase 3 — muse branch operation entry standardisation
section Phase 3 — muse branch operation entry standardisation L119–151
+
muse code test — Implementation Audit, Cache Behavior, and Documentation
section muse code test — Implementation Audit, Cache Behavior, and Documentation L1–130
+
Phase 1 — Audit and document the cache invalidation rules
section Phase 1 — Audit and document the cache invalidation rules L36–47
+
Phase 2 — Fix the cold-path UX (progress feedback)
section Phase 2 — Fix the cold-path UX (progress feedback) L47–59
+
Phase 4 — muse code test --cache-status flag
section Phase 4 — muse code test --cache-status flag L73–107
+
muse mist read: owner/ID form sends request to wrong API path
section muse mist read: owner/ID form sends request to wrong API path L1–129
+
Phase 2 — Fix the misleading 404 error message
section Phase 2 — Fix the misleading 404 error message L72–87
+
push: refspec syntax local:remote for cross-branch pushes
section push: refspec syntax local:remote for cross-branch pushes L1–153
+
Phase 2 — Wire into push command + integration tests
section Phase 2 — Wire into push command + integration tests L104–125
+
muse reflog — Complete Coverage, Lifecycle Management, and @{N} Resolution
section muse reflog — Complete Coverage, Lifecycle Management, and @{N} Resolution L1–227
+
Phase 1 — Close coverage gaps (pull and shelf)
section Phase 1 — Close coverage gaps (pull and shelf) L26–42
+
muse reflog — use long IDs in human text output
section muse reflog — use long IDs in human text output L1–70
+
muse shelf: resolve created_by from user identity instead of hardcoding "human"
section muse shelf: resolve created_by from user identity instead of hardcoding "human" L1–85
+
muse shelf read — UX fixes and files list bug
section muse shelf read — UX fixes and files list bug L1–76
+
Phase 3 — Document bare muse shelf and custom names
section Phase 3 — Document bare muse shelf and custom names L54–63
+
Phase 5 — @{N} ref resolution for symbols
section Phase 5 — @{N} ref resolution for symbols L369–453
+
test_rename_with_content_change_is_not_a_rename
method
method test_rename_with_content_change_is_not_a_rename L191–197
+
test_returns_empty_for_unknown_object_id
method
method test_returns_empty_for_unknown_object_id L106–109
+
test_returns_symbol_name_to_content_id_map
method
method test_returns_symbol_name_to_content_id_map L80–92
+
test_all_new_symbols_get_created_entries
method
method test_all_new_symbols_get_created_entries L270–284
+
test_created_entry_has_correct_author
method
method test_created_entry_has_correct_author L262–268
+
test_deleted_symbol_gets_deleted_entry
method
method test_deleted_symbol_gets_deleted_entry L336–354
+
test_initial_commit_all_symbols_created
method
method test_initial_commit_all_symbols_created L396–411
+
test_modified_entry_contains_commit_message
method
method test_modified_entry_contains_commit_message L307–316
+
test_modified_entry_has_correct_commit_id
method
method test_modified_entry_has_correct_commit_id L318–327
+
test_modified_symbol_gets_modified_entry
method
method test_modified_symbol_gets_modified_entry L293–305
+
test_commit_succeeds_even_with_no_code_files
method
method test_commit_succeeds_even_with_no_code_files L231–235
+
test_dry_run_does_not_delete_log_entries
method
method test_dry_run_does_not_delete_log_entries L198–211
+
test_dry_run_does_not_remove_log_file
method
method test_dry_run_does_not_remove_log_file L213–224
+
test_json_output_has_reflog_expired_field
method
method test_json_output_has_reflog_expired_field L90–101
+
test_old_entries_counted_in_reflog_expired
method
method test_old_entries_counted_in_reflog_expired L103–119
+
test_reflog_expire_days_config_respected
method
method test_reflog_expire_days_config_respected L156–170
+
test_reflog_expired_zero_when_no_log_files
method
method test_reflog_expired_zero_when_no_log_files L146–154
+
test_all_old_entries_removed_file_deleted
method
method test_all_old_entries_removed_file_deleted L265–272
+
test_branch_old_entries_removed_after_gc
method
method test_branch_old_entries_removed_after_gc L274–288
+
test_gc_output_without_json_flag_mentions_reflog
method
method test_gc_output_without_json_flag_mentions_reflog L306–316
+
test_old_head_entries_removed_after_gc
method
method test_old_head_entries_removed_after_gc L248–263
+
test_calls_append_reflog_on_bootstrap
method
method test_calls_append_reflog_on_bootstrap L206–234
+
test_calls_append_reflog_on_fast_forward
method
method test_calls_append_reflog_on_fast_forward L147–175
+
test_operation_string_includes_remote_and_branch
method
method test_operation_string_includes_remote_and_branch L177–200
+
test_calls_append_reflog_on_three_way_merge
method
method test_calls_append_reflog_on_three_way_merge L240–288
+
test_ff_pull_completes_despite_reflog_error
method
method test_ff_pull_completes_despite_reflog_error L365–393
+
test_no_reflog_when_already_up_to_date
method
method test_no_reflog_when_already_up_to_date L343–355
+
test_shelf_apply_writes_head_log_entry
method
method test_shelf_apply_writes_head_log_entry L629–637
+
test_shelf_pop_log_references_entry_name
method
method test_shelf_pop_log_references_entry_name L639–649
+
test_shelf_apply_completes_despite_reflog_error
method
method test_shelf_apply_completes_despite_reflog_error L517–528
+
test_shelf_pop_completes_despite_reflog_error
method
method test_shelf_pop_completes_despite_reflog_error L503–515
+
test_muse_reflog_returns_empty_after_all_delete
method
method test_muse_reflog_returns_empty_after_all_delete L250–258
+
test_original_intact_when_replace_fails
method
method test_original_intact_when_replace_fails L322–332
+
test_delete_last_entry_removes_log_file
method
method test_delete_last_entry_removes_log_file L138–147
+
test_newest_entry_is_gone_after_delete
method
method test_newest_entry_is_gone_after_delete L108–117
+
test_branch_delete_does_not_touch_head_log
method
method test_branch_delete_does_not_touch_head_log L394–403
+
test_correct_entries_remain_after_middle_delete
method
method test_correct_entries_remain_after_middle_delete L353–370
+
test_entry_count_is_exact_after_delete
method
method test_entry_count_is_exact_after_delete L372–381
+
test_repeated_deletes_converge_to_empty
method
method test_repeated_deletes_converge_to_empty L383–392
+
test_out_of_bounds_does_not_modify_log
method
method test_out_of_bounds_does_not_modify_log L287–295
+
test_out_of_bounds_message_names_valid_range
method
method test_out_of_bounds_message_names_valid_range L276–285
+
test_exit_code_matches_json_exists_field
method
method test_exit_code_matches_json_exists_field L287–300
+
test_branch_ref_field_on_missing_branch_log
method
method test_branch_ref_field_on_missing_branch_log L218–228
+
test_json_exists_false_after_all_entries_deleted
method
method test_json_exists_false_after_all_entries_deleted L194–208
+
test_json_exists_false_when_branch_has_no_log
method
method test_json_exists_false_when_branch_has_no_log L177–192
+
test_json_exists_false_when_no_head_log
method
method test_json_exists_false_when_no_head_log L164–175
+
test_branch_log_ref_field_uses_full_path
method
method test_branch_log_ref_field_uses_full_path L133–144
+
test_count_matches_actual_entry_count
method
method test_count_matches_actual_entry_count L111–118
+
test_json_exists_true_when_head_log_has_entries
method
method test_json_exists_true_when_head_log_has_entries L77–88
+
test_json_schema_has_all_required_fields
method
method test_json_schema_has_all_required_fields L90–100
+
test_all_flag_processes_all_branch_logs
method
method test_all_flag_processes_all_branch_logs L175–193
+
test_all_with_specific_branch_flag_is_rejected
method
method test_all_with_specific_branch_flag_is_rejected L208–212
+
test_refs_processed_lists_every_touched_ref
method
method test_refs_processed_lists_every_touched_ref L195–206
+
test_branch_log_removed_when_all_entries_expire
method
method test_branch_log_removed_when_all_entries_expire L446–453
+
test_log_file_removed_when_all_entries_expire
method
method test_log_file_removed_when_all_entries_expire L422–429
+
test_muse_reflog_returns_empty_entries_after_full_expire
method
method test_muse_reflog_returns_empty_entries_after_full_expire L431–444
+
test_zero_byte_file_is_never_left_behind
method
method test_zero_byte_file_is_never_left_behind L455–465
+
test_no_partial_tmp_file_survives_on_success
method
method test_no_partial_tmp_file_survives_on_success L362–372
+
test_original_log_intact_when_replace_fails
method
method test_original_log_intact_when_replace_fails L337–360
+
test_json_schema_has_all_required_fields
method
method test_json_schema_has_all_required_fields L133–141
+
test_no_entries_expire_when_all_recent
method
method test_no_entries_expire_when_all_recent L143–154
+
test_remaining_entries_are_the_recent_ones
method
method test_remaining_entries_are_the_recent_ones L118–131
+
test_removes_old_entries_from_head_log
method
method test_removes_old_entries_from_head_log L100–116
+
test_config_expire_days_is_used_as_default
method
method test_config_expire_days_is_used_as_default L273–289
+
test_default_ttl_is_90_when_config_not_set
method
method test_default_ttl_is_90_when_config_not_set L306–316
+
test_muse_config_get_returns_set_value
method
method test_muse_config_get_returns_set_value L318–327
+
test_dry_run_all_does_not_modify_any_log
method
method test_dry_run_all_does_not_modify_any_log L249–263
+
test_exactly_50_removed_from_100_entry_log
method
method test_exactly_50_removed_from_100_entry_log L382–396
+
test_remaining_entries_are_the_correct_ones
method
method test_remaining_entries_are_the_correct_ones L398–412
+
test_invalid_date_format_is_user_error
method
method test_invalid_date_format_is_user_error L295–301
+
test_exists_true_when_entries_present
method
method test_exists_true_when_entries_present L494–502
+
test_file_mode_each_symbol_has_schema
method
method test_file_mode_each_symbol_has_schema L426–434
+
test_follow_includes_prior_symbol_entries
method
method test_follow_includes_prior_symbol_entries L317–332
+
test_from_symbol_none_for_own_entries
method
method test_from_symbol_none_for_own_entries L347–356
+
test_from_symbol_populated_for_prior_entries
method
method test_from_symbol_populated_for_prior_entries L334–345
+
test_human_text_created_shows_initial
method
method test_human_text_created_shows_initial L544–550
+
test_human_text_deleted_shows_deleted_label
method
method test_human_text_deleted_shows_deleted_label L552–566
+
test_follow_stitches_two_symbols_newest_first
method
method test_follow_stitches_two_symbols_newest_first L672–705
+
test_followed_false_when_no_follow_flag
method
method test_followed_false_when_no_follow_flag L108–113
+
test_operation_filter_case_insensitive
method
method test_operation_filter_case_insensitive L181–190
+
test_different_symbols_same_file_get_separate_files
method
method test_different_symbols_same_file_get_separate_files L277–289
+
test_delete_index_zero_removes_newest
method
method test_delete_index_zero_removes_newest L563–572
+
test_out_of_bounds_raises_index_error
method
method test_out_of_bounds_raises_index_error L584–588
+
test_five_entries_round_trip_newest_first
method
method test_five_entries_round_trip_newest_first L621–644
+
test_two_symbols_same_file_independent
method
method test_two_symbols_same_file_independent L646–663
+
test_list_for_file_empty_dir_returns_empty
method
method test_list_for_file_empty_dir_returns_empty L460–462
+
test_list_for_file_returns_only_that_files_symbols
method
method test_list_for_file_returns_only_that_files_symbols L449–458
+
test_returns_all_symbol_addresses_sorted
method
method test_returns_all_symbol_addresses_sorted L429–437
+
test_is_null_content_id_false_for_bare_zeros
method
method test_is_null_content_id_false_for_bare_zeros L57–59
+
test_is_null_content_id_false_for_real_id
method
method test_is_null_content_id_false_for_real_id L54–55
+
test_colon_in_symbol_name_is_percent_encoded
method
method test_colon_in_symbol_name_is_percent_encoded L154–158
+
test_special_chars_in_symbol_name_are_percent_encoded
method
method test_special_chars_in_symbol_name_are_percent_encoded L147–152
+
test_born_from_none_for_regular_operation
method
method test_born_from_none_for_regular_operation L102–104
+
test_born_from_none_for_symbol_created
method
method test_born_from_none_for_symbol_created L111–116
+
test_born_from_none_for_symbol_renamed_to
method
method test_born_from_none_for_symbol_renamed_to L118–124
+
test_born_from_parsed_for_born_from_operation
method
method test_born_from_parsed_for_born_from_operation L106–109
+
test_out_of_range_error_mentions_valid_range
method
method test_out_of_range_error_mentions_valid_range L344–355
+
test_out_of_range_reset_exits_user_error
method
method test_out_of_range_reset_exits_user_error L357–364
+
test_out_of_range_rev_parse_exits_user_error
method
method test_out_of_range_rev_parse_exits_user_error L335–342
+
test_branch_at_one_resolves_via_branch_log
method
method test_branch_at_one_resolves_via_branch_log L289–296
+
test_branch_at_zero_resolves_to_newest
method
method test_branch_at_zero_resolves_to_newest L280–287
+
test_head_log_and_branch_log_resolve_independently
method
method test_head_log_and_branch_log_resolve_independently L310–325
+
test_diff_at_one_head_has_required_json_fields
method
method test_diff_at_one_head_has_required_json_fields L398–409
+
test_message_at_restored_commit_is_correct
method
method test_message_at_restored_commit_is_correct L464–474
+
test_reset_at_one_restores_previous_commit
method
method test_reset_at_one_restores_previous_commit L442–462
+
test_rev_parse_after_reset_shows_old_id
method
method test_rev_parse_after_reset_shows_old_id L476–485
+
test_read_at_zero_shows_newest_commit
method
method test_read_at_zero_shows_newest_commit L246–253
+
test_reset_at_one_moves_to_second_commit
method
method test_reset_at_one_moves_to_second_commit L208–215
+
test_reset_at_two_moves_to_oldest_commit
method
method test_reset_at_two_moves_to_oldest_commit L217–224
+
test_raises_file_not_found_when_no_log
method
method test_raises_file_not_found_when_no_log L521–527
+
test_at_one_resolves_to_second_newest
method
method test_at_one_resolves_to_second_newest L175–182
+
test_at_zero_resolves_to_newest_commit
method
method test_at_zero_resolves_to_newest_commit L165–173
+
test_at_zero_text_mode_prints_commit_id
method
method test_at_zero_text_mode_prints_commit_id L184–190
+
test_pt1_small_payload_gets_floor_timeout
function
function test_pt1_small_payload_gets_floor_timeout L42–46
+
test_pt2_large_payload_exceeds_floor
function
function test_pt2_large_payload_exceeds_floor L51–55
+
test_pt4_computed_timeout_passed_to_urllib_do
function
function test_pt4_computed_timeout_passed_to_urllib_do L68–77
+
test_pt5_env_var_overrides_computed_timeout
function
function test_pt5_env_var_overrides_computed_timeout L82–90
+
test_pt6_env_var_absent_uses_computed_default
function
function test_pt6_env_var_absent_uses_computed_default L95–105
+
test_pt7_global_timeout_does_not_affect_put_timeout
function
function test_pt7_global_timeout_does_not_affect_put_timeout L110–124
~
age_cmd
~
annotate
~
apply
~
archive
~
auth
~
bisect
~
blame
~
branch
~
breakage
~
bridge
~
bundle
~
cat
~
check
~
checkout
~
clean
~
clone
~
clones
~
codemap
~
commit
~
compare
~
contract
~
coord_gc
~
core_cat
~
coupling
~
coverage
~
dag_cmd
~
dead
~
deps
~
describe
~
diff
~
docs_cmd
~
domains
~
entangle
~
fetch
~
forecast
~
gc
~
gravity
~
grep
~
harmony
~
hotspots
~
hub
~
impact
~
init
~
intent
~
lineage
~
log
~
merge
~
migrate
~
mist_cmd
~
mv
~
patch
~
path_cmd
~
predict
~
prune
~
pull
~
push
~
query
~
read
~
rebase
~
reflog
~
remote
~
rename
~
reserve
~
reset
~
restore
~
revert
~
rm
~
shard
~
shelf
~
shortlog
~
sign
~
stable
~
status
~
switch
~
symbols
~
tag
~
test_cmd
~
trust
~
type_cmd
~
velocity
~
verify
~
worktree
~
main
~
run
~
run
~
register
~
run
+
test_CB_06_save_with_configured_handle
method
method test_CB_06_save_with_configured_handle L1894–1913
+
test_CB_07_explicit_by_wins_over_config
method
method test_CB_07_explicit_by_wins_over_config L1915–1937
+
test_CB_08_no_handle_config_falls_back_to_human
method
method test_CB_08_no_handle_config_falls_back_to_human L1939–1958
+
test_CB_09_programmatic_api_resolves_created_by
method
method test_CB_09_programmatic_api_resolves_created_by L1960–1979
+
test_CB_10_autoshelf_muse_resolves_as_agent
method
method test_CB_10_autoshelf_muse_resolves_as_agent L1981–1996
+
test_CB_01_explicit_non_human_returns_agent
method
method test_CB_01_explicit_non_human_returns_agent L1849–1854
+
test_CB_02_explicit_by_returned_as_is
method
method test_CB_02_explicit_by_returned_as_is L1856–1862
+
test_CB_03_human_with_config_returns_handle
method
method test_CB_03_human_with_config_returns_handle L1864–1875
+
test_CB_04_human_without_config_falls_back
method
method test_CB_04_human_without_config_falls_back L1877–1888
+
test_SF_04_mixed_changed_unchanged_new
method
method test_SF_04_mixed_changed_unchanged_new L1746–1781
+
test_SF_05_files_empty_when_head_catches_up
method
method test_SF_05_files_empty_when_head_catches_up L1783–1822
Older
merge: dev → main (Phase 1–3 symlog, pyproject.toml version bump)
sha256:c35afda4e5bc4d2d483b82f23a748f3b615ca2e02b1b8e3c2e9f29ead357faf2
All commits
Newer
Merge branch 'dev' into main
sha256:8a57f546652f660d1f0527534ad5e79d303fe982679aa07e708c5e60d49ab5b1
0 comments
To add a comment, use the Muse CLI:
muse hub commit comment sha256:fe3a3f7ad220f1dd8d13a946e7bc9c84988ad5908b011c98edc688ded4c8bbc4 --body "your comment"
No comments yet. Be the first to start the discussion.