@evanpurkhiser/tooling-personal 1.47.0 → 1.48.0

package/dist/cmd/pr-create.js

@@ -50,9 +50,6 @@ async function resolveReviewers(repo, slugs) {
     return found;
 }
 async function prCreate(argv) {
-    if (!argv.title && !argv.updateOnly) {
-        throw new Error('--title is required when creating a PR');
-    }
     const username = await (0, utils_1.getEmailUsername)();
     const repo = await (0, utils_1.getRepoKey)();
     const { head, origin } = await (0, utils_1.getBranchNames)();
@@ -78,22 +75,15 @@ async function prCreate(argv) {
     }
     const branchName = (0, utils_1.branchFromMessage)(username, commit.message);
     const existingPr = prs.find(p => p.headRefName === branchName);
-    if (argv.updateOnly && !existingPr) {
-        throw new Error(`No existing PR for branch ${branchName}`);
+    if (existingPr) {
+        throw new Error(`PR already exists for branch ${branchName} (#${existingPr.number}). Use 'pr-update' to push changes.`);
     }
     const reviewerSlugs = parseSlugs(argv.reviewer);
-    // Reviewers only apply on PR creation (matches `pt pr` behavior).
-    const reviewers = existingPr ? [] : await resolveReviewers(repo, reviewerSlugs);
+    const reviewers = await resolveReviewers(repo, reviewerSlugs);
     console.error(chalk_1.default.gray(`Cherry-picking ${commit.hash.slice(0, 8)} onto ${origin}`));
     const newSha = await (0, cherry_pick_1.cherryPickOnto)(commit.hash, origin);
     console.error(chalk_1.default.gray(`Pushing ${branchName}`));
     await (0, simple_git_1.default)().push(['--force', 'origin', `${newSha}:refs/heads/${branchName}`]);
-    if (existingPr) {
-        const url = `https://github.com/${repo.fullName}/pull/${existingPr.number}`;
-        console.error(chalk_1.default.green(`Updated existing PR #${existingPr.number}: ${existingPr.title}`));
-        console.log(url);
-        return;
-    }
     console.error(chalk_1.default.gray('Creating Pull Request'));
     const { createPullRequest } = await (0, pulls_1.createPull)({
         baseRefName: repoDetails.defaultBranch,

package/dist/cmd/pr-update.js

@@ -0,0 +1,40 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.prUpdate = prUpdate;
+const chalk_1 = __importDefault(require("chalk"));
+const simple_git_1 = __importDefault(require("simple-git"));
+const cherry_pick_1 = require("../cherry-pick");
+const pulls_1 = require("../pulls");
+const utils_1 = require("../utils");
+async function prUpdate(argv) {
+    const username = await (0, utils_1.getEmailUsername)();
+    const repo = await (0, utils_1.getRepoKey)();
+    const { head, origin } = await (0, utils_1.getBranchNames)();
+    if (head === null) {
+        throw new Error('Cannot determine HEAD branch name');
+    }
+    if (origin === null) {
+        throw new Error('Cannot determine upstream HEAD branch name');
+    }
+    const unpublished = (0, simple_git_1.default)().log({ from: 'HEAD', to: origin });
+    const [commits, prs] = await Promise.all([unpublished, (0, pulls_1.getPulls)(repo)]);
+    const commit = commits.all.find(c => c.hash.startsWith(argv.sha));
+    if (!commit) {
+        throw new Error(`Commit ${argv.sha} not found in unpublished commits`);
+    }
+    const branchName = (0, utils_1.branchFromMessage)(username, commit.message);
+    const existingPr = prs.find(p => p.headRefName === branchName);
+    if (!existingPr) {
+        throw new Error(`No existing PR for branch ${branchName}. Use 'pr-create' to open one.`);
+    }
+    console.error(chalk_1.default.gray(`Cherry-picking ${commit.hash.slice(0, 8)} onto ${origin}`));
+    const newSha = await (0, cherry_pick_1.cherryPickOnto)(commit.hash, origin);
+    console.error(chalk_1.default.gray(`Pushing ${branchName}`));
+    await (0, simple_git_1.default)().push(['--force', 'origin', `${newSha}:refs/heads/${branchName}`]);
+    const url = `https://github.com/${repo.fullName}/pull/${existingPr.number}`;
+    console.error(chalk_1.default.green(`Updated existing PR #${existingPr.number}: ${existingPr.title}`));
+    console.log(url);
+}

package/dist/index.js

@@ -8,6 +8,7 @@ const chalk_1 = __importDefault(require("chalk"));
 const yargs_1 = __importDefault(require("yargs"));
 const pr_1 = require("./cmd/pr");
 const pr_create_1 = require("./cmd/pr-create");
+const pr_update_1 = require("./cmd/pr-update");
 const select_commit_1 = require("./cmd/select-commit");
 const suggest_assignees_1 = require("./cmd/suggest-assignees");
 (0, yargs_1.default)(process.argv.slice(2))
@@ -31,7 +32,7 @@ const suggest_assignees_1 = require("./cmd/suggest-assignees");
     boolean: true,
     desc: 'Enable auto merge for the PR',
 }), pr_1.pr)
-    .command('pr-create <sha>', 'Non-interactively create or update a PR for a single commit. Body is read from stdin.', y => y
+    .command('pr-create <sha>', 'Non-interactively create a PR for a single commit. Body is read from stdin.', y => y
     .positional('sha', {
     type: 'string',
     demandOption: true,
@@ -55,15 +56,16 @@ const suggest_assignees_1 = require("./cmd/suggest-assignees");
     alias: 'm',
     boolean: true,
     desc: 'Enable auto merge for the PR',
-})
-    .option('updateOnly', {
-    boolean: true,
-    desc: 'Only update an existing PR; fail if none exists for the generated branch',
 })
     .option('noOpen', {
     boolean: true,
     desc: 'Do not open the PR in the browser after creation',
 }), pr_create_1.prCreate)
+    .command('pr-update <sha>', 'Non-interactively push an amended commit to its existing PR branch.', y => y.positional('sha', {
+    type: 'string',
+    demandOption: true,
+    desc: 'Commit SHA (full or prefix) whose PR branch should be updated',
+}), pr_update_1.prUpdate)
     .command('suggest-assignees', 'Suggest reviewers for current diff based on blame ownership', y => y
     .option('commit', {
     type: 'string',

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@evanpurkhiser/tooling-personal",
-  "version": "1.47.0",
+  "version": "1.48.0",
   "description": "Evan Purkhiser's personal tooling",
   "license": "MIT",
   "author": "Evan Purkhiser",