merge: dev → main (resolve 73 core/ conflicts, accept theirs)
sha256:f834dcfd0040b030428d1bdf9b405fcd5b2efd2bc9e3b3bedc44a9f64ffacceb
sha
sha256:d94de8b882c98f892cbf9118dcfcb08278c227785551e4884c5d9c364859c837
sha256:a8f8a6459c839ac2fa50bdfb81cad021e92d44bf8289f678eb35cf37a5991c62
parent
+982
~360
−53
symbols
sha256:f645bb9b6434c71afb2499cad01b35bcb13eae937891e49e3d4e293f69e0c66b
snapshot
+982
symbols added
~360
symbols modified
−53
symbols removed
0
dead code introduced
Semantic Changes
1395 symbols
+
_note_content_id
function
function _note_content_id L40–51 ← moved from muse/plugins/midi/midi_diff.py
+
test_intent_visible_in_listing_after_update
method
method test_intent_visible_in_listing_after_update L575–580
+
test_no_meta_flags_still_errors_on_existing
method
method test_no_meta_flags_still_errors_on_existing L613–617
+
test_resumable_visible_in_listing_after_update
method
method test_resumable_visible_in_listing_after_update L589–594
+
test_set_resumable_on_existing_branch
method
method test_set_resumable_on_existing_branch L582–587
+
test_update_does_not_overwrite_unspecified_fields
method
method test_update_does_not_overwrite_unspecified_fields L596–605
+
test_update_with_start_point_still_errors
method
method test_update_with_start_point_still_errors L607–611
+
test_create_json_resumable_false_when_not_set
method
method test_create_json_resumable_false_when_not_set L274–277
+
test_create_stores_resumable_in_config
method
method test_create_stores_resumable_in_config L252–255
+
test_create_without_intent_no_config_entry
method
method test_create_without_intent_no_config_entry L257–261
+
test_config_toml_valid_toml_after_write
method
method test_config_toml_valid_toml_after_write L509–515
+
test_intent_not_lost_on_second_branch_create
method
method test_intent_not_lost_on_second_branch_create L493–499
+
test_resumable_preserved_across_other_branch_operations
method
method test_resumable_preserved_across_other_branch_operations L501–507
+
test_create_intent_resumable_json_schema
method
method test_create_intent_resumable_json_schema L429–436
+
test_created_by_survives_new_branch_on_agent_repo
method
method test_created_by_survives_new_branch_on_agent_repo L419–427
+
test_ansi_in_intent_stripped_from_output
method
method test_ansi_in_intent_stripped_from_output L456–461
+
test_intent_truncated_to_reasonable_length
method
method test_intent_truncated_to_reasonable_length L477–484
+
test_newline_in_intent_escaped_in_toml
method
method test_newline_in_intent_escaped_in_toml L463–468
+
test_list_json_created_by_empty_for_empty_branch
method
method test_list_json_created_by_empty_for_empty_branch L337–344
+
test_list_json_created_by_empty_for_human_commit
method
method test_list_json_created_by_empty_for_human_commit L328–335
+
test_list_json_created_by_from_agent_commit
method
method test_list_json_created_by_from_agent_commit L320–326
+
test_list_json_intent_null_for_plain_branch
method
method test_list_json_intent_null_for_plain_branch L294–299
+
test_list_json_resumable_false_for_plain_branch
method
method test_list_json_resumable_false_for_plain_branch L309–313
+
test_list_50_branches_with_intent_under_1s
method
method test_list_50_branches_with_intent_under_1s L524–535
+
test_resumable_filter_50_branches_under_500ms
method
method test_resumable_filter_50_branches_under_500ms L537–550
+
test_returns_empty_for_unknown_branch
method
method test_returns_empty_for_unknown_branch L192–194
+
test_resumable_combined_with_merged_filter
method
method test_resumable_combined_with_merged_filter L394–402
+
test_resumable_filter_all_resumable_returned
method
method test_resumable_filter_all_resumable_returned L387–392
+
test_resumable_filter_empty_when_none
method
method test_resumable_filter_empty_when_none L375–379
+
test_resumable_filter_shows_only_resumable
method
method test_resumable_filter_shows_only_resumable L362–373
+
test_does_not_clobber_upstream_fields
method
method test_does_not_clobber_upstream_fields L139–151
+
test_mnemonic_word_count_in_keygen_typeddict
method
method test_mnemonic_word_count_in_keygen_typeddict L116–121
+
test_different_mnemonic_different_fingerprint
method
method test_different_mnemonic_different_fingerprint L691–724
+
test_show_json_agent_has_provisioned_by
method
method test_show_json_agent_has_provisioned_by L387–392
+
test_show_json_algorithm_value_correct
method
method test_show_json_algorithm_value_correct L380–385
+
test_show_json_key_path_value_correct
method
method test_show_json_key_path_value_correct L372–378
+
test_provisioned_by_fingerprint_in_show_typeddict
method
method test_provisioned_by_fingerprint_in_show_typeddict L152–155
+
test_provisioned_by_in_show_typeddict
method
method test_provisioned_by_in_show_typeddict L147–150
+
test_show_50_repeated_calls_consistent
method
method test_show_50_repeated_calls_consistent L509–548
+
test_show_with_50_identities_returns_correct_entry
method
method test_show_with_50_identities_returns_correct_entry L457–507
+
test_type_with_ansi_injection_rejected
method
method test_type_with_ansi_injection_rejected L399–404
+
test_type_with_newline_injection_rejected
method
method test_type_with_newline_injection_rejected L406–411
+
test_whoami_json_hd_entry_has_hd_path
method
method test_whoami_json_hd_entry_has_hd_path L330–344
+
test_whoami_json_no_hd_path_when_absent
method
method test_whoami_json_no_hd_path_when_absent L346–351
+
test_provisioned_by_in_whoami_typeddict
method
method test_provisioned_by_in_whoami_typeddict L162–165
+
test_whoami_all_json_agent_has_provisioned_by
method
method test_whoami_all_json_agent_has_provisioned_by L317–323
+
test_whoami_json_agent_has_provisioned_by
method
method test_whoami_json_agent_has_provisioned_by L303–308
+
test_whoami_json_human_no_provisioned_by
method
method test_whoami_json_human_no_provisioned_by L310–315
+
test_type_agent_includes_provisioned_by
method
method test_type_agent_includes_provisioned_by L289–296
+
test_type_filter_no_match_exits_nonzero
method
method test_type_filter_no_match_exits_nonzero L251–255
+
test_type_filter_no_match_json_exits_nonzero
method
method test_type_filter_no_match_json_exits_nonzero L257–260
+
test_type_invalid_value_exits_nonzero
method
method test_type_invalid_value_exits_nonzero L262–266
+
test_author_filter_no_match_returns_empty
method
method test_author_filter_no_match_returns_empty L431–436
+
test_author_line_count_reflects_filter
method
method test_author_line_count_reflects_filter L463–469
+
test_line_count_equals_lines_length_always
method
method test_line_count_equals_lines_length_always L674–680
+
test_range_linenos_match_original_positions
method
method test_range_linenos_match_original_positions L664–672
+
test_message_is_first_line_of_commit_message
method
method test_message_is_first_line_of_commit_message L242–246
+
test_new_line_attributed_to_newer_commit
method
method test_new_line_attributed_to_newer_commit L234–240
+
test_older_lines_attributed_to_older_commit
method
method test_older_lines_attributed_to_older_commit L224–232
+
test_single_commit_all_lines_attributed
method
method test_single_commit_all_lines_attributed L216–222
+
test_range_line_count_reflects_filtered
method
method test_range_line_count_reflects_filtered L405–410
+
test_create_commit_id_is_sha256_prefixed
method
method test_create_commit_id_is_sha256_prefixed L661–666
+
test_create_from_is_null_when_no_start_point
method
method test_create_from_is_null_when_no_start_point L668–671
+
test_create_from_set_when_start_point_given
method
method test_create_from_set_when_start_point_given L673–677
+
test_delete_nested_cleans_parent_dirs
method
method test_delete_nested_cleans_parent_dirs L532–540
+
test_rename_current_branch_updates_head
method
method test_rename_current_branch_updates_head L578–582
+
test_rename_into_nested_path_creates_dirs
method
method test_rename_into_nested_path_creates_dirs L550–556
+
test_merged_branch_included_after_diamond_merge
method
method test_merged_branch_included_after_diamond_merge L473–499
+
test_unmerged_sibling_excluded_from_diamond
method
method test_unmerged_sibling_excluded_from_diamond L501–523
+
test_create_already_exists_json_schema
method
method test_create_already_exists_json_schema L639–643
+
test_delete_current_branch_json_schema
method
method test_delete_current_branch_json_schema L612–616
+
test_rename_already_exists_json_schema
method
method test_rename_already_exists_json_schema L624–631
+
test_committed_at_null_for_empty_branch
method
method test_committed_at_null_for_empty_branch L253–262
+
test_ansi_in_delete_json_error_sanitized
method
method test_ansi_in_delete_json_error_sanitized L705–708
+
test_ansi_in_merged_ref_rejected_or_sanitized
method
method test_ansi_in_merged_ref_rejected_or_sanitized L689–691
+
test_timestamp_order_consistent_on_ties
method
method test_timestamp_order_consistent_on_ties L296–303
+
test_50_branches_committeddate_under_3s
method
method test_50_branches_committeddate_under_3s L717–728
+
test_diff_new_count_matches_actual_writes
method
method test_diff_new_count_matches_actual_writes L981–1002
+
test_diff_then_unbundle_gives_zero_new
method
method test_diff_then_unbundle_gives_zero_new L959–979
+
test_diff_100_commit_bundle_under_1s
method
method test_diff_100_commit_bundle_under_1s L1006–1024
+
test_text_output_mentions_new_commits
method
method test_text_output_mentions_new_commits L913–925
+
test_diff_commits_list_contains_new_entries
method
method test_diff_commits_list_contains_new_entries L805–825
+
test_diff_known_commits_when_already_applied
method
method test_diff_known_commits_when_already_applied L747–758
+
test_diff_refs_to_advance_empty_when_known
method
method test_diff_refs_to_advance_empty_when_known L793–803
+
test_inspect_branch_commit_id_matches_list_heads
method
method test_inspect_branch_commit_id_matches_list_heads L461–473
+
test_inspect_commit_ids_match_create_json
method
method test_inspect_commit_ids_match_create_json L430–444
+
test_inspect_100_commit_bundle_under_1s
method
method test_inspect_100_commit_bundle_under_1s L477–490
+
test_text_output_includes_commit_message
method
method test_text_output_includes_commit_message L369–375
+
test_inspect_agent_id_empty_for_human_commit
method
method test_inspect_agent_id_empty_for_human_commit L258–266
+
test_inspect_agent_id_from_agent_commit
method
method test_inspect_agent_id_from_agent_commit L248–256
+
test_inspect_branch_annotated_on_tip_commit
method
method test_inspect_branch_annotated_on_tip_commit L281–290
+
test_inspect_help_mentions_json_schema
method
method test_inspect_help_mentions_json_schema L181–183
+
test_inspect_non_tip_commit_has_no_branch
method
method test_inspect_non_tip_commit_has_no_branch L292–302
+
test_verify_and_no_update_refs_combined
method
method test_verify_and_no_update_refs_combined L663–676
+
test_verify_flag_clean_bundle_exits_0
method
method test_verify_flag_clean_bundle_exits_0 L575–581
+
test_verify_flag_corrupt_bundle_exits_1
method
method test_verify_flag_corrupt_bundle_exits_1 L592–603
+
test_verify_flag_corrupt_does_not_write
method
method test_verify_flag_corrupt_does_not_write L605–621
+
test_verify_flag_json_corrupt_verified_false
method
method test_verify_flag_json_corrupt_verified_false L638–652
+
test_verify_flag_json_output_has_verified_field
method
method test_verify_flag_json_output_has_verified_field L623–636
+
test_verify_flag_security_corrupt_before_parse
method
method test_verify_flag_security_corrupt_before_parse L678–692
+
test_all_json_kind_filter_shows_unfiltered_total
method
method test_all_json_kind_filter_shows_unfiltered_total L207–224
+
test_all_json_total_symbols_stable_across_filters
method
method test_all_json_total_symbols_stable_across_filters L226–240
+
test_limit_larger_than_results_not_truncated
method
method test_limit_larger_than_results_not_truncated L280–289
+
test_at_ref_gives_different_content_than_head
method
method test_at_ref_gives_different_content_than_head L386–404
+
test_symbol_source_matches_file_bytes
method
method test_symbol_source_matches_file_bytes L376–384
+
test_no_address_json_contains_error_key
method
method test_no_address_json_contains_error_key L178–182
+
test_no_address_json_flag_no_unbound_error
method
method test_no_address_json_flag_no_unbound_error L166–171
+
test_json_global_fallback_has_redirected_from
method
method test_json_global_fallback_has_redirected_from L326–350
+
test_no_args_json_is_valid_json_with_error
method
method test_no_args_json_is_valid_json_with_error L132–136
+
test_symbol_address_json_has_error_code
method
method test_symbol_address_json_has_error_code L143–149
+
test_untracked_file_json_has_error_code
method
method test_untracked_file_json_has_error_code L155–164
+
test_at_json_source_ref_contains_commit
method
method test_at_json_source_ref_contains_commit L275–285
+
test_json_size_bytes_equals_len_of_content_utf8
method
method test_json_size_bytes_equals_len_of_content_utf8 L393–398
+
test_working_tree_edit_visible_without_at
method
method test_working_tree_edit_visible_without_at L331–338
+
test_multi_file_one_missing_exits_nonzero
method
method test_multi_file_one_missing_exits_nonzero L247–254
+
muse cat vs muse code cat — two different commands
section muse cat vs muse code cat — two different commands L467–477
~
age_cmd
~
annotate
~
archive
~
auth
~
bisect
~
blame
~
branch
~
breakage
~
bundle
~
cat
~
check
~
checkout
~
clean
~
clone
~
clones
~
codemap
~
commit
~
compare
~
contract
~
coord_gc
~
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
~
predict
~
prune
~
pull
~
push
~
query
~
rebase
~
reflog
~
remote
~
rename
~
rerere
~
reserve
~
reset
~
restore
~
revert
~
rm
~
shard
~
shelf
~
shortlog
~
show
~
sign
~
stable
~
status
~
switch
~
symbols
~
tag
~
test_cmd
~
trust
~
type_cmd
~
velocity
~
verify
~
worktree
~
main
~
register
~
run
~
Literal
~
merge
−
_note_content_id
function
function _note_content_id L99–110 → moved to muse/plugins/midi/_midi_keys.py
−
test_keygen_hd_force_overwrites_identity
method
method test_keygen_hd_force_overwrites_identity L235–241
−
test_mnemonic_absent_from_json_object
method
method test_mnemonic_absent_from_json_object L226–233
−
test_keygen_hd_json_mnemonic_word_count_present
method
method test_keygen_hd_json_mnemonic_word_count_present L384–398
−
test_hd_path_prime_and_slash_preserved
method
method test_hd_path_prime_and_slash_preserved L346–357
−
test_mnemonic_with_quotes_round_trips
method
method test_mnemonic_with_quotes_round_trips L332–344
−
test_keygen_hd_then_load_identity_under_3s
method
method test_keygen_hd_then_load_identity_under_3s L454–466
−
test_10_successive_registers_preserve_mnemonic
method
method test_10_successive_registers_preserve_mnemonic L477–496
−
test_concurrent_identity_writes_do_not_corrupt
method
method test_concurrent_identity_writes_do_not_corrupt L498–518
−
test_hd_fields_preserved_after_register
method
method test_hd_fields_preserved_after_register L273–282
−
test_register_second_time_still_preserves_mnemonic
method
method test_register_second_time_still_preserves_mnemonic L295–304
+
test_handle_with_special_chars_round_trips
method
method test_handle_with_special_chars_round_trips L443–452
+
test_hd_path_prime_and_slash_preserved
method
method test_hd_path_prime_and_slash_preserved L431–441
+
test_entry_without_hd_fields_has_no_hd_keys
method
method test_entry_without_hd_fields_has_no_hd_keys L149–158
+
test_keygen_json_has_mnemonic_word_count
method
method test_keygen_json_has_mnemonic_word_count L324–342
+
test_keygen_json_mnemonic_content_absent
method
method test_keygen_json_mnemonic_content_absent L308–322
+
test_mnemonic_not_in_toml_after_keygen
method
method test_mnemonic_not_in_toml_after_keygen L344–359
+
test_keygen_then_load_identity_under_3s
method
method test_keygen_then_load_identity_under_3s L508–521
+
test_10_successive_registers_preserve_hd_fields
method
method test_10_successive_registers_preserve_hd_fields L532–551
+
test_20_successive_saves_preserve_hd_path
method
method test_20_successive_saves_preserve_hd_path L553–578
+
test_hd_path_preserved_after_register
method
method test_hd_path_preserved_after_register L388–397
+
test_mnemonic_not_in_toml_after_register
method
method test_mnemonic_not_in_toml_after_register L399–408
~
HOSTNAME
~
HUB
+
test_invalid_object_id_bare_hex_rejected
method
method test_invalid_object_id_bare_hex_rejected L217–221
+
test_invalid_object_id_non_hex_content
method
method test_invalid_object_id_non_hex_content L233–236
+
test_invalid_object_id_uppercase_content
method
method test_invalid_object_id_uppercase_content L228–231
+
test_json_elapsed_seconds_present_for_missing_object
method
method test_json_elapsed_seconds_present_for_missing_object L197–203
+
test_inline_binary_content_round_trips
method
method test_inline_binary_content_round_trips L556–564
+
test_inline_json_still_has_standard_fields
method
method test_inline_json_still_has_standard_fields L575–587
+
test_inline_missing_object_no_content_b64
method
method test_inline_missing_object_no_content_b64 L566–573
+
test_no_inline_flag_has_no_content_b64
method
method test_no_inline_flag_has_no_content_b64 L599–607
~
_store
+
test_exit_code_matches_process_exit_strict_and_warn
method
method test_exit_code_matches_process_exit_strict_and_warn L893–898
+
test_exit_code_matches_process_exit_with_strict
method
method test_exit_code_matches_process_exit_with_strict L879–884
+
test_exit_code_matches_process_exit_with_warn
method
method test_exit_code_matches_process_exit_with_warn L886–891
+
test_exit_code_zero_when_no_strict_or_warn
method
method test_exit_code_zero_when_no_strict_or_warn L870–877
+
test_patterns_loaded_matches_list_length
method
method test_patterns_loaded_matches_list_length L517–521
+
test_summary_absent_from_patterns_only
method
method test_summary_absent_from_patterns_only L492–496
+
test_counts_reflect_full_set_not_filtered
method
method test_counts_reflect_full_set_not_filtered L565–570
+
test_check_ref_format_result_has_elapsed
method
method test_check_ref_format_result_has_elapsed L78–79
+
test_check_ref_format_result_has_exit_code
method
method test_check_ref_format_result_has_exit_code L81–82
+
test_conflict_resolved_all_json_has_elapsed
method
method test_conflict_resolved_all_json_has_elapsed L1249–1263
+
test_conflict_resolved_single_json_has_elapsed
method
method test_conflict_resolved_single_json_has_elapsed L1265–1280
+
test_dry_run_create_json_has_elapsed
method
method test_dry_run_create_json_has_elapsed L1232–1235
+
test_dry_run_detach_json_has_elapsed
method
method test_dry_run_detach_json_has_elapsed L1237–1242
+
test_dry_run_switch_json_has_elapsed
method
method test_dry_run_switch_json_has_elapsed L1227–1230
+
test_conflict_resolved_all_json_exit_code_0
method
method test_conflict_resolved_all_json_exit_code_0 L1330–1344
+
test_conflict_resolved_single_json_exit_code_0
method
method test_conflict_resolved_single_json_exit_code_0 L1346–1361
+
test_dry_run_create_json_exit_code_0
method
method test_dry_run_create_json_exit_code_0 L1313–1316
+
test_dry_run_detach_json_exit_code_0
method
method test_dry_run_detach_json_exit_code_0 L1318–1323
+
test_dry_run_switch_json_exit_code_0
method
method test_dry_run_switch_json_exit_code_0 L1308–1311
+
test_ours_deleted_theirs_modified_conflicts
method
method test_ours_deleted_theirs_modified_conflicts L764–766
+
test_ours_modified_theirs_deleted_conflicts
method
method test_ours_modified_theirs_deleted_conflicts L768–770
+
test_both_added_different_reverts_to_absent
method
method test_both_added_different_reverts_to_absent L549–554
+
test_divergent_deletion_conflict_reverts_to_base
method
method test_divergent_deletion_conflict_reverts_to_base L564–569
+
test_both_added_different_forces_conflict
method
method test_both_added_different_forces_conflict L707–710
+
test_only_theirs_added_forces_conflict
method
method test_only_theirs_added_forces_conflict L688–692
+
test_ours_deleted_theirs_modified_forces_conflict
method
method test_ours_deleted_theirs_modified_forces_conflict L699–701
+
test_ours_modified_theirs_deleted_forces_conflict
method
method test_ours_modified_theirs_deleted_forces_conflict L703–705
+
test_core_manual_beats_any_other_rule
method
method test_core_manual_beats_any_other_rule L1012–1021
+
test_core_rule_beats_lower_priority_wildcard
method
method test_core_rule_beats_lower_priority_wildcard L879–887
+
test_core_single_branch_change_forces_conflict
method
method test_core_single_branch_change_forces_conflict L854–861
+
test_core_unchanged_no_false_conflict
method
method test_core_unchanged_no_false_conflict L843–852
+
test_docs_disjoint_additions_both_kept
method
method test_docs_disjoint_additions_both_kept L893–901
+
test_nested_md_NOT_matched_by_root_glob
method
method test_nested_md_NOT_matched_by_root_glob L997–1006
+
test_pyproject_divergent_forces_conflict
method
method test_pyproject_divergent_forces_conflict L975–981
+
test_pyproject_single_branch_change_forces_conflict
method
method test_pyproject_single_branch_change_forces_conflict L964–973
+
test_tests_same_file_divergent_prefers_ours
method
method test_tests_same_file_divergent_prefers_ours L928–937
+
test_ours_deleted_theirs_modified_ours_wins
method
method test_ours_deleted_theirs_modified_ours_wins L432–437
+
test_ours_modified_theirs_deleted_takes_ours
method
method test_ours_modified_theirs_deleted_takes_ours L425–430
+
test_both_added_different_takes_theirs
method
method test_both_added_different_takes_theirs L480–484
+
test_ours_deleted_theirs_modified_takes_theirs
method
method test_ours_deleted_theirs_modified_takes_theirs L494–499
+
test_ours_modified_theirs_deleted_theirs_wins
method
method test_ours_modified_theirs_deleted_theirs_wins L501–506
+
test_both_added_different_prefers_ours
method
method test_both_added_different_prefers_ours L613–617
+
test_divergent_prefers_left_for_blobs
method
method test_divergent_prefers_left_for_blobs L598–603
+
test_ours_deleted_theirs_modified_keeps_theirs
method
method test_ours_deleted_theirs_modified_keeps_theirs L627–632
+
test_73_unchanged_plus_one_real_conflict
method
method test_73_unchanged_plus_one_real_conflict L486–497
+
test_convergent_same_change_no_conflict
method
method test_convergent_same_change_no_conflict L454–460
+
test_only_ours_changed_manual_forces_conflict
method
method test_only_ours_changed_manual_forces_conflict L462–468
+
test_only_theirs_changed_manual_forces_conflict
method
method test_only_theirs_changed_manual_forces_conflict L470–476
−
test_format_version_round_trips_through_store_v7
method
method test_format_version_round_trips_through_store_v7 L99–104
+
test_format_version_round_trips_through_store_v8
method
method test_format_version_round_trips_through_store_v8 L99–104
Older
feat: supercharge muse cherry-pick for agent use
sha256:d94de8b882c98f892cbf9118dcfcb08278c227785551e4884c5d9c364859c837
All commits
Newer
Merge branch 'dev' (--strategy=theirs)
sha256:47166b80a3ecc9ad3c8c58adbf9bffceaa6f677620bb8df485de44be55146360
0 comments
To add a comment, use the Muse CLI:
muse hub commit comment sha256:f834dcfd0040b030428d1bdf9b405fcd5b2efd2bc9e3b3bedc44a9f64ffacceb --body "your comment"
No comments yet. Be the first to start the discussion.