switching branches works and encoding does

Author: chris

package.json

@@ -15,9 +15,18 @@
   "bugs": {
     "url": "https://github.com/JohnstonCode/svn-scm/issues"
   },
-  "categories": ["Other", "SCM Providers"],
-  "keywords": ["multi-root ready", "scm", "svn"],
-  "activationEvents": ["*"],
+  "categories": [
+    "Other",
+    "SCM Providers"
+  ],
+  "keywords": [
+    "multi-root ready",
+    "scm",
+    "svn"
+  ],
+  "activationEvents": [
+    "*"
+  ],
   "main": "./out/extension",
   "scripts": {
     "vscode:prepublish": "tsc -p ./",
@@ -26,7 +35,8 @@
     "test": "node ./node_modules/vscode/bin/test"
   },
   "dependencies": {
-    "iconv-lite": "^0.4.19"
+    "iconv-lite": "^0.4.19",
+    "jschardet": "^1.6.0"
   },
   "devDependencies": {
     "typescript": "^2.5.2",

src/commands.ts

@@ -1,4 +1,11 @@
-import { commands, scm, window, Uri, TextDocumentShowOptions } from "vscode";
+import {
+  commands,
+  scm,
+  window,
+  Uri,
+  TextDocumentShowOptions,
+  QuickPickItem
+} from "vscode";
 import { inputCommitMessage, changesCommitted } from "./messages";
 import { Svn } from "./svn";
 import { Model } from "./model";
@@ -11,6 +18,38 @@ interface CommandOptions {
   repository?: boolean;
 }
 
+class CreateBranchItem implements QuickPickItem {
+  constructor(private commands: SvnCommands) {}
+
+  get label(): string {
+    return "$(plus) Create new branch";
+  }
+
+  get description(): string {
+    return "";
+  }
+
+  async run(repository: Repository): Promise<void> {
+    await this.commands.branch(repository);
+  }
+}
+
+class SwitchBranchItem implements QuickPickItem {
+  constructor(protected ref: string) {}
+
+  get label(): string {
+    return this.ref;
+  }
+
+  get description(): string {
+    return "";
+  }
+
+  async run(repository: Repository): Promise<void> {
+    await repository.switchBranch(this.ref);
+  }
+}
+
 export class SvnCommands {
   private commands: any[] = [];
 
@@ -47,8 +86,13 @@ export class SvnCommands {
         options: {}
       },
       {
-        commandId: "svn.checkout",
-        method: this.checkout,
+        commandId: "svn.switchBranch",
+        method: this.switchBranch,
+        options: { repository: true }
+      },
+      {
+        commandId: "svn.branch",
+        method: this.branch,
         options: { repository: true }
       }
     ];
@@ -239,15 +283,38 @@ export class SvnCommands {
     return resource.resourceUri;
   }
 
-  async checkout(repository: Repository) {
-    const branches = repository.branches;
+  async switchBranch(repository: Repository) {
+    const branches = repository.branches.map(
+      branch => new SwitchBranchItem(branch)
+    );
     const placeHolder = "Pick a branch to switch to.";
-    const choice = await window.showQuickPick(branches, { placeHolder });
+    const createBranch = new CreateBranchItem(this);
+    const picks = [createBranch, ...branches];
+
+    const choice = await window.showQuickPick(picks, { placeHolder });
 
     if (!choice) {
       return;
     }
 
-    console.log(choice);
+    await choice.run(repository);
+  }
+
+  async branch(repository: Repository): Promise<void> {
+    const result = await window.showInputBox({
+      placeholder: "Branch name",
+      prompt: "Please provide a branch name",
+      ignoreFocusOut: true
+    });
+
+    if (!result) {
+      return;
+    }
+
+    const name = result.replace(
+      /^\.|\/\.|\.\.|~|\^|:|\/$|\.lock$|\.lock\/|\\|\*|\s|^\s*$|\.$/g,
+      "-"
+    );
+    await repository.branch(name);
   }
 }

src/repository.ts

@@ -22,8 +22,8 @@ export class Repository {
   public changes: SourceControlResourceGroup;
   public notTracked: SourceControlResourceGroup;
   private disposables: Disposable[] = [];
-  public branch = "";
-  public branches: any[];
+  public currentBranch = "";
+  public branches: any[] = [];
 
   private _onDidChangeStatus = new EventEmitter<void>();
   readonly onDidChangeStatus: Event<void> = this._onDidChangeStatus.event;
@@ -130,7 +130,7 @@ export class Repository {
     this.changes.resourceStates = changes;
     this.notTracked.resourceStates = notTracked;
 
-    this.branch = await this.getCurrentBranch();
+    this.currentBranch = await this.getCurrentBranch();
 
     try {
       this.branches = await this.repository.getBranches();
@@ -152,10 +152,7 @@ export class Repository {
   }
 
   show(filePath: string): Promise<string> {
-    const config = workspace.getConfiguration("files", Uri.file(filePath));
-    const encoding = config.get<string>("encoding");
-
-    return this.repository.show(filePath, { encoding });
+    return this.repository.show(filePath);
   }
 
   addFile(filePath: string) {
@@ -169,4 +166,12 @@ export class Repository {
   getCurrentBranch() {
     return this.repository.getCurrentBranch();
   }
+
+  branch(name: string) {
+    return this.repository.branch(name);
+  }
+
+  switchBranch(name: string) {
+    return this.repository.switchBranch(name);
+  }
 }

src/statusBar.ts

@@ -18,12 +18,12 @@ export class SvnStatusBar {
   }
 
   get commands() {
-    const title = `$(git-branch) ${this.repository.branch}`;
+    const title = `$(git-branch) ${this.repository.currentBranch}`;
 
     return [
       {
-        command: "svn.checkout",
-        tooltip: "Checkout...",
+        command: "svn.switchBranch",
+        tooltip: "switch branch",
         title,
         arguments: [this.repository]
       }

src/svn.ts

@@ -1,6 +1,7 @@
 import { window } from "vscode";
 import * as cp from "child_process";
 import * as iconv from "iconv-lite";
+import * as jschardet from "jschardet";
 
 interface CpOptions {
   cwd?: string;
@@ -38,8 +39,10 @@ export class Svn {
       })
     ]);
 
-    let encoding = options.encoding || "utf8";
-    encoding = iconv.encodingExists(encoding) ? encoding : "utf8";
+    const encodingGuess = jschardet.detect(stdout);
+    const encoding = iconv.encodingExists(encodingGuess.encoding)
+      ? encodingGuess.encoding
+      : "utf8";
 
     stdout = iconv.decode(stdout, encoding);
 
@@ -104,6 +107,24 @@ export class Svn {
   info(path: string) {
     return this.exec(path, ["info", "--xml"]);
   }
+
+  copy(rootPath: string, branchPath: string, name: string) {
+    return this.exec("", [
+      "copy",
+      rootPath,
+      branchPath,
+      "-m",
+      `Created new branch ${name}`
+    ]);
+  }
+
+  checkout(root: string, branchPath: string) {
+    return this.exec(root, ["checkout", branchPath]);
+  }
+
+  switchBranch(root: string, path: string) {
+    return this.exec(root, ["switch", path]);
+  }
 }
 
 export class Repository {
@@ -131,15 +152,22 @@ export class Repository {
 
   async show(path: string, options: CpOptions = {}): Promise<string> {
     const result = await this.svn.show(path, options);
+
+    if (result.exitCode !== 0) {
+      throw new Error(result.stderr);
+    }
+
     return result.stdout;
   }
 
   async commitFiles(message: string, files: any[]) {
-    try {
-      return await this.svn.commit(message, files);
-    } catch (error) {
-      throw new Error("Unable to commit files");
+    const result = await this.svn.commit(message, files);
+
+    if (result.exitCode !== 0) {
+      throw new Error(result.stderr);
     }
+
+    return result.stdout;
   }
 
   addFile(filePath: string) {
@@ -163,18 +191,16 @@ export class Repository {
   async getBranches() {
     const info = await this.svn.info(this.root);
 
-    if (info.exitCode === 0) {
+    if (info.exitCode !== 0) {
       throw new Error(info.stderr);
     }
 
-    const repoUrl = info.stdout
-      .match(/<url>(.*?)<\/url>/)[1]
-      .replace(/\/[^\/]+$/, "");
+    const repoUrl = info.stdout.match(/<root>(.*?)<\/root>/)[1];
     const branchUrl = repoUrl + "/branches";
 
     const result = await this.svn.list(branchUrl);
 
-    if (result.exitCode === 0) {
+    if (result.exitCode !== 0) {
       throw new Error(result.stderr);
     }
 
@@ -183,6 +209,56 @@ export class Repository {
       .replace(/\/|\\/g, "")
       .split("\n");
 
-    return branches;
+    return ["trunk", ...branches];
+  }
+
+  async branch(name: string) {
+    const info = await this.svn.info(this.root);
+
+    if (info.exitCode !== 0) {
+      throw new Error(info.stderr);
+    }
+
+    const repoUrl = info.stdout.match(/<root>(.*?)<\/root>/)[1];
+    const newBranch = repoUrl + "/branches/" + name;
+    const rootUrl = repoUrl + "/trunk";
+
+    const result = await this.svn.copy(rootUrl, newBranch, name);
+
+    if (result.exitCode !== 0) {
+      throw new Error(result.stderr);
+    }
+
+    const switchBranch = await this.svn.switchBranch(this.root, newBranch);
+
+    if (switchBranch.exitCode !== 0) {
+      throw new Error(switchBranch.stderr);
+    }
+
+    return true;
+  }
+
+  async switchBranch(ref: string) {
+    const info = await this.svn.info(this.root);
+
+    if (info.exitCode !== 0) {
+      throw new Error(info.stderr);
+    }
+
+    const repoUrl = info.stdout.match(/<root>(.*?)<\/root>/)[1];
+
+    if (ref === "trunk") {
+      var branchUrl = repoUrl + "/trunk";
+    } else {
+      var branchUrl = repoUrl + "/branches/" + ref;
+    }
+
+    const switchBranch = await this.svn.switchBranch(this.root, branchUrl);
+
+    if (switchBranch.exitCode !== 0) {
+      throw new Error(switchBranch.stderr);
+    }
+
+    return true;
   }
 }