Merge Find and Replace

Baseline: pinned TortoiseGit 7338078f8ddd924b8cddee35f512f2286072136d, FindDlg.cpp/.h, BaseView.cpp::OnFindDialogMessage, Search, BuildFindStringArray, GetCharGroup and IDD_FIND in src/Resources/TortoiseMergeENG.rc.

Identified directional gaps and resolved continuation — October 23, 2026

The initial source review found that native navigation selected from a global forward nonoverlapping match list, whereas pinned BaseView.cpp 5591–5605 and 5646–5785 search the current bounded substring. The confirmed differences were forward/reverse overlapping matches, reverse Replace's selected-start boundary and whole-word tests at the initial substring boundary. The directional continuation below resolves those specific differences through a separate navigator, while Count, painting and Replace All retain their forward nonoverlapping projection (BuildFindStringArray, 4564–4633). Its focused Core and six native case/engine checks pass with the fixture repairs recorded below; this does not certify the entire editor or port.

The two-pane comparison and three-pane conflict editor now use a pane-local, modeless native Find window. Search for and Replace with are editable history combos. The left column contains Match case, Limit search to modified lines, Search up and Whole word; the right column contains Find, Replace, Replace All, Count and Cancel. Return runs Find, Escape closes this window, and Command-G / Shift-Command-G navigate matches. The existing original Find icon remains in viewer menus. Source panes retain read-only replacement controls.

Search is literal and line-local, with UTF-16 ranges for AppKit. Synthetic gaps are excluded. Modified-only search excludes normal and regex-filtered lines; source removed/added/conflicted rows remain searchable. Result lines use the existing comparison/locator state projection. Whole word follows the source's space/tab/control/punctuation separators and honors the WordSeparators setting. Underscores and non-ASCII letters are not automatically classified as separators. Find wraps in either direction and reports top/bottom reached in green; no-match status is red and Count is blue. Colors use native semantic light/dark variants.

Match case, modified-only and whole word persist. Search Up stays session-local, as upstream. Search/replacement histories are separate, case-sensitive, untrimmed and limited to 25 entries. The pinned history combo can transiently retain a 26th entry before its next 25-entry load; that boundary difference remains open. Empty replacements are valid but are not added to history; CR/LF in history entries become spaces as in CHistoryCombo. A selected pane substring seeds the search when showing its dialog. Dialog geometry uses the shared native geometry store; separate upstream pane-relative X/Y placement is not reproduced yet.

Single Replace searches from the selection start in its chosen direction. Replace All takes the current nonoverlapping matches, then applies one grouped native edit, so replacement text containing the search term is not searched again. Two-pane display ranges are mapped back to original source ranges: display-only gaps/removed base rows never become working-file text. Three-pane edits use the conflict editor's existing grouped undo path. Neither action saves to disk or stages the index. Busy/confirmation/attached-sheet gates are checked at execution time. Each Find window follows its owner and closes with it; it retains only a weak pane reference.

Validation and remaining work

The Core receiver covers literal/case matching, UTF-16 and mixed EOL offsets, modified/gap filters, custom whole-word boundaries, nonoverlapping counts, direction/wrap/replace-current behavior and preference defaults. The native receiver exercises actual two/three-pane text views, Count, modified filtering, wrap status, Unicode Replace All, grouped Undo/Redo, readonly/busy gates, source mapping, owner closure and unchanged original files/index. All eight focused Core tests and the final native receiver passed. The app built successfully. See the dated QA record for exact scope and the initial fixture correction. Offscreen captures were rejected for missing native controls; no new screenshot was published.

Still partial: physical keyboard/menu/VoiceOver acceptance, full screenshots in light/dark and minimum-size windows, signed sandbox acceptance, pane-relative geometry, and exact Windows case-conversion differences for rare Unicode expansions. The result's modified states inherit the existing locator projection rather than adding a new engine.

Pane-local painting and selected-text search — October 15, 2026

Find, Count and Replace now retain a pane-local search snapshot and paint every match over the existing diff/inline colors using the source IntenseColor(30) rule. The layout manager owns temporary foreground/background attributes; source text styles, saved bytes and Undo history stay independent. Closing Find retains the search. Text/state changes, Undo/Redo, filtering, folding and theme updates refresh the paint; folded marker/hidden rows retain their own rendering. As in source drawing, modified-only restricts navigation/count/replacement while the query still paints matches on unchanged lines. Matching ranges are cached against exact UTF-8 text, line states, query and options.

Source OnEditFindnextStart/OnEditFindprevStart use the selected text as a new case-insensitive, unrestricted, non-whole-word query. The native commands follow that behavior, with Command-Option-G / Shift-Command-Option-G and original icons in both editor context menus. Control-F3 / Control-Shift-F3 retain the source shortcuts; F3 / Shift-F3 and Command-G / Shift-Command-G repeat the pane's committed search. No selection clears its search, as upstream. Clear Search Highlights is also explicit in the native menus. These commands do not overwrite Find's draft or persisted options. Repeated search with no active query does nothing.

Commands recheck busy, pending-choice, attached-sheet and retired-owner gates. The three-way source and result panes have independent queries, as do the two comparison panes. Temporary paint is never an edit or save. Source Windows flash/no-match rendering, pane-relative Find geometry, physical gestures/VoiceOver, exact platform font/case metrics and signed sandbox acceptance remain open. The Debug build and grouped native Find receiver passed with system and bundled Git after the recorded compile/fixture repairs. See search painting evidence. Core matching was unchanged and no Core suite was repeated.

The connected marked-word and locator continuation adds independent word marking, layered source paint and Find/marked-row bands, with its own grouped evidence.

Aligned-result hosted fixture repair — October 16, 2026

The hosted MergeFindNativeVerification timeout was reproduced locally at its result locator assertion. The fixture counted serialized conflict-marker bodies, while the native aligned unresolved result correctly displayed a Base placeholder. It now checks that initial [2,1,2] marked-row state, chooses Mine then Theirs through the real merge action, waits for the aligned displayed result and retains the original [2,3,2] locator and Find/Replace/Undo assertions. Wait diagnostics identify the fixture line. The isolated repaired phase passed without app/Core changes or repeating the full LFS/mail suite. See actual attempts and limits. Full hosted rerun and signed/physical acceptance remain pending.

Source search forms and pane ownership — October 17, 2026

Find now retires on Cancel/close: it clears only its own pane reference, removes observers, disables old controls and refuses old target actions. A fresh dialog seeds the current selection or an empty query, retaining the history choices; repeated Find on an open dialog preserves the draft. Search Up resets with the new session. Empty Count clears status and saves source options without running an empty search. Busy, Go to Line and retired panes disable search/options/Count as well as replacement; three-pane search also waits for current source rows. History duplicate comparison preserves distinct Unicode byte spellings.

Find placement now saves independent left/right/result offsets relative to each pane's scroll viewport and restores them within the owner's current screen. This supersedes earlier statements that pane-relative placement was absent. Both coordinates are retained independently; the pinned SaveWindowPos assignment of both coordinates from the Y value is not copied into the macOS adaptation. Labels, source checkbox/button order and colored selectable status remain, with a reserved wrapping area. Native font metrics and geometry remain platform-specific.

Go to Line now uses a native source-shaped sheet with the permanent one-based range label, initially empty input and OK/Cancel. Invalid explicit acceptance selects the input and displays an inline range error; ordinary editing disables OK until a valid ASCII integer is present. This replaces the generic alert and Windows balloon with macOS controls. Cancel, owner closure and duplicate targets finish once; the existing original-coordinate mapping and intent/text fences still decide whether to navigate. An independent request count guards Quit until a pending chooser drains, including after forced editor closure.

All 18 Find/Go to Line static resource controls now have partial mappings. All three native families have passing runs, including the actual Find/Replace/Undo Git-conflict workflow with system and bundled Git. The source-form and initial-navigation cases exercise native UI without Git commands; their repeated engine environments do not prove additional Git backend coverage. Affected source rechecks pass after capture/footer repairs. One initial-navigation block/caret assertion failed before the two passing diagnostic attempts; its intermittent cause remains open. Four final raw light/dark captures were individually reviewed, and all eleven receivers were reaped and independently absent. Core was unchanged and not repeated. See batch evidence for exact failures, repairs, capture provenance and acceptance limits. Physical gestures, VoiceOver, all source Find case/font metrics, source Windows flash feedback, every pane replacement/volume case and signed App Store acceptance remain open.

The attached-pane startup continuation adds appearance-once loading, current-viewport registration/retirement and attached-only deferred initial/Undo writers. Deterministic detach/reattach and six native family checks have passing runs, with an unexplained margin timeout retained in the evidence. These checks do not certify all causes of earlier intermittent initial-selection failures.

Directional search continuation — October 23, 2026

The isolated implementation is integrated into the primary checkout. The focused Core search families and all six native case/engine pairs pass; the two failed fixture attempts and their scoped repairs remain recorded below. This section supersedes the earlier description of Find navigation as choosing from the nonoverlapping match list and of every single Replace starting at the current selected occurrence. It does not change the earlier validation records.

The pinned BaseView.cpp::Search and StringFound search an initial substring bounded by the caret or selection, then traverse eligible source rows in the requested direction. MergeFind.navigate implements that path independently of Count and search painting. The native Find button, Find Next/Previous actions, selected-text commands and existing F3/macOS keyboard wrappers use this navigator; there are no new controls, settings or shortcuts.

Forward Find starts at the selection end, or the caret with no selection. Single Replace uses the selection start. A caret at offset 1 in aaa, searching for aa, therefore finds offset 1 even though Count paints only offset 0.
Reverse Find takes the source's initial row from the selection end and its column from the selection start. Reverse single Replace uses the start row as well. Thus replacing upward from the second aa in aa aa replaces the first one, and a multiline selection retains the source's end-row/start-column rule for ordinary reverse Find.
Reverse candidate discovery advances by one UTF-16 unit, so it can find the final overlapping aa in aaa. A rejected whole-word candidate follows the source's decrement and strict-before retry rule; it is not replaced with a generic backward substring search.
Whole-word testing uses the initial bounded substring. Forward cat at caret 1 in xcat, or reverse cat at caret 3 in catx, can therefore match where full-line whole-word Count reports zero. This preserves the pinned caret-cut behavior rather than imposing an additional boundary outside that substring.
Traversal skips synthetic Empty rows and respects modified-only state. It visits the initial partial row and at most one complete traversal, including a full revisit of the initial row after wrap. Existing top/bottom status and no-match feedback remain; Windows flash feedback is still not reproduced.

OnFindDialogMessage and BuildFindStringArray distinguish navigation from the count/projection work. Count, highlight caches and Replace All retain their existing nonoverlapping full-line projection. Replacing aa with Y throughout aaa produces Ya. The existing grouped edit, source/display row mapping, Undo/Redo, read-only, modified-only, saved-byte/index and owner/Quit guards remain in use. No search result is saved or staged by this continuation.

The grouped Core run passed all 20 search methods: nine new directional, eight retained Find and three marked-word methods. The same 21-method run failed one separate configured-CA HTTPS trust test; its diagnostics remain in search-log-ca-core-2026-10-23.log. This search result is not a full Core or hosted CI pass. The Debug app build returned exit zero with 34 generic command-failed-with-exit-zero diagnostics retained in its log. Neither app nor Core was repeated for fixture-only repairs.

Actual Compare, Merge and ownership native cases pass with system and bundled Git. They exercise real Find actions, F3 wrappers, overlaps, caret-cut whole words, wrap, reverse Replace, modified lines, nonoverlapping Count/paint/Replace All, Undo/Redo, read-only output, busy/Quit/retired refusal and unchanged saved input/index bytes. The initial system Compare passed and was not repeated.

Two system Merge attempts failed in the fixture. The first observed a model update before the native pane installed its current source/presentation receipt; the fixture now waits for the actual Find eligibility. The next exposed an incorrect expected count: the aligned result displays a removed base aa row alongside mine aa and theirs aa. That removed row is searchable, including modified-only mode, while excluded from saved output. The fixture now asserts the exact literal displayed rows, seven nonoverlapping matches and saved output independently. All replacement and Undo assertions remain. Only the affected system Merge and previously unrun cases followed these repairs.

Across eight receiver attempts, six passed and two failed; all were reaped and the parent independently verified their actual PIDs absent. Repositories, preferences and windows were private, and windows stayed invisible/offscreen. No capture, physical interaction or signed sandbox deployment is claimed. See the dated directional-search record for logs, receiver identities, cumulative scope and remaining limits. The existing platform Unicode case-conversion and font-metric differences, physical keyboard/VoiceOver acceptance and broader pane/volume cases remain open.