Skip to content

Comments

feat: add check_case_conflict builtin#323

Merged
jdx merged 4 commits intomainfrom
feat/util-check-case-conflict
Oct 3, 2025
Merged

feat: add check_case_conflict builtin#323
jdx merged 4 commits intomainfrom
feat/util-check-case-conflict

Conversation

@jdx
Copy link
Owner

@jdx jdx commented Oct 3, 2025

Summary

  • Adds hk util check-case-conflict command to detect case-insensitive filename conflicts
  • Useful for cross-platform projects to avoid issues on Windows/macOS filesystems
  • Includes 6 unit tests and 7 bats integration tests

Test plan

  • All 241 tests passing
  • CI green
  • Builtin integration tested

🤖 Generated with Claude Code


Note

Adds hk util check-case-conflict and Builtins.check_case_conflict to detect case-insensitive filename conflicts, with docs and tests.

  • CLI:
    • Add hk util check-case-conflict (src/cli/util/check_case_conflict.rs): detects case-insensitive filename conflicts; considers repo files via git ls-files; exits non-zero and groups conflicting paths.
    • Wire subcommand in src/cli/util/mod.rs.
  • Builtins:
    • New builtin check_case_conflict (pkl/builtins/check_case_conflict.pkl) with tests; expose via pkl/Builtins.pkl.
  • Docs:
    • Document builtin in docs/builtins.md under Special Purpose.
    • Add CLI docs and examples in docs/cli/util.md (check-case-conflict).
  • Tests:
    • Unit tests for conflict detection in Rust.
    • Bats integration tests covering simple/multiple conflicts, directories, git integration, and builtin wiring.

Written by Cursor Bugbot for commit 533b708. This will update automatically on new commits. Configure here.

cursor[bot]

This comment was marked as outdated.

cursor[bot]

This comment was marked as outdated.

@jdx jdx force-pushed the feat/util-check-case-conflict branch 2 times, most recently from 5fdac22 to 89ec195 Compare October 3, 2025 16:03
claude and others added 3 commits October 3, 2025 16:12
Detects case-insensitive filename conflicts that would cause issues on
case-insensitive filesystems like Windows and macOS. This is useful for
cross-platform projects.

Includes:
- `hk util check-case-conflict` command
- 6 unit tests
- 7 bats integration tests
- Builtin configuration in pkl/builtins/
- Documentation updates

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <[email protected]>
Previously check_case_conflict only checked for conflicts within the list
of files passed to it. Now it checks against all files in the repository
using 'git ls-files', which correctly detects when a new file (e.g.,
readme.md) conflicts with an existing committed file (e.g., README.md).

Added tests to verify this behavior.
@jdx jdx force-pushed the feat/util-check-case-conflict branch from 89ec195 to ed34d3b Compare October 3, 2025 16:12
@jdx jdx enabled auto-merge (squash) October 3, 2025 16:15
macOS uses a case-insensitive filesystem by default (APFS/HFS+),
so tests that try to create files like README.md and readme.md
in the same directory will fail. Skip these tests on macOS.
@jdx jdx merged commit 1be0970 into main Oct 3, 2025
6 checks passed
@jdx jdx deleted the feat/util-check-case-conflict branch October 3, 2025 17:01
@jdx jdx mentioned this pull request Oct 3, 2025
jdx added a commit that referenced this pull request Oct 5, 2025
## [1.17.0](https://github.com/jdx/hk/compare/v1.16.0..v1.17.0) -
2025-10-05

### 🚀 Features

- Add hk util trailing-whitespace command by
[@jdx](https://github.com/jdx) in
[#319](#319)
- add mixed_line_ending builtin by [@jdx](https://github.com/jdx) in
[#324](#324)
- add check_symlinks builtin by [@jdx](https://github.com/jdx) in
[#326](#326)
- add check_executables_have_shebangs builtin by
[@jdx](https://github.com/jdx) in
[#325](#325)
- Add check-merge-conflict util command and builtin by
[@jdx](https://github.com/jdx) in
[#322](#322)
- add check_case_conflict builtin by [@jdx](https://github.com/jdx) in
[#323](#323)
- add detect_private_key builtin by [@jdx](https://github.com/jdx) in
[#332](#332)
- add check_added_large_files builtin by [@jdx](https://github.com/jdx)
in [#329](#329)
- add python_debug_statements builtin by [@jdx](https://github.com/jdx)
in [#331](#331)
- add python_check_ast builtin by [@jdx](https://github.com/jdx) in
[#330](#330)
- add no_commit_to_branch builtin by [@jdx](https://github.com/jdx) in
[#333](#333)
- add check_byte_order_marker and fix_byte_order_marker builtins by
[@jdx](https://github.com/jdx) in
[#328](#328)
- add regex pattern support for glob and exclude by
[@jdx](https://github.com/jdx) in
[#336](#336)
- automatically batch large file lists to prevent ARG_MAX errors by
[@jdx](https://github.com/jdx) in
[#338](#338)

### 🐛 Bug Fixes

- Add validation for stage attribute requiring fix command by
[@jdx](https://github.com/jdx) in
[#327](#327)
- display stderr when check_list_files returns empty list by
[@jdx](https://github.com/jdx) in
[#334](#334)
- added new builtins to Builtins.pkl by [@jdx](https://github.com/jdx)
in
[b8a2b17](b8a2b17)
- enable experimental settings in mise.toml for swift support by
[@jdx](https://github.com/jdx) in
[#342](#342)
- correct airflow migration test to expect local imports by
[@jdx](https://github.com/jdx) in
[#343](#343)
- make final CI check always run and fail if dependencies fail by
[@jdx](https://github.com/jdx) in
[#344](#344)
- add ruff format to ruff builtin by [@jdx](https://github.com/jdx) in
[#340](#340)

### 🚜 Refactor

- Split util module into separate files by
[@jdx](https://github.com/jdx) in
[#321](#321)

### 🛡️ Security

- migrate pre-commit by [@jdx](https://github.com/jdx) in
[#318](#318)

### 🔍 Other Changes

- split CI runs into parallel jobs and add docs-sync mise task by
[@jdx](https://github.com/jdx) in
[#337](#337)
- remove v0 pkl files from docs/public by [@jdx](https://github.com/jdx)
in [#341](#341)

<!-- CURSOR_SUMMARY -->
---

> [!NOTE]
> Release 1.17.0 with new migrate command, many util subcommands,
refreshed docs, and dependency updates.
> 
> - **Version**: bump `hk` to `1.17.0` (Cargo.toml, usage specs, docs).
> - **CLI**:
> - **New Command**: `migrate pre-commit` with flags (`--config`,
`--output`, `--force`, `--hk-pkl-root`).
> - **Util Subcommands**: add `check-added-large-files`,
`check-byte-order-marker`, `fix-byte-order-marker`,
`check-case-conflict`, `check-executables-have-shebangs`,
`check-merge-conflict`, `check-symlinks`, `detect-private-key`,
`end-of-file-fixer`, `mixed-line-ending`, `no-commit-to-branch`,
`python-check-ast`, `python-debug-statements`, `trailing-whitespace`.
> - **Docs**:
> - Update `docs/cli/index.md`, regenerate `docs/cli/commands.json`, and
`hk.usage.kdl`.
>   - Split `util` docs into per-command pages and add `migrate` docs.
> - **Dependencies**: update `Cargo.lock` crate versions and set `hk`
crate version to `1.17.0`.
> - **Changelog**: add `CHANGELOG.md` entry for `1.17.0` with
features/bug fixes.
> 
> <sup>Written by [Cursor
Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit
75b972a. This will update automatically
on new commits. Configure
[here](https://cursor.com/dashboard?tab=bugbot).</sup>
<!-- /CURSOR_SUMMARY -->

Co-authored-by: mise-en-dev <[email protected]>
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