fixes #119

Author: JohnstonCode

CHANGELOG.md

@@ -1,3 +1,9 @@
+# **v1.10.0**
+
+## What's New
+
+* @JohnstonCode Added conflict support
+
 # **v1.9.0**
 
 ## What's New

package.json

@@ -2,7 +2,7 @@
   "name": "svn-scm",
   "displayName": "SVN",
   "description": "Integrated Subversion source control",
-  "version": "1.9.0",
+  "version": "1.10.0",
   "publisher": "johnstoncode",
   "engines": {
     "vscode": "^1.17.0"
@@ -121,6 +121,11 @@
         "command": "svn.remove",
         "title": "Remove Selected",
         "category": "SVN"
+      },
+      {
+        "command": "svn.resolve",
+        "title": "Resolve Conflicts",
+        "category": "SVN"
       }
     ],
     "menus": {
@@ -142,6 +147,10 @@
         {
           "command": "svn.patch",
           "when": "config.svn.enabled"
+        },
+        {
+          "command": "svn.resolve",
+          "when": "config.svn.enabled"
         }
       ],
       "scm/resourceGroup/context": [],

src/commands.ts

@@ -16,6 +16,7 @@ import { Resource } from "./resource";
 import { toSvnUri } from "./uri";
 import * as path from "path";
 import { start } from "repl";
+import { getConflictPickOptions } from "./conflictItems";
 
 interface CommandOptions {
   repository?: boolean;
@@ -177,7 +178,7 @@ export class SvnCommands {
       picks.push(new ChangeListItem(repository.changes));
     }
 
-    const svnConfig = workspace.getConfiguration("svn", Uri.file(repository.workspaceRoot));
+    const svnConfig = workspace.getConfiguration("svn");
     const ignoreOnCommitList = svnConfig.get<string[]>(
       "sourceControl.ignoreOnCommit",
       []
@@ -550,6 +551,30 @@ export class SvnCommands {
     }
   }
 
+  @command("svn.resolve", { repository: true })
+  async resolve(repository: Repository) {
+    const conflicts = repository.conflicts.resourceStates;
+
+    if (!conflicts.length) {
+      window.showInformationMessage("No Conflicts");
+    }
+
+    for (const conflict of conflicts) {
+      const placeHolder = `Select conflict option for ${
+        conflict.resourceUri.path
+      }`;
+      const picks = getConflictPickOptions();
+
+      const choice = await window.showQuickPick(picks, { placeHolder });
+
+      if (!choice) {
+        return;
+      }
+
+      await repository.resolve(conflict.resourceUri.path, choice.label);
+    }
+  }
+
   private runByRepository<T>(
     resource: Uri,
     fn: (repository: Repository, resource: Uri) => Promise<T>

src/conflictItems.ts

@@ -0,0 +1,55 @@
+import { QuickPickItem } from "vscode";
+
+interface ConflictOption {
+  label: string;
+  description: string;
+}
+
+const ConflictOptions = [
+  {
+    label: "base",
+    description:
+      "Choose the file that was the (unmodified) BASE revision before you tried to integrate changes"
+  },
+  {
+    label: "working",
+    description:
+      "Assuming that you've manually handled the conflict resolution, choose the version of the file as it currently stands in your working copy."
+  },
+  {
+    label: "mine-full",
+    description:
+      "Preserve all local modifications and discarding all changes fetched"
+  },
+  {
+    label: "theirs-full",
+    description:
+      "Discard all local modifications and integrating all changes fetched"
+  },
+  {
+    label: "mine-conflict",
+    description:
+      "Resolve conflicted files by preferring local modifications over the changes fetched"
+  },
+  {
+    label: "theirs-conflict",
+    description:
+      "Resolve conflicted files by preferring the changes fetched from the server over local modifications"
+  }
+];
+
+class ConflictItem implements QuickPickItem {
+  constructor(private option: ConflictOption) {}
+
+  get label(): string {
+    return this.option.label;
+  }
+
+  get description(): string {
+    return this.option.description;
+  }
+}
+
+export function getConflictPickOptions() {
+  return ConflictOptions.map(option => new ConflictItem(option));
+}

src/repository.ts

@@ -29,6 +29,7 @@ export class Repository {
   public unversioned: SourceControlResourceGroup;
   public external: SourceControlResourceGroup;
   public changelists: Map<string, SourceControlResourceGroup> = new Map();
+  public conflicts: SourceControlResourceGroup;
   private disposables: Disposable[] = [];
   public currentBranch = "";
   public isSwitchingBranch: boolean = false;
@@ -133,10 +134,15 @@ export class Repository {
       "external",
       "External"
     );
+    this.conflicts = this.sourceControl.createResourceGroup(
+      "conflicts",
+      "conflicts"
+    );
 
     this.changes.hideWhenEmpty = true;
     this.unversioned.hideWhenEmpty = true;
     this.external.hideWhenEmpty = true;
+    this.conflicts.hideWhenEmpty = true;
 
     this.disposables.push(
       toDisposable(() => clearInterval(this.branchesTimer))
@@ -163,14 +169,15 @@ export class Repository {
     let changes: any[] = [];
     let unversioned: any[] = [];
     let external: any[] = [];
+    let conflicts: any[] = [];
     let changelists: Map<string, Resource[]> = new Map();
 
     const statuses = (await this.repository.getStatus()) || [];
 
-    const fileConfig = workspace.getConfiguration("files");
+    const fileConfig = workspace.getConfiguration("files", Uri.file(this.root));
     const svnConfig = workspace.getConfiguration("svn");
 
-    const filesToExclude = fileConfig.get<any>("exclude", null);
+    const filesToExclude = fileConfig.get<any>("exclude");
 
     let excludeList: string[] = [];
     for (const pattern in filesToExclude) {
@@ -188,15 +195,20 @@ export class Repository {
         ? Uri.file(path.join(this.workspaceRoot, status.rename))
         : undefined;
 
-      const resouce = new Resource(uri, status.status, renameUri, status.props);
+      const resource = new Resource(
+        uri,
+        status.status,
+        renameUri,
+        status.props
+      );
 
       if (status.status === Status.NORMAL && status.props === PropStatus.NONE) {
         // On commit, `svn status` return all locked files with status="normal" and props="none"
         return;
-      } else if (status.status === Status.UNVERSIONED) {
-        unversioned.push(resouce);
       } else if (status.status === Status.EXTERNAL) {
-        external.push(resouce);
+        external.push(resource);
+      } else if (status.status === Status.CONFLICTED) {
+        conflicts.push(resource);
       } else {
         if (status.status === Status.UNVERSIONED) {
           const matches = status.path.match(
@@ -210,24 +222,27 @@ export class Repository {
             statuses.some(s => s.path === matches[1])
           ) {
             return;
+          } else {
+            unversioned.push(resource);
           }
         }
 
         if (!status.changelist) {
-          changes.push(resouce);
+          changes.push(resource);
         } else {
           let changelist = changelists.get(status.changelist);
           if (!changelist) {
             changelist = [];
           }
-          changelist.push(resouce);
+          changelist.push(resource);
           changelists.set(status.changelist, changelist);
         }
       }
     });
 
     this.changes.resourceStates = changes;
     this.unversioned.resourceStates = unversioned;
+    this.conflicts.resourceStates = conflicts;
 
     this.changelists.forEach((group, changelist) => {
       group.resourceStates = [];
@@ -329,4 +344,13 @@ export class Repository {
       this._onDidChangeBranch.fire();
     }
   }
+
+  async resolve(file: string, action: string) {
+    try {
+      const response = await this.repository.resolve(file, action);
+      window.showInformationMessage(response);
+    } catch (error) {
+      window.showErrorMessage(error);
+    }
+  }
 }

src/resource.ts

@@ -53,6 +53,7 @@ export class Resource implements SourceControlResourceState {
     return this._resourceUri;
   }
 
+  @memoize
   get type(): String {
     return this._type;
   }
@@ -86,7 +87,7 @@ export class Resource implements SourceControlResourceState {
     if (this.type === Status.ADDED && this.renameResourceUri) {
       return Resource.Icons[theme]["Renamed"];
     }
-
+    
     const type = this.type.charAt(0).toUpperCase() + this.type.slice(1);
 
     if (typeof Resource.Icons[theme][type] !== "undefined") {

src/svn.ts

@@ -306,4 +306,8 @@ export class Svn {
 
     return this.exec("", args);
   }
+
+  resolve(file: string, action: string) {
+    return this.exec("", ["resolve", "--accept", action, file]);
+  }
 }

src/svnRepository.ts

@@ -290,4 +290,14 @@ export class Repository {
 
     return result.stdout;
   }
+
+  async resolve(file: string, action: string) {
+    const result = await this.svn.resolve(file, action);
+
+    if (result.exitCode !== 0) {
+      throw new Error(result.stderr);
+    }
+
+    return result.stdout;
+  }
 }