diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn17/checkin/SvnCheckinEnvironment17.java b/plugins/svn4idea/src/org/jetbrains/idea/svn17/checkin/SvnCheckinEnvironment17.java index 94d4c93f9fe0..8cd30bf1f6b0 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn17/checkin/SvnCheckinEnvironment17.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn17/checkin/SvnCheckinEnvironment17.java @@ -84,7 +84,8 @@ public class SvnCheckinEnvironment17 implements CheckinEnvironment { } - private List commitInt(List paths, final String comment, final boolean force, final boolean recursive) { + private List commitInt(List paths, final String comment, final boolean force, final boolean recursive, + final Set feedback) { final List exception = new ArrayList(); final Collection committables = getCommitables(paths); @@ -138,18 +139,18 @@ public class SvnCheckinEnvironment17 implements CheckinEnvironment { } if (progress != null) { - doCommit(committables, progress, committer, comment, force, recursive, exception); + doCommit(committables, progress, committer, comment, force, recursive, exception, feedback); } else if (ApplicationManager.getApplication().isDispatchThread()) { ProgressManager.getInstance().runProcessWithProgressSynchronously(new Runnable() { public void run() { ProgressIndicator p = ProgressManager.getInstance().getProgressIndicator(); - doCommit(committables, p, committer, comment, force, recursive, exception); + doCommit(committables, p, committer, comment, force, recursive, exception, feedback); } }, SvnBundle.message("progress.title.commit"), false, mySvnVcs.getProject()); } else { - doCommit(committables, progress, committer, comment, force, recursive, exception); + doCommit(committables, progress, committer, comment, force, recursive, exception, feedback); } for(VirtualFile f : deletedFiles) { @@ -164,7 +165,7 @@ public class SvnCheckinEnvironment17 implements CheckinEnvironment { String comment, boolean force, boolean recursive, - List exception) { + List exception, final Set feedback) { if (committables.isEmpty()) { return; } @@ -210,17 +211,21 @@ public class SvnCheckinEnvironment17 implements CheckinEnvironment { } if (committedRevisions.length() > 0) { final Project project = mySvnVcs.getProject(); - ApplicationManager.getApplication().invokeLater(new Runnable() { - public void run() { - new VcsBalloonProblemNotifier(project, SvnBundle.message("status.text.comitted.revision", committedRevisions), - MessageType.INFO).run(); - } - }, new Condition() { - @Override - public boolean value(Object o) { - return (! project.isOpen()) || project.isDisposed(); - } - }); + final String message = SvnBundle.message("status.text.comitted.revision", committedRevisions); + if (feedback == null) { + ApplicationManager.getApplication().invokeLater(new Runnable() { + public void run() { + new VcsBalloonProblemNotifier(project, message, MessageType.INFO).run(); + } + }, new Condition() { + @Override + public boolean value(Object o) { + return (! project.isOpen()) || project.isDisposed(); + } + }); + } else { + feedback.add("Subversion: " + message); + } } } @@ -305,7 +310,7 @@ public class SvnCheckinEnvironment17 implements CheckinEnvironment { String preparedComment, @NotNull NullableFunction parametersHolder, Set feedback) { - return commitInt(collectPaths(changes), preparedComment, true, false); + return commitInt(collectPaths(changes), preparedComment, true, false, feedback); } public List commit(List changes, String preparedComment) {