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
|
package org.jetbrains.idea.svn.integrate;
import com.intellij.openapi.vcs.VcsException;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.idea.svn.api.BaseSvnClient;
import org.jetbrains.idea.svn.api.Depth;
import org.jetbrains.idea.svn.api.ProgressTracker;
import org.jetbrains.idea.svn.commandLine.*;
import org.jetbrains.idea.svn.diff.DiffOptions;
import org.tmatesoft.svn.core.wc.SVNRevisionRange;
import org.tmatesoft.svn.core.wc2.SvnTarget;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
/**
* @author Konstantin Kolosovsky.
*/
public class CmdMergeClient extends BaseSvnClient implements MergeClient {
@Override
public void merge(@NotNull SvnTarget source,
@NotNull File destination,
boolean dryRun,
@Nullable DiffOptions diffOptions,
@Nullable final ProgressTracker handler) throws VcsException {
assertUrl(source);
List<String> parameters = new ArrayList<String>();
CommandUtil.put(parameters, source);
fillParameters(parameters, destination, null, dryRun, false, false, true, diffOptions);
run(destination, handler, parameters);
}
@Override
public void merge(@NotNull SvnTarget source,
@NotNull SVNRevisionRange range,
@NotNull File destination,
@Nullable Depth depth,
boolean dryRun,
boolean recordOnly,
boolean force,
@Nullable DiffOptions diffOptions,
@Nullable ProgressTracker handler) throws VcsException {
assertUrl(source);
List<String> parameters = new ArrayList<String>();
parameters.add("--revision");
parameters.add(range.getStartRevision() + ":" + range.getEndRevision());
CommandUtil.put(parameters, source);
fillParameters(parameters, destination, depth, dryRun, recordOnly, force, false, diffOptions);
run(destination, handler, parameters);
}
@Override
public void merge(@NotNull SvnTarget source1,
@NotNull SvnTarget source2,
@NotNull File destination,
@Nullable Depth depth,
boolean useAncestry,
boolean dryRun,
boolean recordOnly,
boolean force,
@Nullable DiffOptions diffOptions,
@Nullable ProgressTracker handler) throws VcsException {
assertUrl(source1);
assertUrl(source2);
List<String> parameters = new ArrayList<String>();
CommandUtil.put(parameters, source1);
CommandUtil.put(parameters, source2);
fillParameters(parameters, destination, depth, dryRun, recordOnly, force, false, diffOptions);
CommandUtil.put(parameters, !useAncestry, "--ignore-ancestry");
run(destination, handler, parameters);
}
private static void fillParameters(@NotNull List<String> parameters,
@NotNull File destination,
@Nullable Depth depth,
boolean dryRun,
boolean recordOnly,
boolean force,
boolean reintegrate,
@Nullable DiffOptions diffOptions) {
CommandUtil.put(parameters, destination);
CommandUtil.put(parameters, diffOptions);
CommandUtil.put(parameters, dryRun, "--dry-run");
CommandUtil.put(parameters, depth);
CommandUtil.put(parameters, force, "--force");
CommandUtil.put(parameters, recordOnly, "--record-only");
parameters.add("--accept");
parameters.add("postpone");
// deprecated for 1.8, but should be specified for previous clients
CommandUtil.put(parameters, reintegrate, "--reintegrate");
}
private void run(File destination, ProgressTracker handler, List<String> parameters) throws VcsException {
BaseUpdateCommandListener listener = new BaseUpdateCommandListener(CommandUtil.correctUpToExistingParent(destination), handler);
execute(myVcs, SvnTarget.fromFile(destination), SvnCommandName.merge, parameters, listener);
listener.throwWrappedIfException();
}
}
|
