feat: Added Merge command (#1540)

package.json

@@ -456,6 +456,11 @@
                 "title": "Switch Branch",
                 "category": "SVN"
             },
+            {
+                "command": "svn.merge",
+                "title": "Merge",
+                "category": "SVN"
+            },
             {
                 "command": "svn.treeview.pullIncomingChange",
                 "title": "Update selected",
@@ -686,6 +691,10 @@
                     "command": "svn.switchBranch",
                     "when": "config.svn.enabled && svnOpenRepositoryCount != 0"
                 },
+                {
+                    "command": "svn.merge",
+                    "when": "config.svn.enabled && svnOpenRepositoryCount != 0"
+                },
                 {
                     "command": "svn.treeview.pullIncomingChange",
                     "when": "false"
@@ -814,6 +823,10 @@
                     "command": "svn.switchBranch",
                     "when": "config.svn.enabled && scmProvider == svn"
                 },
+                {
+                    "command": "svn.merge",
+                    "when": "config.svn.enabled && scmProvider == svn"
+                },
                 {
                     "command": "svn.update",
                     "when": "config.svn.enabled && scmProvider == svn"

src/commands.ts

@@ -45,6 +45,7 @@ import { Upgrade } from "./commands/upgrade";
 import { SourceControlManager } from "./source_control_manager";
 import { SearchLogByRevision } from "./commands/search_log_by_revision";
 import { SearchLogByText } from "./commands/search_log_by_text";
+import { Merge } from "./commands/merge";
 
 export function registerCommands(
   sourceControlManager: SourceControlManager,
@@ -63,6 +64,7 @@ export function registerCommands(
   disposables.push(new OpenResourceHead());
   disposables.push(new OpenChangeBase());
   disposables.push(new SwitchBranch());
+  disposables.push(new Merge());
   disposables.push(new Revert());
   disposables.push(new Update());
   disposables.push(new PullIncommingChange());

src/commands/merge.ts

@@ -0,0 +1,54 @@
+import { commands, window } from "vscode";
+import { IBranchItem } from "../common/types";
+import { isTrunk, selectBranch } from "../helpers/branch";
+import { Repository } from "../repository";
+import { Command } from "./command";
+
+export class Merge extends Command {
+  constructor() {
+    super("svn.merge", { repository: true });
+  }
+
+  public async execute(repository: Repository) {
+    const branch = await selectBranch(repository);
+
+    if (!branch) {
+      return;
+    }
+
+    await this.merge(repository, branch);
+  }
+
+  async merge(repository: Repository, branch: IBranchItem) {
+    let reintegrate = false;
+    if (isTrunk(repository.currentBranch)) {
+      reintegrate = true;
+    }
+
+    try {
+      await repository.merge(branch.path, reintegrate);
+    } catch (error) {
+      if (typeof error === "object" && error.hasOwnProperty("stderrFormated")) {
+        if (error.stderrFormated.includes("try updating first")) {
+          const answer = await window.showErrorMessage(
+            "Seems like you need to update first prior to merging. " +
+              "Would you like to update now and try merging again?",
+            "Yes",
+            "No"
+          );
+          if (answer === "Yes") {
+            await commands.executeCommand("svn.update");
+            await this.merge(repository, branch);
+          }
+        } else {
+          window.showErrorMessage(
+            "Unable to merge branch: " + error.stderrFormated
+          );
+        }
+      } else {
+        console.log(error);
+        window.showErrorMessage("Unable to merge branch");
+      }
+    }
+  }
+}

src/common/types.ts

@@ -110,6 +110,7 @@ export enum Operation {
   Info = "Info",
   Ignore = "Ignore",
   Log = "Log",
+  Merge = "Merge",
   NewBranch = "NewBranch",
   Patch = "Patch",
   Remove = "Remove",

src/helpers/branch.ts

@@ -107,3 +107,16 @@ export async function selectBranch(
 
   return;
 }
+
+export function isTrunk(folder: string): boolean {
+  const conf = "layout.trunkRegex";
+  const layout = configuration.get<string>(conf);
+  const regex = new RegExp(`(^|/)(${layout})$`);
+  const matches = folder.match(regex);
+  const group = configuration.get<number>(`${conf}Name`, 1) + 2;
+
+  if (matches && matches[2] && matches[group]) {
+    return true;
+  }
+  return false;
+}

src/repository.ts

@@ -817,6 +817,17 @@ export class Repository implements IRemoteRepository {
     });
   }
 
+  public async merge(
+    name: string,
+    reintegrate: boolean = false,
+    accept_action: string = "postpone"
+  ) {
+    await this.run(Operation.Merge, async () => {
+      await this.repository.merge(name, reintegrate, accept_action);
+      this.updateRemoteChangedFiles();
+    });
+  }
+
   public async updateRevision(
     ignoreExternals: boolean = false
   ): Promise<string> {

src/statusbar/syncStatusBar.ts

@@ -50,7 +50,8 @@ export class SyncStatusBar {
     const isSyncRunning =
       this.repository.operations.isRunning(Operation.SwitchBranch) ||
       this.repository.operations.isRunning(Operation.NewBranch) ||
-      this.repository.operations.isRunning(Operation.Update);
+      this.repository.operations.isRunning(Operation.Update) ||
+      this.repository.operations.isRunning(Operation.Merge);
 
     const isStatusRemoteRunning = this.repository.operations.isRunning(
       Operation.StatusRemote

src/svnRepository.ts

@@ -662,6 +662,24 @@ export class Repository {
     return true;
   }
 
+  public async merge(
+    ref: string,
+    reintegrate: boolean = false,
+    accept_action: string = "postpone"
+  ) {
+    const repoUrl = await this.getRepoUrl();
+    const branchUrl = repoUrl + "/" + ref;
+
+    let args = ["merge", "--accept", accept_action];
+    args = args.concat(reintegrate ? ["--reintegrate"] : []);
+    args = args.concat([branchUrl]);
+
+    await this.exec(args);
+
+    this.resetInfoCache();
+    return true;
+  }
+
   public async revert(files: string[], depth: keyof typeof SvnDepth) {
     files = files.map(file => this.removeAbsolutePath(file));
     const result = await this.exec(["revert", "--depth", depth, ...files]);