joske
diff --git a/‎Cargo.lock‎
Lines changed: 6 additions & 6 deletions b/‎Cargo.lock‎
Lines changed: 6 additions & 6 deletions
diff --git a/‎Cargo.toml‎
Lines changed: 1 addition & 1 deletion b/‎Cargo.toml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎Makefile‎
Lines changed: 1 addition & 1 deletion b/‎Makefile‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎README.md‎
Lines changed: 17 additions & 1 deletion b/‎README.md‎
Lines changed: 17 additions & 1 deletion
diff --git a/‎TESTING.md‎
Lines changed: 18 additions & 5 deletions b/‎TESTING.md‎
Lines changed: 18 additions & 5 deletions
diff --git a/‎src/ui/common/chunk_map.rs‎
Lines changed: 76 additions & 8 deletions b/‎src/ui/common/chunk_map.rs‎
Lines changed: 76 additions & 8 deletions
diff --git a/‎src/ui/common/find_bar.rs‎
Lines changed: 12 additions & 3 deletions b/‎src/ui/common/find_bar.rs‎
Lines changed: 12 additions & 3 deletions
@@ -1,6 +1,6 @@
 [package]
 name = "mergers"
-version = "0.7.0"
+version = "0.7.1"
 edition = "2024"
 description = "A visual diff and merge tool for files and directories"
 license = "GPL-2.0"
 
@@ -17,7 +17,7 @@ $(VENV): tests/ui_integration/requirements.txt
 test-release: $(VENV)
 	cargo build --release
 	xvfb-run -a cargo test
-	xvfb-run -a $(PYTEST) tests/ui_integration/ -v
+	dbus-run-session -- xvfb-run -a $(PYTEST) tests/ui_integration/ -v
 
 fmt:
 	cargo +nightly fmt
 
@@ -194,7 +194,23 @@ make test-release
 make test-release
 ```
 
-`make test-release` runs `cargo test` followed by `pytest tests/ui_integration/ -v` under `xvfb-run`.
+`make test-release` runs `cargo test` followed by `pytest tests/ui_integration/ -v` under `dbus-run-session` + `xvfb-run`.
+
+**Required system packages (Debian/Ubuntu)**
+
+```bash
+sudo apt install \
+  libgtksourceview-5-dev \
+  xvfb \
+  fonts-dejavu-core \
+  at-spi2-core \
+  gir1.2-atspi-2.0 \
+  gir1.2-gtk-3.0 \
+  dbus-x11 \
+  xdotool \
+  python3-pip \
+  python3-gi
+```
 
 **Running UI tests manually (with a display)**
 
 
@@ -67,7 +67,8 @@
 - [ ] Escape closes find bar from source pane (not just from find entry)
 - [ ] Replace: replaces current selection if it matches
 - [ ] Replace All: replaces in both buffers
-- [ ] Close (X / Escape): hides bar, clears highlights
+- [ ] Close (X / Escape): hides bar, clears highlights, returns focus to pane
+- [ ] After closing find bar, Ctrl+F / Ctrl+H work immediately
 
 ### Save
 - [ ] Ctrl+S: saves focused pane; button goes insensitive
@@ -129,6 +130,8 @@
 - [ ] Tree view with expandable directories
 - [ ] Columns: Name (with icon), Size, Modification time
 - [ ] Directory headers above each pane with full path as tooltip
+- [ ] Copy path button next to each header: copies full absolute path to clipboard
+- [ ] Copy path after swap: copies the swapped (current) path, not the original
 - [ ] Status colors: blue (different), orange (left-only), green (right-only), dim italic (missing side)
 
 ### Navigation
@@ -145,14 +148,19 @@
 - [ ] Copy to left (Alt+Left): copies right to left; confirms if overwriting
 - [ ] Copy to right (Alt+Right): copies left to right; confirms if overwriting
 - [ ] Delete (Delete key): trashes selected file with confirmation
+- [ ] Collapse all: collapses every expanded directory row
+- [ ] Expand all: expands every directory row
 - [ ] Swap panes: rescans, updates headers and window title
 - [ ] Preferences (Ctrl+,)
 
 ### Context Menu
 - [ ] Right-click selects the clicked row first
+- [ ] Right-click targets correct row: select row A, right-click row B, action operates on B (not A)
 - [ ] "Open Diff": opens diff tab (disabled for directories)
 - [ ] "Copy to Left" / "Copy to Right": enabled for appropriate statuses
-- [ ] "Delete": always available
+- [ ] "Delete": enabled only when file exists on focused side
+- [ ] "Open Externally" / "Copy File Path": enabled only when file exists on focused side
+- [ ] Missing-side file: Copy, Delete, Open Externally, Copy Path all disabled
 
 ### Notebook Tabs
 - [ ] Directory tab labeled with "dir1 — dir2"
@@ -181,6 +189,7 @@
 - [ ] Hide hidden files off: dotfiles shown in tree
 
 ### Edge Cases
+- [ ] Collapse all with missing-side files expanded: no crash
 - [ ] Deeply nested directory trees
 - [ ] Copy directory recursively: all nested files copied
 - [ ] Dir -> file tab -> swap -> edit -> save dialog shows correct filename
@@ -219,7 +228,7 @@
 ### Find / Replace
 - [ ] Ctrl+F/H: find bar highlights matches across all three buffers
 - [ ] Match count sums all three buffers
-- [ ] Replace All replaces in all three buffers
+- [ ] Replace All replaces only in editable middle buffer (not read-only left/right)
 
 ### Save
 - [ ] Ctrl+S: saves middle pane
@@ -242,8 +251,10 @@
 
 ### Display
 - [ ] Window title: "mergers -- reponame (git)"
-- [ ] ColumnView: Status and File columns
+- [ ] ColumnView: Status, File, and Extra columns
 - [ ] Status colors: Modified/Renamed = blue, Added/Untracked = green, Deleted = orange
+- [ ] Extra column: "Staged" for fully staged, "Partially staged" for staged+unstaged
+- [ ] Conflict files: Extra column empty (not falsely "Staged")
 - [ ] Repo path label and changed file count
 
 ### Opening Diffs
@@ -257,7 +268,9 @@
 - [ ] Right-click selects clicked row
 - [ ] "Open Diff": opens diff (disabled for Untracked)
 - [ ] "Discard Changes": runs `git checkout --` with confirmation (disabled for Untracked)
-- [ ] "Stage": runs `git add`
+- [ ] "Stage": runs `git add` (disabled when already staged)
+- [ ] "Stage" on conflicted file: confirmation dialog warning it marks conflict resolved
+- [ ] "Unstage": runs `git restore --staged` (enabled only when staged)
 - [ ] "Trash": moves to trash with confirmation (Untracked only)
 
 ### File Watcher
 
@@ -1,24 +1,36 @@
 #[allow(clippy::wildcard_imports)]
 use super::*;
 
+#[allow(clippy::too_many_arguments)]
 pub fn draw_chunk_map(
+    area: &DrawingArea,
     cr: &gtk4::cairo::Context,
     height: f64,
     total_lines: i32,
     scroll: &ScrolledWindow,
     chunks: &[DiffChunk],
-    is_left: bool,
+    side: Side,
+    conflict_flags: &[bool],
 ) {
     if total_lines <= 0 || height <= 0.0 {
         return;
     }
 
-    for rect in &diff_state::compute_chunk_map_rects(chunks, total_lines as usize, height, is_left)
-    {
-        let (r, g, b) = match rect.tag {
-            DiffTag::Replace => band_replace(),
-            DiffTag::Delete | DiffTag::Insert => band_insert(),
-            DiffTag::Equal => continue,
+    for rect in &diff_state::compute_chunk_map_rects(
+        chunks,
+        total_lines as usize,
+        height,
+        side,
+        conflict_flags,
+    ) {
+        let (r, g, b) = if rect.conflict {
+            band_conflict()
+        } else {
+            match rect.tag {
+                DiffTag::Replace => band_replace(),
+                DiffTag::Delete | DiffTag::Insert => band_insert(),
+                DiffTag::Equal => continue,
+            }
         };
         cr.set_source_rgba(r, g, b, 0.7);
         cr.rectangle(1.0, rect.y_start, 10.0, rect.height);
@@ -30,7 +42,11 @@ pub fn draw_chunk_map(
     if adj.upper() > 0.0 {
         let view_start = (adj.value() / adj.upper()) * height;
         let view_h = (adj.page_size() / adj.upper()) * height;
-        let dark = is_dark_scheme();
+        let fg = area.color();
+        let fg_lum = 0.299 * f64::from(fg.red())
+            + 0.587 * f64::from(fg.green())
+            + 0.114 * f64::from(fg.blue());
+        let dark = fg_lum > 0.5;
         let v = if dark { 1.0 } else { 0.0 };
         let fill_alpha = if dark { 0.20 } else { 0.25 };
         let border_alpha = if dark { 0.45 } else { 0.55 };
@@ -44,3 +60,55 @@ pub fn draw_chunk_map(
         let _ = cr.fill();
     }
 }
+
+pub fn create_chunk_map(
+    buf: &TextBuffer,
+    scroll: &ScrolledWindow,
+    chunks: &Rc<RefCell<Vec<DiffChunk>>>,
+    side: Side,
+    other_chunks: Option<&Rc<RefCell<Vec<DiffChunk>>>>,
+    other_mid: Option<(Side, Side)>,
+) -> DrawingArea {
+    let map = DrawingArea::new();
+    map.set_content_width(12);
+    map.set_vexpand(true);
+    {
+        let buf = buf.clone();
+        let scroll = scroll.clone();
+        let chunks = chunks.clone();
+        let other_chunks = other_chunks.cloned();
+        map.set_draw_func(move |area, cr, _w, h| {
+            let flags: Vec<bool> =
+                if let (Some(oc), Some((my_mid, oc_mid))) = (&other_chunks, other_mid) {
+                    conflict_flags(&chunks.borrow(), my_mid, &oc.borrow(), oc_mid)
+                } else {
+                    Vec::new()
+                };
+            draw_chunk_map(
+                area,
+                cr,
+                h as f64,
+                buf.line_count(),
+                &scroll,
+                &chunks.borrow(),
+                side,
+                &flags,
+            );
+        });
+    }
+    {
+        let gesture = GestureClick::new();
+        let scroll = scroll.clone();
+        let m = map.clone();
+        gesture.connect_pressed(move |_, _, _x, y| {
+            let h = m.height() as f64;
+            if h > 0.0 {
+                let adj = scroll.vadjustment();
+                let target = (y / h) * adj.upper() - adj.page_size() / 2.0;
+                adj.set_value(target.max(0.0));
+            }
+        });
+        map.add_controller(gesture);
+    }
+    map
+}
@@ -194,9 +194,9 @@ pub fn build_find_bar(
         });
     }
 
-    // ── Replace all ──────────────────────────────────────────────────
+    // ── Replace all (only in editable buffers) ────────────────────────
     {
-        let bufs = buffers.clone();
+        let panes_for_replace = all_panes.clone();
         let find_e = find_entry.clone();
         let repl_e = replace_entry.clone();
         replace_all_btn.connect_clicked(move |_| {
@@ -206,7 +206,10 @@ pub fn build_find_bar(
                 return;
             }
             let needle_lower = needle.to_lowercase();
-            for buf in &bufs {
+            for (tv, buf) in &panes_for_replace {
+                if !tv.is_editable() {
+                    continue;
+                }
                 let text = buf
                     .text(&buf.start_iter(), &buf.end_iter(), false)
                     .to_string();
@@ -241,18 +244,22 @@ pub fn build_find_bar(
     {
         let fr = find_revealer.clone();
         let bufs = buffers.clone();
+        let av = active_view.clone();
         find_close_btn.connect_clicked(move |_| {
             fr.set_reveal_child(false);
             for b in &bufs {
                 clear_search_tags(b);
             }
+            let tv = av.borrow().clone();
+            tv.grab_focus();
         });
     }
 
     // ── Escape / F3 in find and replace entries ──────────────────────
     for entry in [&find_entry, &replace_entry] {
         let fr = find_revealer.clone();
         let bufs = buffers.clone();
+        let av = active_view.clone();
         let fnb = find_next_btn.clone();
         let fpb = find_prev_btn.clone();
         let key_ctl = EventControllerKey::new();
@@ -262,6 +269,8 @@ pub fn build_find_bar(
                 for b in &bufs {
                     clear_search_tags(b);
                 }
+                let tv = av.borrow().clone();
+                tv.grab_focus();
                 return gtk4::glib::Propagation::Stop;
             }
             if key == gtk4::gdk::Key::F3 {