cherrypick-interactive 1.9.0 → 1.10.0

package/cli.js

@@ -283,16 +283,16 @@ async function getSubjects(branch) {
 }
 
 async function getDevCommits(branch, since) {
-    const out = await gitRaw(['log', '--no-merges', `--since=${since}`, '--pretty=%H %s', branch]);
+    const SEP = '|||';
+    const out = await gitRaw(['log', '--no-merges', `--since=${since}`, `--pretty=%H${SEP}%ar${SEP}%s`, branch]);
 
     if (!out) {
         return [];
     }
     return out.split('\n').map((line) => {
-        const firstSpace = line.indexOf(' ');
-        const hash = line.slice(0, firstSpace);
-        const subject = line.slice(firstSpace + 1);
-        return { hash, subject };
+        const [hash, date, ...rest] = line.split(SEP);
+        const subject = rest.join(SEP);
+        return { hash, subject, date: date || '' };
     });
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cherrypick-interactive",
-  "version": "1.9.0",
+  "version": "1.10.0",
   "description": "Interactively cherry-pick commits that are in dev but not in main, using subject-based comparison.",
   "main": "cli.js",
   "bin": "cli.js",

package/src/tui/CommitList.js

@@ -15,6 +15,7 @@ export function CommitList({ commits, selected, cursorIndex }) {
                         key=${c.hash}
                         hash=${c.hash}
                         subject=${c.subject}
+                        date=${c.date || ''}
                         isSelected=${selected.has(c.hash)}
                         isCursor=${start + i === cursorIndex}
                     />

package/src/tui/CommitRow.js

@@ -1,7 +1,7 @@
-import { Text, Box } from 'ink';
+import { Text, Box, Spacer } from 'ink';
 import { html } from './html.js';
 
-export function CommitRow({ hash, subject, isSelected, isCursor }) {
+export function CommitRow({ hash, subject, date, isSelected, isCursor }) {
     const checkbox = isSelected ? '☑' : '☐';
     const checkColor = isSelected ? 'green' : 'gray';
     const cursor = isCursor ? '>' : ' ';
@@ -13,7 +13,9 @@ export function CommitRow({ hash, subject, isSelected, isCursor }) {
             <${Text} color=${cursorColor}>${cursor} </${Text}>
             <${Text} color=${checkColor}>${checkbox} </${Text}>
             <${Text} color="dim">${hash.slice(0, 7)}  </${Text}>
-            <${Text} color=${subjectColor}>${subject}</${Text}>
+            <${Text} color=${subjectColor} wrap="truncate">${subject}</${Text}>
+            <${Spacer} />
+            <${Text} color="dim">${date}</${Text}>
         </${Box}>
     `;
 }

package/src/tui/Header.js

@@ -3,11 +3,11 @@ import { html } from './html.js';
 
 export function Header({ devBranch, mainBranch, commitCount, since }) {
     return html`
-        <${Box} borderStyle="single" borderColor="cyan" paddingX=${1}>
-            <${Text} color="cyan">${devBranch} → ${mainBranch}</${Text}>
-            <${Text}>  │  </${Text}>
+        <${Box} paddingX=${1}>
+            <${Text} color="cyan" bold>${devBranch} → ${mainBranch}</${Text}>
+            <${Text} color="gray">  |  </${Text}>
             <${Text} color="yellow">${commitCount} missing</${Text}>
-            <${Text}>  │  </${Text}>
+            <${Text} color="gray">  |  </${Text}>
             <${Text} color="gray">Since: ${since}</${Text}>
         </${Box}>
     `;