@evanpurkhiser/tooling-personal 1.12.0 → 1.16.0

package/dist/cmd/pr.js

@@ -71,7 +71,10 @@ async function pr() {
     //     the end of the list.
     const rebaseContents = [
         ...selectedShas,
-        ...commits.all.filter(c => !selectedShas.includes(c.hash)).map(c => c.hash),
+        ...commits.all
+            .filter(c => !selectedShas.includes(c.hash))
+            .map(c => c.hash)
+            .reverse(),
     ]
         .map(sha => `pick ${sha}`)
         .join('\n');
@@ -81,7 +84,7 @@ async function pr() {
     // 03. Rebase and push the selected commits
     const doRebase = async () => {
         await simple_git_1.default()
-            .env('GIT_SEQUENCE_EDITOR', `echo "${rebaseContents}" >`)
+            .env({ ...process.env, GIT_SEQUENCE_EDITOR: `echo "${rebaseContents}" >` })
             .rebase(['--interactive', '--autostash', 'origin/master']);
     };
     const doPush = async () => {

package/dist/cmd/select-commit.js

@@ -0,0 +1,22 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const chalk_1 = __importDefault(require("chalk"));
+const simple_git_1 = __importDefault(require("simple-git"));
+const fzf_1 = require("../fzf");
+async function selectCommit() {
+    const commits = await simple_git_1.default().log({ from: 'HEAD', to: 'origin/master' });
+    const selected = await fzf_1.fzfSelect({
+        prompt: 'Select commit(s) for PR:',
+        genValues: addOption => commits.all.forEach(commit => {
+            const shortHash = commit.hash.slice(0, 8);
+            const label = chalk_1.default `{red ${shortHash}} {blue [${commit.author_name}]} {white ${commit.message}}`;
+            addOption({ label, id: commit.hash, ...commit });
+        }),
+    });
+    const commitHashes = selected.map(commit => commit.hash);
+    console.log(commitHashes.join('\n'));
+}
+exports.default = selectCommit;

package/dist/index.js

@@ -4,9 +4,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const chalk_1 = __importDefault(require("chalk"));
 const yargs_1 = __importDefault(require("yargs"));
 const pr_1 = __importDefault(require("./cmd/pr"));
+const select_commit_1 = __importDefault(require("./cmd/select-commit"));
 yargs_1.default(process.argv.slice(2))
+    .option('color', {
+    boolean: true,
+    desc: 'Use colored output (default: auto-detect)',
+})
+    .middleware(args => {
+    if (args.color !== undefined) {
+        chalk_1.default.level = args.color ? 3 : 0;
+    }
+}, true)
     .command('pr', 'Create and update PRs', pr_1.default)
+    .command('select-commit', 'Select a commit hash', select_commit_1.default)
     .demandCommand(1, '')
     .parse();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@evanpurkhiser/tooling-personal",
-  "version": "1.12.0",
+  "version": "1.16.0",
   "description": "Evan Purkhiser's personal tooling",
   "repository": "https://github.com/EvanPurkhiser/tooling-personal",
   "author": "Evan Purkhiser",