Fixed changelist and commit in command palette

Author: edgardmessias

icons/dark/check.svg

@@ -82,7 +82,20 @@
       {
         "command": "svn.commit",
         "title": "Commit Selected",
-        "category": "SVN"
+        "category": "SVN",
+        "icon": {
+          "light": "icons/light/check.svg",
+          "dark": "icons/dark/check.svg"
+        }
+      },
+      {
+        "command": "svn.commitWithMessage",
+        "title": "Commit Changes",
+        "category": "SVN",
+        "icon": {
+          "light": "icons/light/check.svg",
+          "dark": "icons/dark/check.svg"
+        }
       },
       {
         "command": "svn.openChangeBase",
@@ -137,12 +150,12 @@
       },
       {
         "command": "svn.update",
-        "title": "Svn update",
+        "title": "Update",
         "category": "SVN"
       },
       {
         "command": "svn.patch",
-        "title": "Svn patch",
+        "title": "Show diff patch",
         "category": "SVN"
       },
       {
@@ -178,13 +191,34 @@
         {
           "command": "svn.openChangeHead",
           "when": "config.svn.enabled && svnOpenRepositoryCount != 0"
+        },
+        {
+          "command": "svn.addChangelist",
+          "when": "config.svn.enabled && svnOpenRepositoryCount != 0"
+        },
+        {
+          "command": "svn.removeChangelist",
+          "when": "config.svn.enabled && svnOpenRepositoryCount != 0"
+        },
+        {
+          "command": "svn.commit",
+          "when": "config.svn.enabled && svnOpenRepositoryCount != 0"
+        },
+        {
+          "command": "svn.commitWithMessage",
+          "when": "false"
         }
       ],
       "scm/title": [
+        {
+          "command": "svn.commitWithMessage",
+          "group": "navigation",
+          "when": "config.svn.enabled && scmProvider == svn"
+        },
         {
           "command": "svn.refresh",
           "group": "navigation",
-          "when": "scmProvider == svn"
+          "when": "config.svn.enabled && scmProvider == svn"
         },
         {
           "command": "svn.switchBranch",

icons/light/check.svg

@@ -269,106 +269,163 @@ export class SvnCommands {
   }
 
   @command("svn.addChangelist")
-  async addChangelist(resource: Resource) {
-    const repository = this.model.getRepository(resource.resourceUri.fsPath);
+  async addChangelist(
+    ...resourceStates: SourceControlResourceState[]
+  ): Promise<void> {
+    if (
+      resourceStates.length === 0 ||
+      !(resourceStates[0].resourceUri instanceof Uri)
+    ) {
+      const resource = this.getSCMResource();
 
-    if (!repository) {
-      return;
+      if (!resource) {
+        return;
+      }
+
+      resourceStates = [resource];
     }
 
-    const picks: QuickPickItem[] = [];
+    const selection = resourceStates.filter(
+      s => s instanceof Resource
+    ) as Resource[];
 
-    repository.changelists.forEach((group, changelist) => {
-      if (group.resourceStates.length) {
-        picks.push(new ChangeListItem(group));
+    const uris = selection.map(resource => resource.resourceUri);
+
+    await this.runByRepository(uris, async (repository, resources) => {
+      if (!repository) {
+        return;
       }
-    });
-    picks.push(new NewChangeListItem());
 
-    const selectedChoice: any = await window.showQuickPick(picks, {});
-    if (!selectedChoice) {
-      return;
-    }
+      const picks: QuickPickItem[] = [];
 
-    let changelistName = "";
+      repository.changelists.forEach((group, changelist) => {
+        if (group.resourceStates.length) {
+          picks.push(new ChangeListItem(group));
+        }
+      });
+      picks.push(new NewChangeListItem());
 
-    if (selectedChoice instanceof NewChangeListItem) {
-      const newChangelistName = await window.showInputBox();
-      if (!newChangelistName) {
+      const selectedChoice: any = await window.showQuickPick(picks, {});
+      if (!selectedChoice) {
         return;
       }
-      changelistName = newChangelistName;
-    } else if (selectedChoice instanceof ChangeListItem) {
-      changelistName = selectedChoice.resourceGroup.id.replace(
-        /^changelist-/,
-        ""
-      );
-    } else {
-      return;
-    }
 
-    try {
-      await repository.addChangelist(
-        resource.resourceUri.fsPath,
-        changelistName
-      );
-    } catch (error) {
-      console.log(error);
-      window.showErrorMessage(
-        `Unable to add file "${
-          resource.resourceUri.fsPath
-        }" to changelist "${changelistName}"`
-      );
-    }
+      let changelistName = "";
+
+      if (selectedChoice instanceof NewChangeListItem) {
+        const newChangelistName = await window.showInputBox();
+        if (!newChangelistName) {
+          return;
+        }
+        changelistName = newChangelistName;
+      } else if (selectedChoice instanceof ChangeListItem) {
+        changelistName = selectedChoice.resourceGroup.id.replace(
+          /^changelist-/,
+          ""
+        );
+      } else {
+        return;
+      }
+
+      const paths = resources.map(resource => resource.fsPath);
+
+      try {
+        await repository.addChangelist(paths, changelistName);
+      } catch (error) {
+        console.log(error);
+        window.showErrorMessage(
+          `Unable to add file 
+          "${paths.join(",")}" to changelist "${changelistName}"`
+        );
+      }
+    });
   }
 
   @command("svn.removeChangelist")
-  async removeChangelist(resource: Resource) {
-    const repository = this.model.getRepository(resource.resourceUri.fsPath);
+  async removeChangelist(
+    ...resourceStates: SourceControlResourceState[]
+  ): Promise<void> {
+    if (
+      resourceStates.length === 0 ||
+      !(resourceStates[0].resourceUri instanceof Uri)
+    ) {
+      const resource = this.getSCMResource();
 
-    if (!repository) {
-      return;
-    }
+      if (!resource) {
+        return;
+      }
 
-    try {
-      await repository.removeChangelist(resource.resourceUri.fsPath);
-    } catch (error) {
-      console.log(error);
-      window.showErrorMessage(
-        `Unable to remove file "${resource.resourceUri.fsPath}" from changelist`
-      );
+      resourceStates = [resource];
     }
-  }
 
-  @command("svn.commit", { repository: true })
-  async commit(
-    repository: Repository,
-    ...resourceStates: Resource[]
-  ): Promise<void> {
-    try {
-      const paths = resourceStates.map(state => {
-        return state.resourceUri.fsPath;
-      });
+    const selection = resourceStates.filter(
+      s => s instanceof Resource
+    ) as Resource[];
 
-      // If files is renamed, the commit need previous file
-      resourceStates.forEach(state => {
-        if (state.type === Status.ADDED && state.renameResourceUri) {
-          paths.push(state.renameResourceUri.fsPath);
-        }
-      });
+    const uris = selection.map(resource => resource.resourceUri);
 
-      const message = await inputCommitMessage();
+    await this.runByRepository(uris, async (repository, resources) => {
+      if (!repository) {
+        return;
+      }
+
+      const paths = resources.map(resource => resource.fsPath);
 
-      if (message === undefined) {
+      try {
+        await repository.removeChangelist(paths);
+      } catch (error) {
+        console.log(error);
+        window.showErrorMessage(
+          `Unable to remove file "${paths.join(",")}" from changelist`
+        );
+      }
+    });
+  }
+
+  @command("svn.commit")
+  async commit(...resources: SourceControlResourceState[]): Promise<void> {
+    if (resources.length === 0 || !(resources[0].resourceUri instanceof Uri)) {
+      const resource = this.getSCMResource();
+
+      if (!resource) {
         return;
       }
 
-      const result = await repository.commitFiles(message, paths);
-      window.showInformationMessage(result);
-    } catch (error) {
-      console.error(error);
-      window.showErrorMessage("Unable to commit");
+      resources = [resource];
     }
+
+    const selection = resources.filter(
+      s => s instanceof Resource
+    ) as Resource[];
+
+    const uris = selection.map(resource => resource.resourceUri);
+    selection.forEach(resource => {
+      if (resource.type === Status.ADDED && resource.renameResourceUri) {
+        uris.push(resource.renameResourceUri);
+      }
+    });
+
+    await this.runByRepository(uris, async (repository, resources) => {
+      if (!repository) {
+        return;
+      }
+
+      const paths = resources.map(resource => resource.fsPath);
+
+      try {
+        const message = await inputCommitMessage();
+
+        if (message === undefined) {
+          return;
+        }
+
+        const result = await repository.commitFiles(message, paths);
+        window.showInformationMessage(result);
+      } catch (error) {
+        console.error(error);
+        window.showErrorMessage("Unable to commit");
+      }
+    });
   }
 
   @command("svn.refresh", { repository: true })

package.json

@@ -512,13 +512,13 @@ export class Repository {
     );
   }
 
-  async addChangelist(filePath: string, changelist: string) {
+  async addChangelist(filePaths: string | string[], changelist: string) {
     return await this.run(Operation.AddChangelist, () =>
-      this.repository.addChangelist(filePath, changelist)
+      this.repository.addChangelist(filePaths, changelist)
     );
   }
 
-  async removeChangelist(changelist: string) {
+  async removeChangelist(changelist: string | string[]) {
     return await this.run(Operation.RemoveChangelist, () =>
       this.repository.removeChangelist(changelist)
     );

src/commands.ts

@@ -257,14 +257,23 @@ export class Svn {
     return this.exec("", ["add", path]);
   }
 
-  addChangelist(path: string, changelist: string) {
-    path = path.replace(/\\/g, "/");
-    return this.exec("", ["changelist", changelist, path]);
+  addChangelist(filePaths: string | string[], changelist: string) {
+    if (!Array.isArray(filePaths)) {
+      filePaths = [filePaths];
+    }
+
+    filePaths = filePaths.map(path => path.replace(/\\/g, "/"));
+
+    return this.exec("", ["changelist", changelist, ...filePaths]);
   }
 
-  removeChangelist(path: string) {
-    path = path.replace(/\\/g, "/");
-    return this.exec("", ["changelist", path, "--remove"]);
+  removeChangelist(filePaths: string | string[]) {
+    if (!Array.isArray(filePaths)) {
+      filePaths = [filePaths];
+    }
+
+    filePaths = filePaths.map(path => path.replace(/\\/g, "/"));
+    return this.exec("", ["changelist", ...filePaths, "--remove"]);
   }
 
   show(path: string, revision?: string, options: CpOptions = {}) {

src/repository.ts

@@ -71,12 +71,12 @@ export class Repository {
     return this.svn.add(filePath);
   }
 
-  addChangelist(filePath: string, changelist: string) {
-    return this.svn.addChangelist(filePath, changelist);
+  addChangelist(filePaths: string | string[], changelist: string) {
+    return this.svn.addChangelist(filePaths, changelist);
   }
 
-  removeChangelist(filePath: string) {
-    return this.svn.removeChangelist(filePath);
+  removeChangelist(filePaths: string | string[]) {
+    return this.svn.removeChangelist(filePaths);
   }
 
   async getCurrentBranch(): Promise<string> {