log: Fix --show=c (command without merge)

vincentdephily · Nov 5, 2024 · 0e1b97e · 0e1b97e
1 parent 5220495
commit 0e1b97e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/src/commands.rs b/src/commands.rs
@@ -70,17 +70,21 @@ pub fn cmd_log(gc: Conf, sc: ConfLog) -> Result<bool, Error> {
                 }
             },
             Hist::MergeStart { ts, key, nth, of, .. } => {
-                // This'll overwrite any previous entry, if a merge started but never finished
-                merges.insert(key, ts);
+                if sc.show.merge {
+                    // This'll overwrite any previous entry, if a merge started but never finished
+                    merges.insert(key, ts);
+                }
                 update_cmd(&mut cmds, nth, of);
             },
             Hist::MergeStop { ts, ref key, .. } => {
-                found += 1;
-                let started = merges.remove(key).unwrap_or(ts + 1);
-                if found <= sc.first {
-                    tbl.row([&[&FmtDate(if sc.starttime { started } else { ts })],
-                             &[&FmtDur(ts - started)],
-                             &[&gc.merge, &p.ebuild_version()]]);
+                if sc.show.merge {
+                    found += 1;
+                    let started = merges.remove(key).unwrap_or(ts + 1);
+                    if found <= sc.first {
+                        tbl.row([&[&FmtDate(if sc.starttime { started } else { ts })],
+                                 &[&FmtDur(ts - started)],
+                                 &[&gc.merge, &p.ebuild_version()]]);
+                    }
                 }
             },
             Hist::UnmergeStart { ts, key, .. } => {

diff --git a/src/parse/history.rs b/src/parse/history.rs
@@ -103,7 +103,7 @@ pub fn get_hist(file: &str,
     let filter = FilterStr::try_new(search_terms, search_exact)?;
     let (tx, rx): (Sender<Hist>, Receiver<Hist>) = bounded(256);
     thread::spawn(move || {
-        let show_merge = show.merge || show.pkg || show.tot;
+        let show_merge = show.merge || show.pkg || show.tot || show.cmd;
         let show_unmerge = show.unmerge || show.pkg || show.tot;
         let mut prev_t = 0;
         let mut curline = 1;