Garden-o-matic: Fix rebaseline-json results handling

Tools/GardeningServer/scripts/controllers.js

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 35 matching lines @@
         } else {
             failuresToRebaseline.push(failureInfo);
             if (testNamesLogged.indexOf(failureInfo.testName) == -1) {
                 statusView.addMessage(id, 'Rebaselining ' + failureInfo.testName + '...');
                 testNamesLogged.push(failureInfo.testName);
             }
         }
     });
 
     if (failuresToRebaseline.length) {
-        checkout.rebaseline(failuresToRebaseline, function() {
-            statusView.addFinalMessage(id, 'Rebaseline done! Please land with "webkit-patch land-cowhand".');
+        // FIXME: checkout.rebaseline() accepts only 3 arguments, we pass 5.
+        checkout.rebaseline(failuresToRebaseline, function(response) {
+            try {
+                var json = JSON.parse(response);
+                if (!json.result_code) {
+                    statusView.addFinalMessage(id, 'Rebaseline done! Please commit locally and land with "git cl dcommit".');
+                } else {
+                    statusView.addMessage(id, 'Rebaseline failed (code=' + json.result_code + ')!');
+                    statusView.addFinalMessage(id, json.output);
+                }
+            } catch (e) {
+                statusView.addFinalMessage(id, 'Invalid response received: "' + response + '"');
+            }
         }, function(failureInfo) {
             statusView.addMessage(id, failureInfo.testName + ' on ' + ui.displayNameForBuilder(failureInfo.builderName));
         }, function() {
             statusView.addFinalMessage(id, kCheckoutUnavailableMessage);
         }, function(failureInfo) {
             statusView.addMessage(id, 'Skipping rebaseline for ' + failureInfo.testName + ' on ' + ui.displayNameForBuilder(failureInfo.builderName) + ' because we only rebaseline from release bots.');
         });
     } else {
         statusView.addFinalMessage(id, 'No non-reftests left to rebaseline!')
     }
@@ skipping 13 matching lines @@
 function updateExpectationsWithStatusUpdates(failureInfoList)
 {
     var statusView = new ui.StatusArea('Expectations Update');
     var id = statusView.newId();
 
     var testNames = base.uniquifyArray(failureInfoList.map(function(failureInfo) { return failureInfo.testName; }));
     var testName = testNames.length == 1 ? testNames[0] : testNames.length + ' tests';
     statusView.addMessage(id, 'Updating expectations of ' + testName + '...');
 
     checkout.updateExpectations(failureInfoList, function() {
-        statusView.addFinalMessage(id, 'Expectations update done! Please land with "webkit-patch land-cowhand".');
+        statusView.addFinalMessage(id, 'Expectations update done! Please commit them locally and land with "git cl dcommit".');
     }, function() {
         statusView.addFinalMessage(id, kCheckoutUnavailableMessage);
     });
 }
 
 controllers.ResultsDetails = base.extends(Object, {
     init: function(view, resultsByTest)
     {
         this._view = view;
         this._resultsByTest = resultsByTest;
@@ skipping 236 matching lines @@
             this._notification = new ui.notifications.BuildersFailing(this._message);
             this._view.add(this._notification);
         }
         // FIXME: We should provide regression ranges for the failing builders.
         // This doesn't seem to happen often enough to worry too much about that, however.
         this._notification.setFailingBuilders(failuresList);
     }
 });
 
 })();