Backed out changeset 028b297ddba4 (Bug 1311783) for eslint failures. rs=bustage-fix
authoraleth <aleth@instantbird.org>
Wed, 26 Oct 2016 19:41:20 +0200
changeset 346328 f53cc8d0a93c31769f44437ae39e0c8e75cba4ff
parent 346327 cbce412d2211a6cd673621d68411b90c5174d286
child 346329 69547514d7bdbd60dca72a10a677b02bad9d820b
push id10298
push userraliiev@mozilla.com
push dateMon, 14 Nov 2016 12:33:03 +0000
treeherdermozilla-aurora@7e29173b1641 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage-fix
bugs1311783
milestone52.0a1
backs out028b297ddba48b78c370b90108ccb7f9f0468385
Backed out changeset 028b297ddba4 (Bug 1311783) for eslint failures. rs=bustage-fix
devtools/client/devtools-startup.js
toolkit/xre/nsAppRunner.cpp
--- a/devtools/client/devtools-startup.js
+++ b/devtools/client/devtools-startup.js
@@ -196,18 +196,19 @@ DevToolsStartup.prototype = {
     if (cmdLine.state == Ci.nsICommandLine.STATE_REMOTE_AUTO) {
       cmdLine.preventDefault = true;
     }
   },
 
   helpInfo: "  --jsconsole        Open the Browser Console.\n" +
             "  --jsdebugger       Open the Browser Toolbox.\n" +
             "  --devtools         Open DevTools on initial load.\n" +
-            "  --start-debugger-server [ws:][ <port> | <path> ] Start the debugger server on\n" +
-            "                     a TCP port or Unix domain socket path. Defaults to TCP port\n" +
-            "                     6000. Use WebSocket protocol if ws: prefix is specified.\n",
+            "  --start-debugger-server [ws:][ <port> | <path> ] " +
+            "Start the debugger server on a TCP port or " +
+            "Unix domain socket path.  Defaults to TCP port 6000. " +
+            "Use WebSocket protocol if ws: prefix is specified.\n",
 
   classID: Components.ID("{9e9a9283-0ce9-4e4a-8f1c-ba129a032c32}"),
   QueryInterface: XPCOMUtils.generateQI([Ci.nsICommandLineHandler]),
 };
 
 this.NSGetFactory = XPCOMUtils.generateNSGetFactory(
   [DevToolsStartup]);
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -1599,18 +1599,17 @@ DumpHelp()
 #endif
 
   printf("  -h or --help       Print this message.\n"
          "  -v or --version    Print %s version.\n"
          "  -P <profile>       Start with <profile>.\n"
          "  --profile <path>   Start with profile at <path>.\n"
          "  --migration        Start with migration wizard.\n"
          "  --ProfileManager   Start with ProfileManager.\n"
-         "  --no-remote        Do not accept or send remote commands; implies\n"
-         "                     --new-instance.\n"
+         "  --no-remote        Do not accept or send remote commands; implies --new-instance.\n"
          "  --new-instance     Open new instance, not a new window in running instance.\n"
          "  --UILocale <locale> Start with <locale> resources as UI Locale.\n"
          "  --safe-mode        Disables extensions and themes for this session.\n", gAppData->name);
 
 #if defined(XP_WIN)
   printf("  --console          Start %s with a debugging console.\n", gAppData->name);
 #endif