@evanpurkhiser/tooling-personal 1.18.0 → 1.19.0

package/dist/cmd/pr.js

@@ -84,9 +84,17 @@ async function pr() {
     const willOpenPr = prs.some(pr => pr.headRefName === branchName);
     // 03. Rebase and push the selected commits
     const doRebase = async () => {
-        await simple_git_1.default()
+        const rebase = simple_git_1.default()
             .env({ ...process.env, GIT_SEQUENCE_EDITOR: `echo "${rebaseContents}" >` })
             .rebase(['--interactive', '--autostash', 'origin/master']);
+        try {
+            await rebase;
+        }
+        catch (error) {
+            // Abort a failed rebase
+            await simple_git_1.default().rebase(['--abort']);
+            throw new Error(`Failed to rebase\n${error}`);
+        }
     };
     const doPush = async () => {
         const newCommits = await getCommits();
@@ -107,12 +115,19 @@ async function pr() {
     // Cork stdout to avoid listr output polluting vim. We'll uncork after we
     // close vim
     process.stdout.cork();
-    const rebaseAndPush = rebaseAndPushTask.run();
-    const { title, body } = await editor_1.editPullRequest(targetCommit);
     // 05. Open an editor to write the pull request
+    const { editor, editorResult } = await editor_1.editPullRequest(targetCommit);
+    const rebaseAndPush = rebaseAndPushTask.run();
+    rebaseAndPush.catch(() => editor.kill());
+    const { title, body } = await editorResult;
     // XXX: We cork stdout here to avoid listr from corrupting vims output
     process.stdout.uncork();
-    await rebaseAndPush;
+    try {
+        await rebaseAndPush;
+    }
+    catch {
+        process.exit(1);
+    }
     if (title.length === 0) {
         console.log(chalk_1.default.red `Missing PR title, aborting`);
         process.exit(1);

package/dist/editor.js

@@ -18,10 +18,13 @@ async function editPullRequest(commit) {
         shell: true,
         stdio: 'inherit',
     });
-    await new Promise(resolve => editor.on('close', resolve));
-    const prContents = await promises_1.default.readFile(pullEditFile).then(b => b.toString());
-    const [title, ...bodyParts] = prContents.split('\n');
-    const body = bodyParts.join('\n').trim();
-    return { title, body };
+    async function getResult() {
+        await new Promise(resolve => editor.on('close', resolve));
+        const prContents = await promises_1.default.readFile(pullEditFile).then(b => b.toString());
+        const [title, ...bodyParts] = prContents.split('\n');
+        const body = bodyParts.join('\n').trim();
+        return { title, body };
+    }
+    return { editor, editorResult: getResult() };
 }
 exports.editPullRequest = editPullRequest;

package/package.json

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