MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-82296 Commit is automatically split into several different commits

Browse Source
This commit is contained in:
irengrig
2012-03-06 15:29:44 +04:00
parent 3cc8162b21
commit 263c31ac81
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/svn4idea/src/org/jetbrains/idea/svn/checkin/SvnCheckinEnvironment.java
+4 -3
View File
@@ -50,6 +50,7 @@ import org.jetbrains.idea.svn.*;
import org.tmatesoft.svn.core.SVNCancelException;
import org.tmatesoft.svn.core.SVNCommitInfo;
import org.tmatesoft.svn.core.SVNException;
import org.tmatesoft.svn.core.SVNURL;
import org.tmatesoft.svn.core.wc.*;
import javax.swing.*;
@@ -175,17 +176,17 @@ public class SvnCheckinEnvironment implements CheckinEnvironment {
return Collections.singletonList(committables);
}
final MultiMap<File, File> result = new MultiMap<File, File>();
final MultiMap<SVNURL, File> result = new MultiMap<SVNURL, File>();
for (File committable : committables) {
final RootUrlInfo path = mySvnVcs.getSvnFileUrlMapping().getWcRootForFilePath(committable);
result.putValue(path == null ? null : path.getIoFile(), committable);
result.putValue(path == null ? null : path.getRepositoryUrlUrl(), committable);
}
if (result.size() == 1) {
return Collections.singletonList(committables);
}
final Collection<Collection<File>> result2 = new ArrayList<Collection<File>>();
for (Map.Entry<File, Collection<File>> entry : result.entrySet()) {
for (Map.Entry<SVNURL, Collection<File>> entry : result.entrySet()) {
result2.add(entry.getValue());
}
return result2;