Convenience git extension for converting a chromium git commit number to a git hash.

Convenience git extension for converting a chromium git commit number to a git hash.

Context:

https://groups.google.com/a/chromium.org/d/msg/chromium-dev/IcZ3C_ooKUM/ux559wpM_9cJ

R=stip@chromium.org, iannucci@chromium.org
BUG=

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=293765

[ghost stip (do not use), 2015-01-23 00:03:27]

lgtm w/ change

https://chromiumcodereview.appspot.com/868943002/diff/1/git-crrev-parse
File git-crrev-parse (right):

https://chromiumcodereview.appspot.com/868943002/diff/1/git-crrev-parse#newco...
git-crrev-parse:46: git rev-list -n 1 --grep="$commit_pos" "$ref"
reconstruct commit_pos when grepping to reduce false positives

[szager1, 2015-01-23 00:53:45]

https://chromiumcodereview.appspot.com/868943002/diff/1/git-crrev-parse
File git-crrev-parse (right):

https://chromiumcodereview.appspot.com/868943002/diff/1/git-crrev-parse#newco...
git-crrev-parse:46: git rev-list -n 1 --grep="$commit_pos" "$ref"
On 2015/01/23 00:03:27, stip wrote:
> reconstruct commit_pos when grepping to reduce false positives

Done.

[szager1, 2015-01-23 00:54:07]

The CQ bit was checked by szager@chromium.org

[commit-bot: I haz the power, 2015-01-23 00:55:14]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/868943002/20001

[commit-bot: I haz the power, 2015-01-23 00:55:17]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-01-23 00:55:18]

Failed to apply patch for depot_tools/git-crrev-parse:
While running svn add depot_tools/git-crrev-parse --force --config-dir
/b/infra_internal/commit_queue/subversion_config --non-interactive;
  patching file git-crrev-parse
  svn: warning: W155010:
'/b/infra_internal/commit_queue/workdir/tools/depot_tools/git-crrev-parse' not
found
  svn: E200009: Could not add all targets because some targets don't exist
  svn: E200009: Illegal target for the requested operation

Patch:   N   depot_tools/git-crrev-parse
Index: git-crrev-parse
diff --git depot_tools/git-crrev-parse depot_tools/git-crrev-parse
new file mode 100755
index
0000000000000000000000000000000000000000..77318fe6e05f6e8de2c1cfd679a4a5b1c2dce62b
--- /dev/null
+++ b/depot_tools/git-crrev-parse
@@ -0,0 +1,53 @@
+#!/usr/bin/env bash
+# Copyright 2015 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+
+# This git extension converts a chromium commit number to its git commit hash.
+# It accepts the following input formats:
+# 
+#   $ git crrev-parse Cr-Commit-Position: refs/heads/master@{#311769}
+#   $ git crrev-parse '    Cr-Commit-Position: refs/heads/master@{#311769}'
+#   $ git crrev-parse 'Cr-Commit-Position: refs/heads/master@{#311769}'
+#   $ git crrev-parse refs/heads/master@{#311769}
+#   
+# It also works for branches (assuming you have branches in your local
+# checkout):
+#   
+#   $ git crrev-parse refs/branch-heads/2278@{#2}
+#   
+# If you don't specify a branch, refs/heads/master is assumed:
+#   
+#   $ git crrev-parse @{#311769}
+#   $ git crrev-parse 311769
+
+# Developer note: this script makes heavy use of prefix/suffix/pattern
+# substitution for bash variables.  Refer to the "Parameter Expansion"
+# section of the man page for bash.
+
+while [ -n "$1" ]; do
+  if [[ "$1" = "Cr-Commit-Position:" ]] && [[ "$2" =~ .*@\{#[0-9][0-9]*\} ]];
then
+    commit_pos="$2"
+    shift
+  else
+    commit_pos="${1#*Cr-Commit-Position: }"
+  fi
+  ref="${commit_pos%@\{#*\}}"
+  if [ "$ref" = "$commit_pos" -o -z "$ref" ]; then
+    ref="refs/heads/master"
+  fi
+  remote_ref="${ref/refs\/heads/refs\/remotes\/origin}"
+  remote_ref="${remote_ref/refs\/branch-heads/refs\/remotes\/branch-heads}"
+  num="${commit_pos#*@\{\#}"
+  num="${num%\}}"
+  
+  if [ -z "$ref" -o -z "$num" ]; then
+    git rev-parse "$1"
+  else
+    grep_str="Cr-Commit-Position: $ref@{#$num}"
+    git rev-list -n 1 --grep="$grep_str" "$remote_ref"
+  fi
+
+  shift
+done

[szager1, 2015-01-23 00:56:06]

Committed patchset #2 (id:20001) manually as 293765.

[tfarina, 2015-12-03 00:36:51]

https://codereview.chromium.org/868943002/diff/20001/git-crrev-parse
File git-crrev-parse (right):

https://codereview.chromium.org/868943002/diff/20001/git-crrev-parse#newcode40
git-crrev-parse:40: remote_ref="${ref/refs\/heads/refs\/remotes\/origin}"
For some reason this does not work on my setup.

The error is:

fatal: ambiguous argument 'refs\/remotes\/origin/master': unknown revision or
path not in the working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'

It is reproducible with just:

$ git crrev-parse -h

I was doing a gn roll (./tools/gn/bin/roll_gn.py) and as the script is making
use of crrev-parse, it was failing and blocking me.

I hacked the depot_tools and changed this line to remote_ref="origin/master" to
get it working.

Do you have any idea why is it failing for me?