1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
|
/*
* Copyright 2000-2009 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jetbrains.idea.svn.actions;
import com.intellij.openapi.actionSystem.DataContext;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.Messages;
import com.intellij.openapi.vcs.AbstractVcs;
import com.intellij.openapi.vcs.FileStatus;
import com.intellij.openapi.vcs.FileStatusManager;
import com.intellij.openapi.vcs.VcsException;
import com.intellij.openapi.vcs.changes.VcsDirtyScopeManager;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.ArrayUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.idea.svn.SvnBundle;
import org.jetbrains.idea.svn.SvnStatusUtil;
import org.jetbrains.idea.svn.SvnVcs;
import org.jetbrains.idea.svn.conflict.ConflictClient;
import org.jetbrains.idea.svn.dialogs.SelectFilesDialog;
import org.jetbrains.idea.svn.status.StatusClient;
import org.tmatesoft.svn.core.SVNDepth;
import org.tmatesoft.svn.core.SVNException;
import org.tmatesoft.svn.core.wc.*;
import java.io.File;
import java.util.Collection;
import java.util.TreeSet;
public class MarkResolvedAction extends BasicAction {
private static final Logger LOG = Logger.getInstance("#org.jetbrains.idea.svn.actions.MarkResolvedAction");
protected String getActionName(AbstractVcs vcs) {
return SvnBundle.message("action.name.mark.resolved");
}
protected boolean needsAllFiles() {
return false;
}
protected boolean isEnabled(Project project, @NotNull SvnVcs vcs, VirtualFile file) {
if (file.isDirectory()) {
return SvnStatusUtil.isUnderControl(project, file);
}
final FileStatus fStatus = FileStatusManager.getInstance(project).getStatus(file);
return FileStatus.MERGED_WITH_CONFLICTS.equals(fStatus) || FileStatus.MERGED_WITH_BOTH_CONFLICTS.equals(fStatus) ||
FileStatus.MERGED_WITH_PROPERTY_CONFLICTS.equals(fStatus);
}
protected boolean needsFiles() {
return true;
}
protected void perform(Project project, SvnVcs activeVcs, VirtualFile file, DataContext context)
throws VcsException {
batchPerform(project, activeVcs, new VirtualFile[]{file}, context);
}
protected void batchPerform(Project project, SvnVcs activeVcs, VirtualFile[] files, DataContext context)
throws VcsException {
SvnVcs vcs = SvnVcs.getInstance(project);
ApplicationManager.getApplication().saveAll();
Collection<String> paths = collectResolvablePaths(vcs, files);
if (paths.isEmpty()) {
Messages.showInfoMessage(project, SvnBundle.message("message.text.no.conflicts.found"), SvnBundle.message("message.title.no.conflicts.found"));
return;
}
String[] pathsArray = ArrayUtil.toStringArray(paths);
SelectFilesDialog dialog = new SelectFilesDialog(project, SvnBundle.message("label.select.files.and.directories.to.mark.resolved"),
SvnBundle.message("dialog.title.mark.resolved"),
SvnBundle.message("action.name.mark.resolved"), pathsArray, "vcs.subversion.resolve"
);
dialog.show();
if (!dialog.isOK()) {
return;
}
pathsArray = dialog.getSelectedPaths();
try {
for (String path : pathsArray) {
File ioFile = new File(path);
ConflictClient client = vcs.getFactory(ioFile).createConflictClient();
// TODO: Probably false should be passed to "resolveTree", but previous logic used true implicitly
client.resolve(ioFile, SVNDepth.EMPTY, true, true, true);
}
}
finally {
for (VirtualFile file : files) {
VcsDirtyScopeManager.getInstance(project).fileDirty(file);
file.refresh(true, false);
if (file.getParent() != null) {
file.getParent().refresh(true, false);
}
}
}
}
protected boolean isBatchAction() {
return true;
}
private static Collection<String> collectResolvablePaths(final SvnVcs vcs, VirtualFile[] files) {
final Collection<String> target = new TreeSet<String>();
for (VirtualFile file : files) {
try {
File path = new File(file.getPath());
StatusClient client = vcs.getFactory(path).createStatusClient();
client.doStatus(path, true, false, false, false, new ISVNStatusHandler() {
public void handleStatus(SVNStatus status) {
if (status.getContentsStatus() == SVNStatusType.STATUS_CONFLICTED ||
status.getPropertiesStatus() == SVNStatusType.STATUS_CONFLICTED) {
target.add(status.getFile().getAbsolutePath());
}
}
});
}
catch (SVNException e) {
LOG.warn(e);
}
}
return target;
}
}
|
