@Override
public void run(ContinuationContext context) {
if (myTheirsBinaryChanges.isEmpty()) return;
final List<Change> converted;
try {
converted = convertPaths(myTheirsBinaryChanges);
} catch (VcsException e) {
context.handleException(e, true);
return;
}
if (converted.isEmpty()) return;
final Map<FilePath, Change> map = new HashMap<FilePath, Change>();
for (Change change : converted) {
map.put(ChangesUtil.getFilePath(change), change);
}
final Collection<FilePath> selected = chooseBinaryFiles(converted, map.keySet());
myTheirsBinaryChanges.clear();
for (FilePath filePath : selected) {
myTheirsBinaryChanges.add(map.get(filePath));
}
}
public void accept(final SVNLogEntry entry) {
final Map changedPaths = entry.getChangedPaths();
if (changedPaths == null) return;
for (Object o : changedPaths.values()) {
final SVNLogEntryPath entryPath = (SVNLogEntryPath) o;
if (entryPath != null && 'A' == entryPath.getType() && entryPath.getCopyPath() != null) {
if (myCurrentPath.equals(entryPath.getPath())) {
myHadChanged = true;
myCurrentPath = entryPath.getCopyPath();
return;
} else if (SVNPathUtil.isAncestor(entryPath.getPath(), myCurrentPath)) {
final String relativePath =
SVNPathUtil.getRelativePath(entryPath.getPath(), myCurrentPath);
myCurrentPath = SVNPathUtil.append(entryPath.getCopyPath(), relativePath);
myHadChanged = true;
return;
}
}
}
}