bin: custom git commands

Author: joyeecheung

bin/git-node

@@ -0,0 +1,21 @@
+#!/usr/bin/env node
+'use strict';
+
+const CMD = process.argv[2];
+const path = require('path');
+const { run } = require('../../lib/run');
+const fs = require('fs');
+
+if (!CMD) {
+  console.log('Run `git node help` to see how to use this');
+  process.exit(1);
+}
+
+const script = path.join(
+  __dirname, '..', 'components', 'git', `git-node-${CMD}`);
+if (!fs.existsSync(script)) {
+  console.error(`No such command: git node ${CMD}`);
+  process.exit(1);
+}
+
+run(script, process.argv.slice(3));

components/git/git-node-ammend

@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+
+if [[ $1 -eq 0 ]] ; then
+  echo 'no patch number specified!'
+  exit 1
+fi
+
+set -x;
+REV=$(git rev-parse HEAD)
+SHORT_REV=${REV:0:7}
+MSG=.ncu/msg-$SHORT_REV.txt
+
+if [ ! -e $MSG ] ; then
+  git node msg $1;
+fi;
+
+git show $REV -s --format=%B | git node check-msg $MSG
+if [ ! $? -eq 0 ]; then
+  echo "commit message is already ammended"
+else
+  git commit --amend -F $MSG
+fi
+

components/git/git-node-apply

@@ -0,0 +1,29 @@
+#!/usr/bin/env node
+'use strict';
+
+const PRID = parseInt(process.argv[2]);
+const Request = require('../../lib/request');
+const paths = require('../../lib/paths');
+const { run, runAsync } = require('../../lib/run');
+const fs = require('fs');
+const CLI = require('../../lib/cli');
+const cli = new CLI(process.stderr);
+
+if (!PRID) {
+  cli.error('No patch number specified!');
+  process.exit(1);
+}
+
+async function main() {
+  cli.startSpinner(`Downloading patch for ${PRID}`);
+  // TODO: support other repos/owners later?
+  const patch = await new Request().promise({
+    url: `https://github.com/nodejs/node/pull/${PRID}.patch`
+  });
+  const patchName = paths.patch(PRID);
+  fs.writeFileSync(patchName, patch, 'utf8');
+  cli.stopSpinner(`Downloaded patch to ${patchName}`);
+  return run('git', ['am', '--whitespace=fix', patchName]);
+}
+
+runAsync(main());

components/git/git-node-check-msg

@@ -0,0 +1,14 @@
+#!/usr/bin/env node
+
+const fs = require('fs');
+
+const file = process.argv[2];
+const msg = fs.readFileSync(0, 'utf8');
+const toAmmend = fs.readFileSync(file, 'utf8');
+const META_RE = /PR-URL:|Reviewed-By:/;
+
+for (const line of msg.split('\n')) {
+  if (line.match(META_RE)) {
+    throw new Error(`Found ${line}`);
+  }
+}

components/git/git-node-final

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+UPSTREAM=$(git node-rc upstream)
+BRANCH=$(git rev-parse --abbrev-ref HEAD)
+git rev-list $UPSTREAM/$BRANCH...HEAD | xargs core-validate-commit
+
+# clean up when it passes
+# rm .ncu/msg-*.txt .ncu/metadata-*.txt
+

components/git/git-node-help

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+echo "
+1) To land single a commit:
+   git node just <PRID>
+
+2) To land multiple commits: 
+   git node apply <PRID>
+   git rebase -i upstream/master  # edit every commit that's gonna stay
+   # on each stay
+   git node ammend <PRID>
+   git rebase --continue
+   # when the rebase is done
+   git node final"

components/git/git-node-just

@@ -0,0 +1,43 @@
+#!/usr/bin/env bash
+
+if [[ $1 -eq 0 ]] ; then
+  echo 'no patch number specified!'
+  exit 1
+fi
+
+set -x
+
+# grab the patch
+mkdir -p .ncu
+PATCH=.ncu/patch-$1.patch
+curl -L "https://github.com/nodejs/node/pull/$1.patch" > $PATCH
+NUM_COMMITS=`cat $PATCH | grep -c "Subject: \[PATCH\]"`
+
+if [[ ! $NUM_COMMITS -eq 1 ]] ; then
+  echo 'There are multiple commits in this patch, can not land using `git node just`'
+  exit 1
+fi
+
+# abort any previous session
+git am --abort
+
+# apply the patch
+cat $PATCH | git am --whitespace=fix
+
+# build message
+git node msg $1;
+
+REV=$(git rev-parse HEAD)
+SHORT_REV=${REV:0:7}
+MSG=.ncu/msg-$SHORT_REV.txt
+META=.ncu/metadata-$1.txt;
+
+# ammend the message
+git show $REV -s --format=%B | git node check-msg $MSG
+if [ ! $? -eq 0 ]; then
+  echo "commit message is already ammended"
+else
+  git commit --amend -F $MSG
+fi
+
+rm $MSG $PATCH $META

components/git/git-node-meta

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+if [[ $1 -eq 0 ]] ; then
+  echo 'no patch number specified!'
+  exit 1
+fi
+
+mkdir -p .ncu
+META=.ncu/metadata-$1.txt;
+get-metadata $1 -f $META

components/git/git-node-msg

@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+
+if [[ $1 -eq 0 ]] ; then
+  echo 'no patch number specified!'
+  exit 1
+fi
+
+META=.ncu/metadata-$1.txt;
+
+if [ ! -e $META ] ; then
+  git node meta $1 -f $META
+fi;
+
+set -x;
+UPSTREAM=$(git node-rc upstream)
+BRANCH=$(git rev-parse --abbrev-ref HEAD)
+REV=$(git rev-parse HEAD)
+#REVS=$(git rev-list $UPSTREAM/$BRANCH...HEAD)
+
+#for rev in $REVS; do
+SHORT_REV=${REV:0:7}
+MSG=.ncu/msg-$SHORT_REV.txt
+echo -e "$(git show $rev -s --format=%B)\n\n$(cat $META)" > $MSG;
+#done
+

components/git/git-node-rc

@@ -0,0 +1,14 @@
+#!/usr/bin/env node
+
+const fs = require('fs');
+const os = require('os');
+const path = require('path');
+
+const field = process.argv[2];
+if (!field) {
+  throw Error('no field specified!');
+}
+
+const ncurcPath = path.join(os.homedir(), '.ncurc');
+const ncurc = JSON.parse(fs.readFileSync(ncurcPath, 'utf8'));
+console.log(ncurc[field]);