Snapshot e242282deb41c328afbe971fc167e47ddfb26df9 from master branch of git://git.jetbrains.org/idea/community.git

Change-Id: Ifdc1818cde7b63f6d7bf42801f18c7f1557b8d85

4 files changed, 8 insertions, 15 deletions

diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnConfiguration.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnConfiguration.java
index 66132f516be6..9549ce5b506f 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnConfiguration.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnConfiguration.java
@@ -181,10 +181,9 @@ public class SvnConfiguration implements PersistentStateComponent<Element> {
     String groupName = SvnAuthenticationManager.getGroupForHost(host, configFile);
 
     if (StringUtil.isEmptyOrSpaces(groupName)) {
-      groupName = StringUtil.replace(host, " ", "_");
+      groupName = host;
       final Map<String,ProxyGroup> groups = configFile.getAllGroups();
-      while (true) {
-        if (! groups.containsKey(groupName)) break;
+      while (StringUtil.isEmptyOrSpaces(groupName) || groups.containsKey(groupName)) {
         groupName += "1";
       }
     }
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/LoadRecentBranchRevisions.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/LoadRecentBranchRevisions.java
index 7187613a0f86..825f7e79b901 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/LoadRecentBranchRevisions.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/LoadRecentBranchRevisions.java
@@ -59,6 +59,10 @@ class LoadRecentBranchRevisions extends TaskDescriptor {
   private final Integer myTestBunchSize;
 
   LoadRecentBranchRevisions(String branchName, long first, WCInfo info, SvnVcs vcs, String url) {
+    this(branchName, first, info, vcs, url, -1);
+  }
+
+  LoadRecentBranchRevisions(String branchName, long first, WCInfo info, SvnVcs vcs, String url, final int bunchSize) {
     super("Loading recent " + branchName + " revisions", Where.POOLED);
     myFirst = first;
     myWcInfo = info;
@@ -69,15 +73,10 @@ class LoadRecentBranchRevisions extends TaskDescriptor {
     if (myTestBunchSize != null) {
       myBunchSize = myTestBunchSize.intValue();
     } else {
-      myBunchSize = BUNCH_SIZE;
+      myBunchSize = bunchSize > 0 ? bunchSize : BUNCH_SIZE;
     }
   }
 
-  void setBunchSize(int bunchSize) {
-    if (myTestBunchSize != null) return;
-    myBunchSize = bunchSize;
-  }
-
   public boolean isLastLoaded() {
     return myLastLoaded;
   }
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/QuickMerge.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/QuickMerge.java
index 01e5a1d0342a..29e5b311bc4d 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/QuickMerge.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/QuickMerge.java
@@ -200,8 +200,7 @@ public class QuickMerge {
         @Override
         public void consume(Long bunchSize, final MergeDialogI dialog) {
           final LoadRecentBranchRevisions loader =
-            new LoadRecentBranchRevisions(myBranchName, dialog.getLastNumber(), myWcInfo, myVcs, mySourceUrl);
-          loader.setBunchSize(bunchSize.intValue());
+            new LoadRecentBranchRevisions(myBranchName, dialog.getLastNumber(), myWcInfo, myVcs, mySourceUrl, bunchSize.intValue());
           final TaskDescriptor updater = new TaskDescriptor("", Where.AWT) {
             @Override
             public void run(ContinuationContext context) {
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/QuickMergeInteraction.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/QuickMergeInteraction.java
index def31a2c3e74..5b2e0ca97589 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/QuickMergeInteraction.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/QuickMergeInteraction.java
@@ -35,10 +35,6 @@ import java.util.List;
  */
 public interface QuickMergeInteraction {
   void setTitle(@NotNull final String title);
-  /**
-   * @return {@link com.intellij.openapi.ui.Messages.CANCEL} - cancel,
-   * {@link com.intellij.openapi.ui.Messages.OK} - merge all, {@link com.intellij.openapi.ui.Messages.NO} - select revisions to merge
-   */
   QuickMergeContentsVariants selectMergeVariant();
   boolean shouldContinueSwitchedRootFound();