Bug 1311783 - Pretty print firefox -h. r=bsmedberg
authorManuel Griessmayr <abspack@posteo.de>
Fri, 28 Oct 2016 07:40:00 -0400
changeset 320203 bed4b65bc2361fde5a43f12131e88b1883a00be5
parent 320202 a4079746a3f7da725f3174604ef0a127e2cd051b
child 320204 fdea89bad933375fd650bc2cd8fee6dc860de9bb
push id20751
push userphilringnalda@gmail.com
push dateSun, 30 Oct 2016 18:06:35 +0000
treeherderfx-team@e3279760cd97 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbsmedberg
bugs1311783
milestone52.0a1
Bug 1311783 - Pretty print firefox -h. r=bsmedberg
devtools/client/devtools-startup.js
toolkit/xre/nsAppRunner.cpp
--- a/devtools/client/devtools-startup.js
+++ b/devtools/client/devtools-startup.js
@@ -193,22 +193,23 @@ DevToolsStartup.prototype = {
       dump("Unable to start debugger server on " + portOrPath + ": " + e);
     }
 
     if (cmdLine.state == Ci.nsICommandLine.STATE_REMOTE_AUTO) {
       cmdLine.preventDefault = true;
     }
   },
 
+  /* eslint-disable max-len */
   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 a TCP port or " +
-            "Unix domain socket path.  Defaults to TCP port 6000. " +
-            "Use WebSocket protocol if ws: prefix is specified.\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",
+  /* eslint-disable max-len */
 
   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,17 +1599,18 @@ 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 --new-instance.\n"
+         "  --no-remote        Do not accept or send remote commands; implies\n"
+         "                     --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