Added support to commit changelist (#95);

Author: edgardmessias

src/commands.ts

@@ -5,7 +5,8 @@ import {
   Uri,
   TextDocumentShowOptions,
   QuickPickItem,
-  workspace
+  workspace,
+  SourceControlResourceGroup
 } from "vscode";
 import { inputCommitMessage } from "./messages";
 import { Svn } from "./svn";
@@ -82,6 +83,21 @@ class SwitchBranchItem implements QuickPickItem {
   }
 }
 
+class ChangeListItem implements QuickPickItem {
+  constructor(protected group: SourceControlResourceGroup) {}
+
+  get label(): string {
+    return this.group.label;
+  }
+
+  get description(): string {
+    return this.group.label;
+  }
+  get resourceGroup(): SourceControlResourceGroup {
+    return this.group;
+  }
+}
+
 export class SvnCommands {
   private commands: any[] = [];
 
@@ -138,19 +154,37 @@ export class SvnCommands {
   @command("svn.commitWithMessage", { repository: true })
   async commitWithMessage(repository: Repository) {
     const message = repository.inputBox.value;
-    const changes = repository.changes.resourceStates;
-    let filePaths;
-
     if (!message) {
       return;
     }
 
-    if (changes.length === 0) {
+    const picks: ChangeListItem[] = [];
+
+    if (repository.changes.resourceStates.length) {
+      picks.push(new ChangeListItem(repository.changes));
+    }
+
+    repository.changelists.forEach((group, changelist) => {
+      if (group.resourceStates.length) {
+        picks.push(new ChangeListItem(group));
+      }
+    });
+
+    if (picks.length === 0) {
       window.showInformationMessage("There are no changes to commit.");
       return;
     }
 
-    filePaths = changes.map(state => {
+    let choice = picks[0];
+    if (picks.length > 1) {
+      const selectedChoice = await window.showQuickPick(picks, {});
+      if (!selectedChoice) {
+        return;
+      }
+      choice = selectedChoice;
+    }
+
+    const filePaths = choice.resourceGroup.resourceStates.map(state => {
       return state.resourceUri.fsPath;
     });
 

src/model.ts

@@ -267,7 +267,7 @@ export class Model {
         return liveRepository;
       }
 
-      if (hint === repository.changes || hint === repository.notTracked) {
+      if (hint === repository.changes) {
         return liveRepository;
       }
     }

src/repository.ts

@@ -26,8 +26,8 @@ export class Repository {
   public watcher: FileSystemWatcher;
   public sourceControl: SourceControl;
   public changes: SourceControlResourceGroup;
-  public notTracked: SourceControlResourceGroup;
   public external: SourceControlResourceGroup;
+  public changelists: Map<string, SourceControlResourceGroup> = new Map();
   private disposables: Disposable[] = [];
   public currentBranch = "";
   public isSwitchingBranch: boolean = false;
@@ -124,17 +124,12 @@ export class Repository {
     updateBranchName();
 
     this.changes = this.sourceControl.createResourceGroup("changes", "Changes");
-    this.notTracked = this.sourceControl.createResourceGroup(
-      "unversioned",
-      "Not Tracked"
-    );
     this.external = this.sourceControl.createResourceGroup(
       "external",
       "External"
     );
 
     this.changes.hideWhenEmpty = true;
-    this.notTracked.hideWhenEmpty = true;
     this.external.hideWhenEmpty = true;
 
     this.disposables.push(
@@ -160,8 +155,9 @@ export class Repository {
   @debounce(1000)
   async update() {
     let changes: any[] = [];
-    let notTracked: any[] = [];
     let external: any[] = [];
+    let changelists: Map<string, Resource[]> = new Map();
+
     const statuses = (await this.repository.getStatus()) || [];
 
     const fileConfig = workspace.getConfiguration("files");
@@ -187,28 +183,55 @@ export class Repository {
 
       if (status.status === Status.EXTERNAL) {
         external.push(new Resource(uri, status.status, renameUri));
-      } else if (status.status === Status.UNVERSIONED) {
-        const matches = status.path.match(
-          /(.+?)\.(mine|working|merge-\w+\.r\d+|r\d+)$/
-        );
-
-        //If file end with (mine, working, merge, etc..) and has file without extension
-        if (
-          matches &&
-          matches[1] &&
-          statuses.some(s => s.path === matches[1])
-        ) {
-          return;
+      } else {
+        if (status.status === Status.UNVERSIONED) {
+          const matches = status.path.match(
+            /(.+?)\.(mine|working|merge-\w+\.r\d+|r\d+)$/
+          );
+
+          //If file end with (mine, working, merge, etc..) and has file without extension
+          if (
+            matches &&
+            matches[1] &&
+            statuses.some(s => s.path === matches[1])
+          ) {
+            return;
+          }
         }
 
-        notTracked.push(new Resource(uri, status.status, renameUri));
-      } else {
-        changes.push(new Resource(uri, status.status, renameUri));
+        if (!status.changelist) {
+          changes.push(new Resource(uri, status.status, renameUri));
+        } else {
+          let changelist = changelists.get(status.changelist);
+          if (!changelist) {
+            changelist = [];
+          }
+          changelist.push(new Resource(uri, status.status, renameUri));
+          changelists.set(status.changelist, changelist);
+        }
       }
     });
 
     this.changes.resourceStates = changes;
-    this.notTracked.resourceStates = notTracked;
+
+    this.changelists.forEach((group, changelist) => {
+      group.resourceStates = [];
+    });
+
+    changelists.forEach((resources, changelist) => {
+      let group = this.changelists.get(changelist);
+      if (!group) {
+        group = this.sourceControl.createResourceGroup(
+          `changelist-${changelist}`,
+          `Changelist "${changelist}"`
+        );
+        group.hideWhenEmpty = true;
+
+        this.changelists.set(changelist, group);
+      }
+
+      group.resourceStates = resources;
+    });
 
     if (svnConfig.get<boolean>("sourceControl.showExternal")) {
       this.external.resourceStates = external;