Merge branch 'master' into cleanupNewsCommit

Author: JohnstonCode

icons/dark/check.svg

@@ -82,7 +82,20 @@
       {
         "command": "svn.commit",
         "title": "Commit Selected",
-        "category": "SVN"
+        "category": "SVN",
+        "icon": {
+          "light": "icons/light/check.svg",
+          "dark": "icons/dark/check.svg"
+        }
+      },
+      {
+        "command": "svn.commitWithMessage",
+        "title": "Commit Changes",
+        "category": "SVN",
+        "icon": {
+          "light": "icons/light/check.svg",
+          "dark": "icons/dark/check.svg"
+        }
       },
       {
         "command": "svn.openChangeBase",
@@ -132,17 +145,17 @@
       },
       {
         "command": "svn.revert",
-        "title": "Revert Selected",
+        "title": "Revert Selected File",
         "category": "SVN"
       },
       {
         "command": "svn.update",
-        "title": "Svn update",
+        "title": "Update",
         "category": "SVN"
       },
       {
         "command": "svn.patch",
-        "title": "Svn patch",
+        "title": "Show diff patch",
         "category": "SVN"
       },
       {
@@ -159,6 +172,20 @@
         "command": "svn.log",
         "title": "Show commit messages",
         "category": "SVN"
+      },
+      {
+        "command": "svn.revertChange",
+        "title": "Revert Change",
+        "category": "SVN",
+        "icon": {
+          "light": "icons/light/clean.svg",
+          "dark": "icons/dark/clean.svg"
+        }
+      },
+      {
+        "command": "svn.revertSelectedRanges",
+        "title": "Revert Selected Ranges",
+        "category": "SVN"
       }
     ],
     "menus": {
@@ -178,13 +205,42 @@
         {
           "command": "svn.openChangeHead",
           "when": "config.svn.enabled && svnOpenRepositoryCount != 0"
+        },
+        {
+          "command": "svn.addChangelist",
+          "when": "config.svn.enabled && svnOpenRepositoryCount != 0"
+        },
+        {
+          "command": "svn.removeChangelist",
+          "when": "config.svn.enabled && svnOpenRepositoryCount != 0"
+        },
+        {
+          "command": "svn.commit",
+          "when": "config.svn.enabled && svnOpenRepositoryCount != 0"
+        },
+        {
+          "command": "svn.commitWithMessage",
+          "when": "false"
+        },
+        {
+          "command": "svn.revertChange",
+          "when": "false"
+        },
+        {
+          "command": "svn.revertSelectedRanges",
+          "when": "config.svn.enabled && svnOpenRepositoryCount != 0 && svnHasSupportToRegisterDiffCommand == 1"
         }
       ],
       "scm/title": [
+        {
+          "command": "svn.commitWithMessage",
+          "group": "navigation",
+          "when": "config.svn.enabled && scmProvider == svn"
+        },
         {
           "command": "svn.refresh",
           "group": "navigation",
-          "when": "scmProvider == svn"
+          "when": "config.svn.enabled && scmProvider == svn"
         },
         {
           "command": "svn.switchBranch",
@@ -248,13 +304,13 @@
         {
           "command": "svn.addChangelist",
           "when":
-            "config.svn.enabled && scmProvider == svn && scmResourceGroup != external",
+            "config.svn.enabled && scmProvider == svn && scmResourceGroup != unversioned && scmResourceGroup != external",
           "group": "inline"
         },
         {
           "command": "svn.addChangelist",
           "when":
-            "config.svn.enabled && scmProvider == svn && scmResourceGroup != external",
+            "config.svn.enabled && scmProvider == svn && scmResourceGroup != unversioned && scmResourceGroup != external",
           "group": "1_modification"
         },
         {
@@ -288,6 +344,12 @@
           "group": "2_modification"
         }
       ],
+      "scm/change/title": [
+        {
+          "command": "svn.revertChange",
+          "when": "config.svn.enabled && originalResourceScheme == svn"
+        }
+      ],
       "editor/title": [
         {
           "command": "svn.openFile",
@@ -306,6 +368,12 @@
           "group": "navigation",
           "when":
             "config.svn.enabled && svnOpenRepositoryCount != 0 && !isInDiffEditor && resourceScheme == file"
+        },
+        {
+          "command": "svn.revertSelectedRanges",
+          "group": "2_svn@3",
+          "when":
+            "config.svn.enabled && svnOpenRepositoryCount != 0 && isInDiffEditor && resourceScheme != merge-conflict.conflict-diff &&  && svnHasSupportToRegisterDiffCommand == 1"
         }
       ]
     },
@@ -317,6 +385,11 @@
           "description": "Whether svn is enabled",
           "default": true
         },
+        "svn.autorefresh": {
+          "type": "boolean",
+          "description": "Whether auto refreshing is enabled",
+          "default": true
+        },
         "svn.decorations.enabled": {
           "type": "boolean",
           "description":
@@ -360,12 +433,6 @@
             "How frequently (in minutes) to check branch changes. Set to `0` to avoid periodic checks.",
           "default": 5
         },
-        "svn.newCommits.update": {
-          "type": "number",
-          "minimum": 0,
-          "description": "How frequently (in minutes) to check for new commits. Set to `0` to avoid periodic checks.",
-          "default": 5
-        },
         "svn.multipleFolders.enabled": {
           "type": "boolean",
           "description": "Allow to find subfolders using SVN",

icons/dark/clean.svg

@@ -0,0 +1,127 @@
+import {
+  QuickPickItem,
+  SourceControlResourceGroup,
+  window,
+  workspace
+} from "vscode";
+import { Repository } from "./repository";
+
+export 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 NewChangeListItem implements QuickPickItem {
+  constructor() {}
+
+  get label(): string {
+    return "$(plus) New changelist";
+  }
+
+  get description(): string {
+    return "Create a new change list";
+  }
+}
+
+export function getChangelistPickOptions(
+  repository: Repository
+): QuickPickItem[] {
+  const picks: QuickPickItem[] = [];
+
+  repository.changelists.forEach((group, changelist) => {
+    if (group.resourceStates.length) {
+      picks.push(new ChangeListItem(group));
+    }
+  });
+  picks.push(new NewChangeListItem());
+
+  return picks;
+}
+
+export function getCommitChangelistPickOptions(
+  repository: Repository
+): ChangeListItem[] {
+  const picks: ChangeListItem[] = [];
+
+  if (repository.changes.resourceStates.length) {
+    picks.push(new ChangeListItem(repository.changes));
+  }
+
+  const svnConfig = workspace.getConfiguration("svn");
+  const ignoreOnCommitList = svnConfig.get<string[]>(
+    "sourceControl.ignoreOnCommit",
+    []
+  );
+
+  repository.changelists.forEach((group, changelist) => {
+    if (
+      group.resourceStates.length &&
+      !ignoreOnCommitList.includes(changelist)
+    ) {
+      picks.push(new ChangeListItem(group));
+    }
+  });
+  return picks;
+}
+
+export async function inputSwitchChangelist(repository: Repository) {
+  const picks: QuickPickItem[] = getChangelistPickOptions(repository);
+
+  const selectedChoice: any = await window.showQuickPick(picks, {
+    placeHolder: "Select an existing changelist or create a new"
+  });
+  if (!selectedChoice) {
+    return;
+  }
+
+  let changelistName;
+
+  if (selectedChoice instanceof NewChangeListItem) {
+    const newChangelistName = await window.showInputBox({
+      placeHolder: "Changelist name",
+      prompt: "Please enter a changelist name"
+    });
+    if (!newChangelistName) {
+      return;
+    }
+    changelistName = newChangelistName;
+  } else if (selectedChoice instanceof ChangeListItem) {
+    changelistName = selectedChoice.resourceGroup.id.replace(
+      /^changelist-/,
+      ""
+    );
+  }
+
+  return changelistName;
+}
+
+export async function inputCommitChangelist(repository: Repository) {
+  const picks: ChangeListItem[] = getCommitChangelistPickOptions(repository);
+
+  if (picks.length === 0) {
+    window.showInformationMessage("There are no changes to commit.");
+    return;
+  }
+
+  let choice;
+  // If has only changes, not prompt to select changelist
+  if (picks.length === 1 && repository.changes.resourceStates.length) {
+    choice = picks[0];
+  } else {
+    choice = await window.showQuickPick(picks, {
+      placeHolder: "Select a changelist to commit"
+    });
+  }
+
+  return choice;
+}