forges/PR support / discard cmd / win32 paths #33
Merged
Conversation
added 6 commits
July 2, 2026 10:30
…conflict selector TUI
…icts The previous approach of draining the input buffer before entering the conflict selector TUI was unreliable across terminal/OS combinations because it depends on raw-mode state between TUI sessions. Instead, wrap the poll_event closure in select_conflicts to silently ignore all input for the first 300ms after invocation. This gives the terminal state time to settle and prevents the progress screen dismiss key from bleeding into the conflict selector. select_conflicts_on_terminal is unchanged, so no test callers are affected.
- Conflict selector debounce: 300ms -> 1000ms for slower machines - Progress screen auto-dismisses 500ms after all steps succeed (failure/cancellation still requires manual Esc dismissal, since user needs time to read the error message) - Summary text stripped of "press Esc" for the success case since the screen closes on its own - run_progress_on_terminal gains auto_dismiss_after: Option<Duration> parameter; production uses Some(500ms), tests pass None
…nd-line length limit - Changed commit(), commit_strict(), and commit_slice() to use git commit -F - (stdin) instead of -m <message> - On Windows, CreateProcessW fails with ERROR_FILENAME_EXCED_RANGE (os error 206) when the command line exceeds 32,767 characters - The partial-merge commit message in cmd_merge_workflow.rs lists ALL merged and sliced file paths, which can easily blow past the limit in large merges - Added commit_via_stdin helper in commit.rs, shared by commit and commit_strict
mwallner
changed the title
…ming
- Add to_fs_path() helper that adds \?\ prefix on Windows for paths > 240 chars
- Wrap 7 std::fs call sites and 2 create_dir_all calls with to_fs_path()
- Shorten MMM worktree dirs from full branch path to _mmm-{hash} naming
- pick_new_worktree_path hash fallback now re-checks 240-char limit
- ensure_longpaths_support() verifies config was applied
added 2 commits
July 2, 2026 20:09
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.