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

SVN 1.7: old -> new: IDEA-76087 REGRESSION: Revision number of Subversion commit no longer shows in after-commit popup ++

Browse Source
This commit is contained in:
irengrig
2012-01-25 11:50:57 +04:00
parent 909e379c20
commit d70745d9c6
1 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/svn4idea/src/org/jetbrains/idea/svn17/checkin/SvnCheckinEnvironment17.java
+22 -17
View File
@@ -84,7 +84,8 @@ public class SvnCheckinEnvironment17 implements CheckinEnvironment {
}
private List<VcsException> commitInt(List<File> paths, final String comment, final boolean force, final boolean recursive) {
private List<VcsException> commitInt(List<File> paths, final String comment, final boolean force, final boolean recursive,
final Set<String> feedback) {
final List<VcsException> exception = new ArrayList<VcsException>();
final Collection<File> 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<VcsException> exception) {
List<VcsException> exception, final Set<String> 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<Object>() {
@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<Object>() {
@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<Object, Object> parametersHolder,
Set<String> feedback) {
return commitInt(collectPaths(changes), preparedComment, true, false);
return commitInt(collectPaths(changes), preparedComment, true, false, feedback);
}
public List<VcsException> commit(List<Change> changes, String preparedComment) {