Merge branch 'stable-2.14'

* stable-2.14:
  Fix bazel 0.5.* support
  Soy: Extend shortSubject to 72 chars
  VersionedMetaData#load: Use provided RevWalk instead of creating a new one

Change-Id: I1767b5e6731fa5902b8d2cccfdca25c0b0940304

Documentation/config-mail.txt

@@ -201,7 +201,7 @@ The subject corresponding to the first patch set of the current change.
 
 $change.shortSubject::
 +
-The subject limited to 63 characters, with an ellipsis if it exceeds that.
+The subject limited to 72 characters, with an ellipsis if it exceeds that.
 
 $change.ownerEmail::
 +

gerrit-server/src/main/java/com/google/gerrit/server/mail/send/ChangeEmail.java

@@ -474,10 +474,10 @@ public abstract class ChangeEmail extends NotificationEmail {
     changeData.put("subject", subject);
     // shortSubject is the subject limited to 63 characters, with an ellipsis if
     // it exceeds that.
-    if (subject.length() < 64) {
+    if (subject.length() < 73) {
       changeData.put("shortSubject", subject);
     } else {
-      changeData.put("shortSubject", subject.substring(0, 60) + "...");
+      changeData.put("shortSubject", subject.substring(0, 69) + "...");
     }
 
     Map<String, Object> patchSetData = new HashMap<>();

tools/js/bower2bazel.py

@@ -76,7 +76,10 @@ def build_bower_json(version_targets, seeds):
 
   seeds = set(seeds)
   for v in version_targets:
-    fn = os.path.join("bazel-out/.*?-fastbuild/bin", v.lstrip("/").replace(":", "/"))
+    try:
+      fn = os.path.join("bazel-out/local-fastbuild/bin", v.lstrip("/").replace(":", "/"))
+    except:
+      fn = os.path.join("bazel-out/darwin_x86_64-fastbuild/bin", v.lstrip("/").replace(":", "/"))
     with open(fn) as f:
       j = json.load(f)
       if "" in j: