Skip to content

Port branchfs to macOS#26

Merged
congwang-mk merged 5 commits intomultikernel:mainfrom
nitin966:main
Mar 28, 2026
Merged

Port branchfs to macOS#26
congwang-mk merged 5 commits intomultikernel:mainfrom
nitin966:main

Conversation

@nitin966
Copy link
Copy Markdown
Contributor

Description

Port branchfs to macOS with verified integration tests and stable control interface

Testing

All existing tests pass

@nitin966 nitin966 mentioned this pull request Mar 16, 2026
@congwang-mk
Copy link
Copy Markdown
Contributor

Could we separate the platform specific code? For example, src/platform/linux.rs and src/platform/macos.rs behind a src/platform/mod.rs that re-exports the right impl via #[cfg]. Move into it:

  • Ioctl constants
  • Mount option construction
  • init() capability setup
  • Passthrough open logic
  • access() impl
  • Rename flag handling

Copy link
Copy Markdown
Contributor

@congwang-mk congwang-mk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for your update. Some additional reviews

@nitin966
Copy link
Copy Markdown
Contributor Author

Changes in recent commit

  • Made linux 256, mac 0 and controlled via the platform specific config.
  • Reverted to use inherit()
  • Removed logging statement

All tests pass.

running 22 tests
test test_branch_isolation ... ok
test test_commit_base_file_modification_visible_at_mount_root ... ok
test test_commit_changes_visible_at_mount_root ... ok
test test_commit_deletion_visible_at_mount_root ... ok
test test_create_read_write_delete ... ok
test test_mkdir_and_nested_files ... ok
test test_nested_branch_inheritance ... ok
test test_readdir_branch_inherits_main_delta_files ... ok
test test_readdir_nested_branch_inherits_parent_delta ... ok
test test_readdir_respects_tombstones ... ok
test test_rename_file_cross_dir ... ok
test test_rename_file_same_dir ... ok
test test_rename_in_branch_then_abort ... ok
test test_rename_in_branch_then_commit ... ok
test test_rename_nonexistent_fails ... ok
test test_rename_overwrite_existing ... ok
test test_symlink_abort ... ok
test test_symlink_base_visible ... ok
test test_symlink_commit ... ok
test test_symlink_create_in_branch ... ok
test test_symlink_delete_in_branch ... ok
test test_symlink_isolation_between_branches ... ok

test result: ok. 22 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 28.46s

@congwang-mk congwang-mk merged commit 0a07661 into multikernel:main Mar 28, 2026
0 of 4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants