[rrm] Use git helper for all git commands

Author: zpao

scripts/release-manager/cli.js

@@ -70,26 +70,6 @@ function execInRepo(command) {
   }).trim();
 }
 
-/**
- * Cherry picks a single sha to the given branch. Very crude, but establishes
- * some API. We don't know if the sha is a merge or a squashed commit so just
- * try both.
- *
- * Assume we're already on the right branch.
- */
-function gitCherryPickMerge(sha) {
-  // console.log(`cherry picking ${sha}`)
-  // git cherry-pick -x sha || git cherry-pick -x -m1 sha
-  try {
-    execInRepo(`git cherry-pick -x ${sha}`);
-  } catch (e) {
-    // Assume for now this just means it was actually a merge.
-    // TODO: gracefully handle other cases, like possibility the commit was
-    // already cherry-picked and should be skipped.
-
-    execInRepo(`git cherry-pick -x -m1 ${sha}`);
-  }
-}
 
 function getReactVersion() {
   return (JSON.parse(fs.readFileSync(path.join(PATH_TO_REPO, 'package.json'), 'utf8'))).version;
@@ -133,7 +113,6 @@ const app = {
     // HELPERS
     this.writeTo = writeTo;
     this.execInRepo = execInRepo;
-    this.gitCherryPickMerge = gitCherryPickMerge;
     this.getReactVersion = getReactVersion;
 
     // Register commands

scripts/release-manager/commands/docs-prs.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const chalk = require('chalk');
+const git = require('./utils/git');
 
 const DOCS_LABEL = 'Documentation: needs merge to stable';
 
@@ -78,7 +79,7 @@ module.exports = function(vorpal, app) {
           }, (res) => {
             if (res.merge) {
               richPulls.forEach((pr) => {
-                app.gitCherryPickMerge(pr.merge_commit_sha);
+                git.cherryPickMerge(app, pr.merge_commit_sha);
               });
 
               this.prompt({
@@ -87,7 +88,7 @@ module.exports = function(vorpal, app) {
                 message: 'Push these commits upstream?',
               }, (res) => {
                 if (res.push) {
-                  app.execInRepo('git push');
+                  git.push(app);
                   this.log(`Pushed upstream! Removing "${DOCS_LABEL}" label from pull requests.`);
                 }
 

scripts/release-manager/commands/stable-prs.js

@@ -2,6 +2,8 @@
 
 const chalk = require('chalk');
 
+const git = require('./utils/git');
+
 // currently 15-next
 // IDEA: maybe just always use this milestone across major releases too?
 const MILESTONE_NUMBER = 25;
@@ -152,7 +154,7 @@ function promptForPRs(app, prs, start) {
         let pr = prs[i];
         this.log(chalk.grey.italic(`Cherry-picking ${pr.number}`));
         try {
-          app.gitCherryPickMerge(pr.merge_commit_sha);
+          git.cherryPickMerge(app, pr.merge_commit_sha);
         } catch (e) {
 
           // TODO: add ability to mark a PR as skipped

scripts/release-manager/commands/utils/git.js

@@ -37,13 +37,57 @@ function merge(app, ref, ff, msg) {
   return app.execInRepo(`git merge ${opts.join(' ')} ${ref}`);
 }
 
+function tag(app, tag, ref) {
+  ref = ref || '';
+  return app.execInRepo(`git tag ${tag} ${ref}`);
+}
+
+function commit(app, msg, all) {
+  return app.execInRepo(`git commit -m '${msg}' ${all ? '-a' : ''}`);
+}
+
+function push(app, remote, refspec, tags) {
+  let opts = [
+    remote,
+    refspec,
+    tags ? '--tags' : '',
+  ];
+  return app.execInRepo(`git push ${opts.join(' ')}`);
+}
+
+/**
+ * Cherry picks a single sha to the given branch. Very crude, but establishes
+ * some API. We don't know if the sha is a merge or a squashed commit so just
+ * try both.
+ *
+ * Assume we're already on the right branch.
+ */
+function cherryPickMerge(app, ref) {
+  // console.log(`cherry picking ${sha}`)
+  // git cherry-pick -x sha || git cherry-pick -x -m1 sha
+  try {
+    app.execInRepo(`git cherry-pick -x ${ref}`);
+  } catch (e) {
+    // Assume for now this just means it was actually a merge.
+    // TODO: gracefully handle other cases, like possibility the commit was
+    // already cherry-picked and should be skipped.
+
+    app.execInRepo(`git cherry-pick -x -m1 ${ref}`);
+  }
+}
+
 module.exports = {
   getBranch,
   getStatus,
   isClean,
 
+  commit,
   checkout,
   fetch,
   pull,
+  push,
   merge,
+  tag,
+
+  cherryPickMerge,
 };

scripts/release-manager/commands/version.js

@@ -6,6 +6,8 @@ const semver = require('semver');
 
 const chalk = require('chalk');
 
+const git = require('./utils/git');
+
 
 // Overview
 // 1. Display current version
@@ -147,10 +149,10 @@ module.exports = function(vorpal, app) {
           },
         ]).then((res) => {
           if (res.commit) {
-            app.execInRepo(`git commit -a -m "${newVersion}"`);
+            git.commit(app, newVersion, true);
           }
           if (res.tag) {
-            app.execInRepo(`git tag v${newVersion}`);
+            git.tag(app, `v${newVersion}`);
           }
           actionCB();
         });