@evanpurkhiser/tooling-personal 1.28.0 → 1.29.0

package/dist/cmd/pr.js

@@ -19,26 +19,34 @@ function getCommits(to) {
 async function pr() {
     const username = await utils_1.getEmailUsername();
     const repo = await utils_1.getRepoKey();
+    const { head, origin } = await 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 rendererOptions = { showTimer: true };
     const collectInfoTask = new listr2_1.Listr([], {
         concurrent: true,
         rendererOptions,
     });
     collectInfoTask.add({
-        title: 'Fetching repsotiry ID',
+        title: 'Fetching repository info',
         task: async (ctx, task) => {
-            const repoId = await pulls_1.getGithubRepoId(repo);
-            if (repoId === null) {
+            const details = await pulls_1.getRepoInfo(repo);
+            if (details === null) {
                 throw new Error('Failed to get repository ID');
             }
-            task.title = 'Found repository ID';
-            ctx.repoId = repoId;
+            task.title = 'Found repository';
+            ctx.repoId = details.repoId;
+            ctx.defaultBranch = details.defaultBranch;
         },
     });
     collectInfoTask.add({
         title: 'Getting unpublished commits',
         task: async (ctx, task) => {
-            const commits = await getCommits('origin/master');
+            const commits = await getCommits(origin);
             if (commits.total === 0) {
                 throw new Error('No commits to push');
             }
@@ -53,7 +61,7 @@ async function pr() {
             task.title = `Found ${ctx.prs.length} existing PRs`;
         },
     });
-    const { repoId, commits, prs } = await collectInfoTask.run();
+    const { repoId, defaultBranch, commits, prs } = await collectInfoTask.run();
     const selectCommits = () => fzf_1.fzfSelect({
         prompt: 'Select commit(s) for PR:',
         genValues: addOption => commits.all.forEach(commit => {
@@ -89,7 +97,7 @@ async function pr() {
     const doRebase = async () => {
         const rebase = simple_git_1.default()
             .env({ ...process.env, GIT_SEQUENCE_EDITOR: `echo "${rebaseContents}" >` })
-            .rebase(['--interactive', '--autostash', 'origin/master']);
+            .rebase(['--interactive', '--autostash', origin]);
         try {
             await rebase;
         }
@@ -100,7 +108,7 @@ async function pr() {
         }
     };
     const doPush = async () => {
-        const newCommits = await getCommits('origin/master');
+        const newCommits = await getCommits(origin);
         const commitIdx = newCommits.all.length - selectedCommits.length;
         const rebaseTargetCommit = newCommits.all[commitIdx];
         const refSpec = `${rebaseTargetCommit.hash}:refs/heads/${branchName}`;
@@ -137,7 +145,7 @@ async function pr() {
     }
     // 06. Create a Pull Request
     const pr = pulls_1.createPull({
-        baseRefName: 'master',
+        baseRefName: defaultBranch,
         headRefName: branchName,
         repositoryId: repoId,
         title,

package/dist/cmd/select-commit.js

@@ -7,8 +7,10 @@ exports.selectCommit = void 0;
 const chalk_1 = __importDefault(require("chalk"));
 const simple_git_1 = __importDefault(require("simple-git"));
 const fzf_1 = require("../fzf");
+const utils_1 = require("../utils");
 async function selectCommit() {
-    const commits = await simple_git_1.default().log({ from: 'HEAD', to: 'origin/master' });
+    const { origin } = await utils_1.getBranchNames();
+    const commits = await simple_git_1.default().log({ from: 'HEAD', to: origin });
     const selected = await fzf_1.fzfSelect({
         prompt: 'Select commit(s):',
         genValues: addOption => commits.all.forEach(commit => {

package/dist/pulls.js

@@ -1,25 +1,32 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.requestReview = exports.createPull = exports.getPulls = exports.getGithubRepoId = void 0;
+exports.requestReview = exports.createPull = exports.getPulls = exports.getRepoInfo = void 0;
 const graphql_request_1 = require("graphql-request");
 const graphql_1 = require("./graphql");
-async function getGithubRepoId(repo) {
+async function getRepoInfo(repo) {
     const repoGql = graphql_request_1.gql `
     query repo($owner: String!, $repo: String!) {
       repository(owner: $owner, name: $repo) {
         id
+        defaultBranchRef {
+          name
+        }
       }
     }
   `;
+    let resp = null;
     try {
-        const resp = await graphql_1.request(repoGql, { ...repo });
-        return resp.repository.id;
+        resp = await graphql_1.request(repoGql, { ...repo });
     }
     catch {
         return null;
     }
+    return {
+        repoId: resp.repository.id,
+        defaultBranch: resp.repository.defaultBranchRef.name,
+    };
 }
-exports.getGithubRepoId = getGithubRepoId;
+exports.getRepoInfo = getRepoInfo;
 /**
  * Get your open pull requests for this repo
  */

package/dist/utils.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.branchFromMessage = exports.getAccessToken = exports.getRepoPath = exports.getEmailUsername = exports.getRepoKey = void 0;
+exports.branchFromMessage = exports.getAccessToken = exports.getBranchNames = exports.getRepoPath = exports.getEmailUsername = 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"));
@@ -13,7 +13,7 @@ const path_1 = __importDefault(require("path"));
  * Get's the current repo information
  */
 async function getRepoKey() {
-    const url = await simple_git_1.default().raw('config', '--get', 'remote.origin.url');
+    const url = await simple_git_1.default().listRemote(['--get-url', 'origin']);
     const repo = git_url_parse_1.default(url);
     const repoKey = {
         owner: repo.owner,
@@ -39,6 +39,27 @@ async function getRepoPath() {
     return path.trim();
 }
 exports.getRepoPath = getRepoPath;
+/**
+ * Get's the "default" head and origin branch names
+ */
+async function getBranchNames() {
+    let head = null;
+    let origin = null;
+    try {
+        head = await simple_git_1.default().revparse(['--abbrev-ref', 'HEAD']);
+    }
+    catch {
+        // null
+    }
+    try {
+        origin = await simple_git_1.default().revparse(['--abbrev-ref', '@{upstream}']);
+    }
+    catch {
+        // null
+    }
+    return { head, origin };
+}
+exports.getBranchNames = getBranchNames;
 /**
  * Get's the GitHub Oauth token from the hub config
  */

package/package.json

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