Merge pull request #2559 from Pike/to-upstream

upstream two fixes

Author: Mostafa Eweda

plugins-server/cloud9.ide.filelist/filelist.js

@@ -50,7 +50,7 @@ module.exports = function() {
             if (err || !meta.process)
                 return onExit(1, err);
 
-            var stderr = "";
+            var stderr = "", gotExitCode = false, gotClose = false;
             meta.process.stdout.on("data", function(data) {
                 onData(data);
             });
@@ -60,7 +60,21 @@ module.exports = function() {
             });
 
             meta.process.on("exit", function(code) {
-                onExit(code, stderr);
+                if (gotClose) {
+                    onExit(code, stderr);
+                }
+                else {
+                    gotExitCode = code;
+                }
+            });
+
+            meta.process.stdout.on("close", function(code) {
+                if (gotExitCode !== false) {
+                    onExit(gotExitCode, stderr);
+                }
+                else {
+                    gotClose = true;
+                }
             });
         });
     };

plugins-server/cloud9.ide.hg/hg.js

@@ -114,7 +114,7 @@ util.inherits(HgPlugin, Plugin);
                     }
                 };
 
-                out.replace(/([\w]+)[\s]{3,5}([\w].+)\n/gi, function(m, sub, hint) {
+                out.replace(/([\w]+)[\s]{3,9}([\w].+)\n/gi, function(m, sub, hint) {
                     if (self.banned.indexOf(sub) > -1)
                         return;
                     hghelp.hg.commands[sub] = self.augmentCommand(sub, {"hint": hint});

plugins-server/cloud9.run.other/other.js

@@ -1,5 +1,6 @@
 "use strict";
 
+var util = require("util");
 var c9util = require("../cloud9.core/util");
 var ShellRunner = require("../cloud9.run.shell/shell").Runner;
 
@@ -30,9 +31,10 @@ exports.factory = function(vfs) {
     };
 };
 
-var Runner = exports.Runner = ShellRunner;
+var Runner = exports.Runner = function(vfs, options, callback) {
+    ShellRunner.call(this, vfs, options, callback);
+};
 
-for (var prop in ShellRunner.prototype)
-    Runner.prototype[prop] = ShellRunner.prototype[prop];
+util.inherits(Runner, ShellRunner);
 
 Runner.prototype.name = "other";