@evanpurkhiser/tooling-personal 1.11.0 → 1.15.0

package/dist/cmd/pr.js

@@ -6,13 +6,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const chalk_1 = __importDefault(require("chalk"));
 const listr2_1 = require("listr2");
 const open_1 = __importDefault(require("open"));
+const simple_git_1 = __importDefault(require("simple-git"));
 const assignees_1 = require("../assignees");
 const editor_1 = require("../editor");
 const fzf_1 = require("../fzf");
-const git_1 = __importDefault(require("../git"));
 const pulls_1 = require("../pulls");
 const utils_1 = require("../utils");
-const getCommits = () => git_1.default.log({ from: 'HEAD', to: 'origin/master' });
+const getCommits = () => simple_git_1.default().log({ from: 'HEAD', to: 'origin/master' });
 async function pr() {
     const repo = await utils_1.getRepoKey();
     const rendererOptions = { showTimer: true };
@@ -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');
@@ -80,8 +83,8 @@ async function pr() {
     const willOpenPr = prs.some(pr => pr.headRefName === branchName);
     // 03. Rebase and push the selected commits
     const doRebase = async () => {
-        await git_1.default
-            .env('GIT_SEQUENCE_EDITOR', `echo "${rebaseContents}" >`)
+        await simple_git_1.default()
+            .env({ ...process.env, GIT_SEQUENCE_EDITOR: `echo "${rebaseContents}" >` })
             .rebase(['--interactive', '--autostash', 'origin/master']);
     };
     const doPush = async () => {
@@ -89,7 +92,7 @@ async function pr() {
         const commitIdx = newCommits.all.length - selectedCommits.length;
         const rebaseTargetCommit = newCommits.all[commitIdx];
         const refSpec = `${rebaseTargetCommit.hash}:refs/heads/${branchName}`;
-        await git_1.default.push(['--force', 'origin', refSpec]);
+        await simple_git_1.default().push(['--force', 'origin', refSpec]);
     };
     const rebaseAndPushTask = new listr2_1.Listr([], { rendererOptions });
     rebaseAndPushTask.add({ title: 'Rebasing commits', task: doRebase });

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

@@ -6,7 +6,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 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))
     .command('pr', 'Create and update PRs', pr_1.default)
+    .command('select-commit', 'Select a commit hash', select_commit_1.default)
     .demandCommand(1, '')
     .parse();

package/dist/utils.js

@@ -6,15 +6,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.branchFromMessage = exports.getHubToken = exports.getRepoPath = exports.getRepoKey = void 0;
 const git_url_parse_1 = __importDefault(require("git-url-parse"));
 const js_yaml_1 = __importDefault(require("js-yaml"));
+const simple_git_1 = __importDefault(require("simple-git"));
 const fs_1 = require("fs");
 const path_1 = __importDefault(require("path"));
-const git_1 = __importDefault(require("./git"));
 const BRANCH_PREFIX = 'evanpurkhiser/';
 /**
  * Get's the current repo information
  */
 async function getRepoKey() {
-    const url = await git_1.default.raw('config', '--get', 'remote.origin.url');
+    const url = await simple_git_1.default().raw('config', '--get', 'remote.origin.url');
     const repo = git_url_parse_1.default(url);
     const repoKey = {
         owner: repo.owner,
@@ -28,7 +28,7 @@ exports.getRepoKey = getRepoKey;
  * Get's the absolute path to the current git repo
  */
 async function getRepoPath() {
-    const path = await git_1.default.revparse(['--show-toplevel']);
+    const path = await simple_git_1.default().revparse(['--show-toplevel']);
     return path.trim();
 }
 exports.getRepoPath = getRepoPath;

package/package.json

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

package/dist/git.js

@@ -1,8 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const simple_git_1 = __importDefault(require("simple-git"));
-const git = simple_git_1.default();
-exports.default = git;