Added support to add and remove changelists (#95);

Author: edgardmessias

icons/dark/remove.svg

@@ -60,6 +60,24 @@
           "dark": "icons/dark/add.svg"
         }
       },
+      {
+        "command": "svn.addChangelist",
+        "title": "Add to a changelist",
+        "category": "SVN",
+        "icon": {
+          "light": "icons/light/add.svg",
+          "dark": "icons/dark/add.svg"
+        }
+      },
+      {
+        "command": "svn.removeChangelist",
+        "title": "Remove from changelist",
+        "category": "SVN",
+        "icon": {
+          "light": "icons/light/remove.svg",
+          "dark": "icons/dark/remove.svg"
+        }
+      },
       {
         "command": "svn.commit",
         "title": "Commit Selected",
@@ -130,7 +148,20 @@
       "scm/resourceState/context": [
         {
           "command": "svn.add",
-          "when": "scmProvider == svn && scmResourceGroup == unversioned",
+          "when":
+            "config.svn.enabled && scmProvider == svn && scmResourceGroup == unversioned",
+          "group": "inline"
+        },
+        {
+          "command": "svn.addChangelist",
+          "when":
+            "config.svn.enabled && scmProvider == svn && scmResourceGroup != external",
+          "group": "inline"
+        },
+        {
+          "command": "svn.removeChangelist",
+          "when":
+            "config.svn.enabled && scmProvider == svn && scmResourceGroup != changes && scmResourceGroup != unversioned && scmResourceGroup != external",
           "group": "inline"
         },
         {

icons/light/remove.svg

@@ -98,6 +98,18 @@ class ChangeListItem implements QuickPickItem {
   }
 }
 
+class NewChangeListItem implements QuickPickItem {
+  constructor() {}
+
+  get label(): string {
+    return "$(plus) New changelist";
+  }
+
+  get description(): string {
+    return "Create a new change list";
+  }
+}
+
 export class SvnCommands {
   private commands: any[] = [];
 
@@ -218,6 +230,78 @@ export class SvnCommands {
     }
   }
 
+  @command("svn.addChangelist")
+  async addChangelist(resource: Resource) {
+    const repository = this.model.getRepository(resource.resourceUri.fsPath);
+
+    if (!repository) {
+      return;
+    }
+
+    const picks: QuickPickItem[] = [];
+
+    repository.changelists.forEach((group, changelist) => {
+      if (group.resourceStates.length) {
+        picks.push(new ChangeListItem(group));
+      }
+    });
+    picks.push(new NewChangeListItem());
+
+    const selectedChoice: any = await window.showQuickPick(picks, {});
+    if (!selectedChoice) {
+      return;
+    }
+
+    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;
+    }
+
+    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}"`
+      );
+    }
+  }
+
+  @command("svn.removeChangelist")
+  async removeChangelist(resource: Resource) {
+    const repository = this.model.getRepository(resource.resourceUri.fsPath);
+
+    if (!repository) {
+      return;
+    }
+
+    try {
+      await repository.removeChangelist(resource.resourceUri.fsPath);
+    } catch (error) {
+      console.log(error);
+      window.showErrorMessage(
+        `Unable to remove file "${resource.resourceUri.fsPath}" from changelist`
+      );
+    }
+  }
+
   @command("svn.commit", { repository: true })
   async commit(
     repository: Repository,

package.json

@@ -26,6 +26,7 @@ export class Repository {
   public watcher: FileSystemWatcher;
   public sourceControl: SourceControl;
   public changes: SourceControlResourceGroup;
+  public unversioned: SourceControlResourceGroup;
   public external: SourceControlResourceGroup;
   public changelists: Map<string, SourceControlResourceGroup> = new Map();
   private disposables: Disposable[] = [];
@@ -124,12 +125,17 @@ export class Repository {
     updateBranchName();
 
     this.changes = this.sourceControl.createResourceGroup("changes", "Changes");
+    this.unversioned = this.sourceControl.createResourceGroup(
+      "unversioned",
+      "Unversioned"
+    );
     this.external = this.sourceControl.createResourceGroup(
       "external",
       "External"
     );
 
     this.changes.hideWhenEmpty = true;
+    this.unversioned.hideWhenEmpty = true;
     this.external.hideWhenEmpty = true;
 
     this.disposables.push(
@@ -155,6 +161,7 @@ export class Repository {
   @debounce(1000)
   async update() {
     let changes: any[] = [];
+    let unversioned: any[] = [];
     let external: any[] = [];
     let changelists: Map<string, Resource[]> = new Map();
 
@@ -181,7 +188,9 @@ export class Repository {
         ? Uri.file(path.join(this.workspaceRoot, status.rename))
         : undefined;
 
-      if (status.status === Status.EXTERNAL) {
+      if (status.status === Status.UNVERSIONED) {
+        unversioned.push(new Resource(uri, status.status, renameUri));
+      } else if (status.status === Status.EXTERNAL) {
         external.push(new Resource(uri, status.status, renameUri));
       } else {
         if (status.status === Status.UNVERSIONED) {
@@ -213,6 +222,7 @@ export class Repository {
     });
 
     this.changes.resourceStates = changes;
+    this.unversioned.resourceStates = unversioned;
 
     this.changelists.forEach((group, changelist) => {
       group.resourceStates = [];
@@ -221,6 +231,7 @@ export class Repository {
     changelists.forEach((resources, changelist) => {
       let group = this.changelists.get(changelist);
       if (!group) {
+        // Prefix 'changelist-' to prevent double id with 'change' or 'external'
         group = this.sourceControl.createResourceGroup(
           `changelist-${changelist}`,
           `Changelist "${changelist}"`
@@ -264,6 +275,14 @@ export class Repository {
     return this.repository.addFile(filePath);
   }
 
+  addChangelist(filePath: string, changelist: string) {
+    return this.repository.addChangelist(filePath, changelist);
+  }
+
+  removeChangelist(changelist: string) {
+    return this.repository.removeChangelist(changelist);
+  }
+
   dispose(): void {
     this.disposables = dispose(this.disposables);
   }

src/commands.ts

@@ -200,6 +200,16 @@ export class Svn {
     return this.exec("", ["add", path]);
   }
 
+  addChangelist(path: string, changelist: string) {
+    path = path.replace(/\\/g, "/");
+    return this.exec("", ["changelist", changelist, path]);
+  }
+
+  removeChangelist(path: string) {
+    path = path.replace(/\\/g, "/");
+    return this.exec("", ["changelist", path, "--remove"]);
+  }
+
   show(path: string, revision?: string, options: CpOptions = {}) {
     var args = ["cat", path];
 

src/repository.ts

@@ -64,6 +64,14 @@ export class Repository {
     return this.svn.add(filePath);
   }
 
+  addChangelist(filePath: string, changelist: string) {
+    return this.svn.addChangelist(filePath, changelist);
+  }
+
+  removeChangelist(filePath: string) {
+    return this.svn.removeChangelist(filePath);
+  }
+
   async getCurrentBranch(): Promise<string> {
     const info = await this.getInfo();