Merge pull request #41 from edgardmessias/add_output_channel

Added specific output channel (Close #37)

Author: JohnstonCode

src/extension.ts

@@ -1,22 +1,33 @@
-import { ExtensionContext, Disposable } from "vscode";
+import { ExtensionContext, Disposable, window } from "vscode";
 import { Svn } from "./svn";
 import { SvnContentProvider } from "./svnContentProvider";
 import { SvnCommands } from "./commands";
 import { Model } from "./model";
+import { toDisposable } from "./util";
 
 function activate(context: ExtensionContext) {
   const disposables: Disposable[] = [];
+
+
+  const outputChannel = window.createOutputChannel('SVN');
+  disposables.push(outputChannel);
+  
   const svn = new Svn();
   const model = new Model(svn);
   const contentProvider = new SvnContentProvider(model);
   const commands = new SvnCommands(model);
   disposables.push(model);
 
-  console.log("svn-scm is now active!");
+  outputChannel.appendLine("svn-scm is now active!");
 
   context.subscriptions.push(
     new Disposable(() => Disposable.from(...disposables).dispose())
   );
+
+  const onOutput = (str: string) => outputChannel.append(str);
+  svn.onOutput.addListener('log', onOutput);
+  disposables.push(toDisposable(() => svn.onOutput.removeListener('log', onOutput)));
+  
 }
 exports.activate = activate;
 

src/svn.ts

@@ -2,18 +2,32 @@ import { window } from "vscode";
 import * as cp from "child_process";
 import * as iconv from "iconv-lite";
 import * as jschardet from "jschardet";
+import { EventEmitter } from 'events';
 
 interface CpOptions {
   cwd?: string;
   encoding?: string;
+  log?: boolean;
 }
 
 export class Svn {
+  private _onOutput = new EventEmitter();
+  get onOutput(): EventEmitter { return this._onOutput; }
+
+  private log(output: string): void {
+    this._onOutput.emit('log', output);
+  }
+  
   async exec(cwd: string, args: any[], options: CpOptions = {}) {
     if (cwd) {
       options.cwd = cwd;
     }
 
+
+    if (options.log !== false) {
+      this.log(`svn ${args.join(' ')}\n`);
+    }
+
     let process = cp.spawn("svn", args, options);
 
     let [exitCode, stdout, stderr] = await Promise.all<any>([
@@ -42,6 +56,10 @@ export class Svn {
 
     stdout = iconv.decode(stdout, encoding);
 
+    if (options.log !== false && stderr.length > 0) {
+      this.log(`${stderr}\n`);
+    }
+
     return { exitCode, stdout, stderr };
   }