getting commands to work with new multi-root

Author: JohnstonCode

src/commands.js

@@ -2,27 +2,77 @@ const { commands, scm, window } = require("vscode");
 const { inputCommitMessage, changesCommitted } = require("./messages");
 const svn = require("./svn");
 
-function SvnCommands() {
-  commands.registerCommand("svn.fileOpen", this.fileOpen);
-  commands.registerCommand("svn.commitWithMessage", this.commitWithMessage);
-  commands.registerCommand("svn.add", this.addFile);
+function SvnCommands(model) {
+  this.model = model;
+  this.commands = [
+    {
+      commandId: "svn.commitWithMessage",
+      method: this.commitWithMessage,
+      options: { repository: true }
+    }
+  ];
+
+  this.commands.map(({ commandId, method, options }) => {
+    const command = this.createCommand(method, options);
+    commands.registerCommand(commandId, command);
+  });
+  // commands.registerCommand("svn.fileOpen", this.fileOpen);
+  // commands.registerCommand("svn.commitWithMessage", this.commitWithMessage);
+  // commands.registerCommand("svn.add", this.addFile);
 }
 
+SvnCommands.prototype.createCommand = function(method, options) {
+  const result = (...args) => {
+    let result;
+
+    if (!options.repository) {
+      result = Promise.resolve(method.apply(this, args));
+    } else {
+      const repository = this.model.getRepository(args[0]);
+      let repositoryPromise;
+
+      if (repository) {
+        repositoryPromise = Promise.resolve(repository);
+      } else if (this.model.openRepositories.length === 1) {
+        repositoryPromise = Promise.resolve(this.model.openRepositories[0]);
+      } else {
+        repositoryPromise = this.model.pickRepository();
+      }
+
+      result = repositoryPromise.then(repository => {
+        if (!repository) {
+          return Promise.resolve();
+        }
+
+        return Promise.resolve(method.apply(this, [repository, ...args]));
+      });
+    }
+
+    return result.catch(async err => {
+      console.error(err);
+    });
+  };
+
+  return result;
+};
+
 SvnCommands.prototype.fileOpen = resourceUri => {
   commands.executeCommand("vscode.open", resourceUri);
 };
 
-SvnCommands.prototype.commitWithMessage = async function() {
-  this.svn = new svn();
-  let message = await inputCommitMessage(scm.inputBox.value);
+SvnCommands.prototype.commitWithMessage = async function(repository) {
+  // console.log("fsdsfsf");
+  // this.svn = new svn();
+  // let message = await inputCommitMessage(scm.inputBox.value);
 
-  try {
-    await this.svn.commit(message);
-    scm.inputBox.value = "";
-    changesCommitted();
-  } catch (error) {
-    console.log(error);
-  }
+  console.log(repository.inputBox.value);
+  // try {
+  //   await this.svn.commit(message);
+  //   scm.inputBox.value = "";
+  //   changesCommitted();
+  // } catch (error) {
+  //   console.log(error);
+  // }
 };
 
 SvnCommands.prototype.addFile = async uri => {

src/extension.js

@@ -9,10 +9,10 @@ function activate(context) {
   console.log("svn-scm is now active!");
 
   const disposable = [];
-  const commands = new SvnCommands();
   const svn = new Svn();
   const model = new Model(svn);
   const contentProvider = new svnContentProvider();
+  const commands = new SvnCommands(model);
 
   context.subscriptions.push(disposable);
 }

src/model.js

@@ -1,4 +1,4 @@
-const { workspace, Uri } = require("vscode");
+const { workspace, Uri, window } = require("vscode");
 const fs = require("fs");
 const path = require("path");
 const Repository = require("./repository");
@@ -25,7 +25,7 @@ Model.prototype.tryOpenRepository = async function(path) {
     const repositoryRoot = await this.svn.getRepositoryRoot(path);
     const repository = new Repository(this.svn.open(repositoryRoot));
 
-    // this.open(repository);
+    this.open(repository);
   } catch (err) {
     return;
   }
@@ -61,4 +61,21 @@ Model.prototype.open = function(repository) {
   this.openRepositories.push(repository);
 };
 
+Model.prototype.pickRepository = async function() {
+  if (this.openRepositories.length === 0) {
+    throw new Error("There are no available repositories");
+  }
+
+  const picks = this.openRepositories.map(repo => {
+    return {
+      label: path.basename(repo.repository.root),
+      repository: repo
+    };
+  });
+  const placeholder = "Choose a repository";
+  const pick = await window.showQuickPick(picks, { placeholder });
+
+  return pick && pick.repository;
+};
+
 module.exports = Model;

src/repository.js

@@ -11,9 +11,11 @@ function Repository(repository) {
   );
   this.sourceControl.acceptInputCommand = {
     command: "svn.commitWithMessage",
-    title: "commit"
+    title: "commit",
+    arguments: this.sourceControl
   };
   this.sourceControl.quickDiffProvider = this;
+  this.inputBox = this.sourceControl.inputBox;
 
   this.changes = this.sourceControl.createResourceGroup("changes", "Changes");
   this.notTracked = this.sourceControl.createResourceGroup(

src/svn.js

@@ -54,15 +54,16 @@ svn.prototype.add = function(filePath) {
 module.exports = svn;
 
 function Repository(svn, repositoryRoot) {
-  this.svn = new SvnSpawn({
-    cwd: repositoryRoot,
+  this.svn = svn;
+  this.root = repositoryRoot;
+
+  this.svn.client.option({
+    cwd: this.root,
     noAuthCache: true
   });
-  this.root = repositoryRoot;
+
 }
 
 Repository.prototype.getStatus = function() {
-  return new Promise((resolve, reject) => {
-    this.svn.getStatus((err, data) => (err ? reject(err) : resolve(data)));
-  });
+  return this.svn.getStatus();
 }