reslop 0.2.3 → 0.2.5

package/lib/git-branches.js

@@ -4,7 +4,10 @@ const fs = require('node:fs');
 const os = require('node:os');
 const path = require('node:path');
 
-const { oneLine, requireOk, runGit, runGitAsync } = require('./git.js');
+const files = require('./files.js');
+const gitWorktree = require('./git-worktree.js');
+const { shortAge } = files;
+const { oneLine, requireOk, runGit, runGitAsync } = gitWorktree;
 
 const BRANCH_FORMAT = [
   '%(HEAD)',
@@ -72,27 +75,56 @@ const parseCommitRecord = (record, index) => {
     shortSha: read('%h') || sha.slice(0, 7),
     author: read('%an'),
     email: read('%ae'),
-    date: read('%ar'),
+    date: shortAge(read('%ar')),
     when: read('%ci'),
     refs: formatCommitRefs(read('%D')),
     subject,
     body,
+    added: 0,
+    removed: 0,
     head: index === 0,
   };
 };
 
+const STAT_LEAD = /^\n* *\d+ files? changed[^\n]*\n?/;
+
+const takeStat = (chunk) => {
+  const match = STAT_LEAD.exec(chunk);
+  if (!match) return { stat: '', rest: chunk };
+  return { stat: match[0], rest: chunk.slice(match[0].length) };
+};
+
+const countIn = (line, word) => {
+  const match = new RegExp(`(\\d+) ${word}`).exec(line);
+  if (!match) return 0;
+  return parseInt(match[1], 10);
+};
+
+const parseShortstat = (line) => ({
+  added: countIn(line, 'insertion'),
+  removed: countIn(line, 'deletion'),
+});
+
 const listCommits = (top) => {
   const args = [
     'log',
     '-z',
+    '--shortstat',
     `--format=${COMMIT_FORMAT}`,
     `--max-count=${COMMIT_LIMIT}`,
   ];
   const result = requireOk(runGit(args, top), 'log failed');
   const commits = [];
-  for (const record of result.stdout.split('\0')) {
-    if (!record) continue;
-    const entry = parseCommitRecord(record, commits.length);
+  for (const chunk of result.stdout.split('\0')) {
+    const taken = takeStat(chunk);
+    if (taken.stat && commits.length) {
+      const stat = parseShortstat(taken.stat);
+      const last = commits[commits.length - 1];
+      last.added = stat.added;
+      last.removed = stat.removed;
+    }
+    if (!taken.rest) continue;
+    const entry = parseCommitRecord(taken.rest, commits.length);
     if (entry) commits.push(entry);
   }
   return commits;
@@ -113,48 +145,40 @@ const dropHeadCommit = (top) => {
   requireOk(runGit(['reset', '--soft', 'HEAD~1'], top), 'drop failed');
 };
 
-const rebaseFailed = (result) => {
-  if (result.status === 0) return '';
-  return result.stderr || result.stdout || 'rebase failed';
-};
-
-const dropOlderCommit = (top, sha) => {
-  const onto = `${sha}^`;
-  const result = runGit(['rebase', '--onto', onto, sha], top);
-  const failed = rebaseFailed(result);
-  if (!failed) return;
+const runRebase = (top, args, extra = {}) => {
+  const result = runGit(args, top, undefined, extra);
+  if (result.status === 0) return;
   runGit(['rebase', '--abort'], top);
-  throw new Error(oneLine(failed));
+  requireOk(result, 'rebase failed');
 };
 
-const dropOlderCommitAsync = async (top, sha) => {
-  const onto = `${sha}^`;
-  const result = await runGitAsync(['rebase', '--onto', onto, sha], top);
-  const failed = rebaseFailed(result);
-  if (!failed) return;
+const runRebaseAsync = async (top, args, extra = {}) => {
+  const result = await runGitAsync(args, top, extra);
+  if (result.status === 0) return;
   await runGitAsync(['rebase', '--abort'], top);
-  throw new Error(oneLine(failed));
+  requireOk(result, 'rebase failed');
 };
 
-const dropCommit = (top, sha) => {
-  const spec = namedCommit(sha);
-  const target = resolveCommit(top, spec);
+const dropTarget = (top, sha) => {
+  const target = resolveCommit(top, namedCommit(sha));
   const parent = runGit(['rev-parse', '--verify', `${target}^`], top);
   if (parent.status !== 0) throw new Error('cannot drop root commit');
-  const head = resolveCommit(top, 'HEAD');
-  if (target === head) return void dropHeadCommit(top);
-  dropOlderCommit(top, target);
+  return target;
+};
+
+const dropCommit = (top, sha) => {
+  const target = dropTarget(top, sha);
+  if (target === resolveCommit(top, 'HEAD')) return void dropHeadCommit(top);
+  runRebase(top, ['rebase', '--onto', `${target}^`, target]);
 };
 
 const dropCommitAsync = async (top, sha) => {
-  const spec = namedCommit(sha);
-  const target = resolveCommit(top, spec);
-  const parentArgs = ['rev-parse', '--verify', `${target}^`];
-  const parent = await runGitAsync(parentArgs, top);
-  if (parent.status !== 0) throw new Error('cannot drop root commit');
-  const head = resolveCommit(top, 'HEAD');
-  if (target === head) return void dropHeadCommit(top);
-  await dropOlderCommitAsync(top, target);
+  const target = dropTarget(top, sha);
+  if (target === resolveCommit(top, 'HEAD')) {
+    requireOk(await runGitAsync(['reset', '--soft', 'HEAD~1'], top));
+    return;
+  }
+  await runRebaseAsync(top, ['rebase', '--onto', `${target}^`, target]);
 };
 
 const FIXUP_MARK = 'fixup!';
@@ -197,61 +221,33 @@ const ancestorWithSubject = (top, sha, want) => {
   return '';
 };
 
-const applyAutosquash = (top, ontoArgs) => {
-  const result = runGit([...AUTOSQUASH_ARGS, ...ontoArgs], top);
-  const failed = rebaseFailed(result);
-  if (!failed) return;
-  runGit(['rebase', '--abort'], top);
-  throw new Error(oneLine(failed));
-};
-
-const applyAutosquashAsync = async (top, ontoArgs) => {
-  const result = await runGitAsync([...AUTOSQUASH_ARGS, ...ontoArgs], top);
-  const failed = rebaseFailed(result);
-  if (!failed) return;
-  await runGitAsync(['rebase', '--abort'], top);
-  throw new Error(oneLine(failed));
-};
-
-const applyFixupOnto = (top, original, applyRange) => {
-  const parent = runGit(['rev-parse', '--verify', `${original}^`], top);
-  if (parent.status !== 0) return applyRange(top, ['--root']);
-  return applyRange(top, [(parent.stdout ?? '').trim()]);
+const rebaseRange = (top, sha) => {
+  const parent = runGit(['rev-parse', '--verify', `${sha}^`], top);
+  return parent.status === 0 ? [parent.stdout.trim()] : ['--root'];
 };
 
-const applyFixup = (top, sha) => {
-  const spec = namedCommit(sha);
-  const commit = resolveCommit(top, spec);
+const fixupArgs = (top, sha) => {
+  const commit = resolveCommit(top, namedCommit(sha));
   const subject = commitSubject(top, commit);
   if (!isFixupSubject(subject)) throw new Error('not a fixup commit');
   const want = fixupRest(subject);
   if (!want) throw new Error('no fixup target');
   const original = ancestorWithSubject(top, commit, want);
   if (!original) throw new Error('no fixup target');
-  applyFixupOnto(top, original, applyAutosquash);
+  return [...AUTOSQUASH_ARGS, ...rebaseRange(top, original)];
 };
 
-const applyFixupAsync = async (top, sha) => {
-  const spec = namedCommit(sha);
-  const commit = resolveCommit(top, spec);
-  const subject = commitSubject(top, commit);
-  if (!isFixupSubject(subject)) throw new Error('not a fixup commit');
-  const want = fixupRest(subject);
-  if (!want) throw new Error('no fixup target');
-  const original = ancestorWithSubject(top, commit, want);
-  if (!original) throw new Error('no fixup target');
-  await applyFixupOnto(top, original, applyAutosquashAsync);
-};
+const applyFixup = (top, sha) => runRebase(top, fixupArgs(top, sha));
+
+const applyFixupAsync = async (top, sha) =>
+  runRebaseAsync(top, fixupArgs(top, sha));
 
 const messageBody = (message) => {
   const text = `${message ?? ''}`;
   return text.endsWith('\n') ? text : `${text}\n`;
 };
 
-const rewordHead = (top, message) => {
-  const args = ['commit', '--amend', '--only', '-F', '-'];
-  requireOk(runGit(args, top, messageBody(message)));
-};
+const REWORD_HEAD_ARGS = ['commit', '--amend', '--only', '-F', '-'];
 
 const REWORD_TODO = path.join(__dirname, 'git-reword-todo.js');
 
@@ -270,32 +266,11 @@ const prepareRewordEditor = (message) => {
   };
 };
 
-const rewordRange = (top, sha, env) => {
-  const parent = runGit(['rev-parse', '--verify', `${sha}^`], top);
-  const onto =
-    parent.status !== 0 ? ['--root'] : [(parent.stdout ?? '').trim()];
-  return runGit(['rebase', '--interactive', ...onto], top, undefined, { env });
-};
-
-const rewordRangeAsync = async (top, sha, env) => {
-  const parent = runGit(['rev-parse', '--verify', `${sha}^`], top);
-  const onto =
-    parent.status !== 0 ? ['--root'] : [(parent.stdout ?? '').trim()];
-  return runGitAsync(['rebase', '--interactive', ...onto], top, { env });
-};
-
-const finishRewordRebase = (top, result) => {
-  const failed = rebaseFailed(result);
-  if (!failed) return;
-  runGit(['rebase', '--abort'], top);
-  throw new Error(oneLine(failed));
-};
-
 const rewordOlder = (top, sha, message) => {
   const prepared = prepareRewordEditor(message);
   try {
-    const result = rewordRange(top, sha, prepared.env);
-    finishRewordRebase(top, result);
+    const args = ['rebase', '--interactive', ...rebaseRange(top, sha)];
+    runRebase(top, args, { env: prepared.env });
   } finally {
     fs.rmSync(prepared.dir, { recursive: true, force: true });
   }
@@ -304,29 +279,29 @@ const rewordOlder = (top, sha, message) => {
 const rewordOlderAsync = async (top, sha, message) => {
   const prepared = prepareRewordEditor(message);
   try {
-    const result = await rewordRangeAsync(top, sha, prepared.env);
-    const failed = rebaseFailed(result);
-    if (!failed) return;
-    await runGitAsync(['rebase', '--abort'], top);
-    throw new Error(oneLine(failed));
+    const args = ['rebase', '--interactive', ...rebaseRange(top, sha)];
+    await runRebaseAsync(top, args, { env: prepared.env });
   } finally {
     fs.rmSync(prepared.dir, { recursive: true, force: true });
   }
 };
 
 const rewordCommit = (top, sha, message) => {
-  const spec = namedCommit(sha);
-  const commit = resolveCommit(top, spec);
-  const head = resolveCommit(top, 'HEAD');
-  if (commit === head) return void rewordHead(top, message);
+  const commit = resolveCommit(top, namedCommit(sha));
+  if (commit === resolveCommit(top, 'HEAD')) {
+    requireOk(runGit(REWORD_HEAD_ARGS, top, messageBody(message)));
+    return;
+  }
   rewordOlder(top, commit, message);
 };
 
 const rewordCommitAsync = async (top, sha, message) => {
-  const spec = namedCommit(sha);
-  const commit = resolveCommit(top, spec);
-  const head = resolveCommit(top, 'HEAD');
-  if (commit === head) return void rewordHead(top, message);
+  const commit = resolveCommit(top, namedCommit(sha));
+  if (commit === resolveCommit(top, 'HEAD')) {
+    const input = messageBody(message);
+    requireOk(await runGitAsync(REWORD_HEAD_ARGS, top, { input }));
+    return;
+  }
   await rewordOlderAsync(top, commit, message);
 };
 
@@ -348,7 +323,7 @@ const parseBranchLine = (line) => {
   if (!name) return null;
   const mark = parts[0] ?? '';
   const sha = (parts[2] ?? '').trim();
-  const date = (parts[3] ?? '').trim();
+  const date = shortAge(parts[3] ?? '');
   const track = parseTrack(parts[4]);
   const subject = parts.slice(5).join('\t').trim();
   return {
@@ -393,13 +368,10 @@ const listBranches = (top) => {
   const names = new Set();
   for (const entry of branches) names.add(entry.name);
   const primary = defaultBranch(top, names);
-  const { length } = branches;
-  const listed = new Array(length);
-  for (let i = 0; i < length; i++) {
-    const entry = branches[i];
-    listed[i] = { ...entry, isDefault: entry.name === primary };
-  }
-  return listed;
+  return branches.map((entry) => ({
+    ...entry,
+    isDefault: entry.name === primary,
+  }));
 };
 
 const namedBranch = (name) => {
@@ -430,23 +402,11 @@ const createBranchAsync = async (top, name) => {
   requireOk(await runGitAsync(args, top), 'checkout failed');
 };
 
-const rebaseBranch = (top, onto) => {
-  const branch = namedBranch(onto);
-  const result = runGit(['rebase', branch], top);
-  const failed = rebaseFailed(result);
-  if (!failed) return;
-  runGit(['rebase', '--abort'], top);
-  throw new Error(oneLine(failed));
-};
+const rebaseBranch = (top, onto) =>
+  runRebase(top, ['rebase', namedBranch(onto)]);
 
-const rebaseBranchAsync = async (top, onto) => {
-  const branch = namedBranch(onto);
-  const result = await runGitAsync(['rebase', branch], top);
-  const failed = rebaseFailed(result);
-  if (!failed) return;
-  await runGitAsync(['rebase', '--abort'], top);
-  throw new Error(oneLine(failed));
-};
+const rebaseBranchAsync = async (top, onto) =>
+  runRebaseAsync(top, ['rebase', namedBranch(onto)]);
 
 const dropBranch = (top, name) => {
   const branch = namedBranch(name);
@@ -510,36 +470,31 @@ const pushCmd = (force, branch) => {
 const noUpstream = (msg) =>
   `${msg ?? ''}`.toLowerCase().includes('no upstream');
 
-const finishPush = (result, force, branch, run) => {
+const requirePushOk = (result) => {
   if (result.status === 0) return;
-  const msg = result.stderr || result.stdout || 'push failed';
-  if (!noUpstream(msg)) throw pushError(msg);
-  const next = run(pushCmd(force, branch));
-  if (next.status !== 0) {
-    throw pushError(next.stderr || next.stdout || 'push failed');
-  }
+  throw pushError(result.stderr || result.stdout || 'push failed');
 };
 
 const pushChanges = (top, force) => {
   const useForce = force === true;
   const branch = pushBranch(top);
   const tracked = hasUpstream(top) ? '' : branch;
-  const result = runGit(pushCmd(useForce, tracked), top);
-  finishPush(result, useForce, branch, (args) => runGit(args, top));
+  let result = runGit(pushCmd(useForce, tracked), top);
+  if (result.status !== 0 && noUpstream(result.stderr || result.stdout)) {
+    result = runGit(pushCmd(useForce, branch), top);
+  }
+  requirePushOk(result);
 };
 
 const pushChangesAsync = async (top, force) => {
   const useForce = force === true;
   const branch = pushBranch(top);
   const tracked = hasUpstream(top) ? '' : branch;
-  const result = await runGitAsync(pushCmd(useForce, tracked), top);
-  if (result.status === 0) return;
-  const msg = result.stderr || result.stdout || 'push failed';
-  if (!noUpstream(msg)) throw pushError(msg);
-  const next = await runGitAsync(pushCmd(useForce, branch), top);
-  if (next.status !== 0) {
-    throw pushError(next.stderr || next.stdout || 'push failed');
+  let result = await runGitAsync(pushCmd(useForce, tracked), top);
+  if (result.status !== 0 && noUpstream(result.stderr || result.stdout)) {
+    result = await runGitAsync(pushCmd(useForce, branch), top);
   }
+  requirePushOk(result);
 };
 
 const hasStaged = (top) => {
@@ -551,9 +506,7 @@ const commitPlan = (kind, message) => {
   const args = ['commit'];
   if (kind === 'amend') args.push('--amend');
   args.push('-F', '-');
-  const text = message ?? '';
-  const body = text.endsWith('\n') ? text : `${text}\n`;
-  return { args, body };
+  return { args, body: messageBody(message) };
 };
 
 const commitChanges = (top, kind, message) => {