-
-
Notifications
You must be signed in to change notification settings - Fork 15
/
Merge.php
245 lines (239 loc) · 9.35 KB
/
Merge.php
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
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
<?php
/* vim: set expandtab tabstop=4 shiftwidth=4: */
/**
* +----------------------------------------------------------------------+
* | This LICENSE is in the BSD license style. |
* | http://www.opensource.org/licenses/bsd-license.php |
* | |
* | Redistribution and use in source and binary forms, with or without |
* | modification, are permitted provided that the following conditions |
* | are met: |
* | |
* | * Redistributions of source code must retain the above copyright |
* | notice, this list of conditions and the following disclaimer. |
* | |
* | * Redistributions in binary form must reproduce the above |
* | copyright notice, this list of conditions and the following |
* | disclaimer in the documentation and/or other materials provided |
* | with the distribution. |
* | |
* | * Neither the name of Clay Loveless nor the names of contributors |
* | may be used to endorse or promote products derived from this |
* | software without specific prior written permission. |
* | |
* | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |
* | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |
* | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS |
* | FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE |
* | COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, |
* | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
* | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
* | LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER |
* | CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT |
* | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN |
* | ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
* | POSSIBILITY OF SUCH DAMAGE. |
* +----------------------------------------------------------------------+
*
* PHP version 5
*
* @category VersionControl
* @package VersionControl_SVN
* @author Clay Loveless <clay@killersoft.com>
* @author Alexander Opitz <opitz.alexander@gmail.com>
* @copyright 2004-2007 Clay Loveless
* @license http://www.opensource.org/licenses/bsd-license.php BSD License
* @link http://pear.php.net/package/VersionControl_SVN
*/
require_once 'VersionControl/SVN/Command.php';
/**
* Subversion Merge command manager class
*
* Apply the differences between two sources to a working copy path.
*
* From 'svn merge --help':
*
* usage: 1. merge sourceURL1[@N] sourceURL2[@M] [WCPATH]
* 2. merge sourceWCPATH1@N sourceWCPATH2@M [WCPATH]
* 3. merge -r N:M SOURCE [WCPATH]
*
* 1. In the first form, the source URLs are specified at revisions
* N and M. These are the two sources to be compared. The revisions
* default to HEAD if omitted.
*
* 2. In the second form, the URLs corresponding to the source working
* copy paths define the sources to be compared. The revisions must
* be specified.
*
* 3. In the third form, SOURCE can be a URL, or working copy item
* in which case the corresponding URL is used. This URL, at
* revisions N and M, defines the two sources to be compared.
*
* WCPATH is the working copy path that will receive the changes.
* If WCPATH is omitted, a default value of '.' is assumed, unless
* the sources have identical basenames that match a file within '.':
* in which case, the differences will be applied to that file.
*
* Conversion of the above usage examples to VersionControl_SVN_Merge:
*
* Example 1:
* <code>
* <?php
* require_once 'VersionControl/SVN.php';
*
* // Set up runtime options. Will be passed to all
* // subclasses.
* $options = array('fetchmode' => VERSIONCONTROL_SVN_FETCHMODE_RAW);
*
* $args = array(
* 'svn://svn.example.com/repos/TestProj/trunk/example.php@4', // sourceurl1
* 'svn://svn.example.com/repos/TestProj/branch/example.php@15', // sourceurl2
* '/path/to/working/copy' // wcpath
* );
*
* $svn = VersionControl_SVN::factory(array('merge'), $options);
* try {
* print_r($svn->merge->run($args, $switches));
* } catch (VersionControl_SVN_Exception $e) {
* print_r($e->getMessage());
* }
* ?>
* </code>
*
* Example 2:
* <code>
* <?php
* require_once 'VersionControl/SVN.php';
*
* // Set up runtime options. Will be passed to all
* // subclasses.
* $options = array('fetchmode' => VERSIONCONTROL_SVN_FETCHMODE_RAW);
*
* $args = array(
* '/path/to/working/copy/trunk/example.php@4', // wcpath1
* '/path/to/working/copy/branch/example.php@15' // wcpath2
* );
*
* $svn = VersionControl_SVN::factory(array('merge'), $options);
* try {
* print_r($svn->merge->run($args, $switches));
* } catch (VersionControl_SVN_Exception $e) {
* print_r($e->getMessage());
* }
* ?>
* </code>
*
* Example 3:
* <code>
* <?php
* require_once 'VersionControl/SVN.php';
*
* // Set up runtime options. Will be passed to all
* // subclasses.
* $options = array('fetchmode' => VERSIONCONTROL_SVN_FETCHMODE_RAW);
*
* $switches = array('r' => '5:8');
* $args = array('svn://svn.example.com/repos/TestProj/trunk/example.php');
*
* $svn = VersionControl_SVN::factory(array('merge'), $options);
* try {
* print_r($svn->merge->run($args, $switches));
* } catch (VersionControl_SVN_Exception $e) {
* print_r($e->getMessage());
* }
* ?>
* </code>
*
* $switches is an array containing one or more command line options
* defined by the following associative keys:
*
* <code>
*
* $switches = array(
* 'r [revision]' => 'ARG (some commands also take ARG1:ARG2 range)
* A revision argument can be one of:
* NUMBER revision number
* "{" DATE "}" revision at start of the date
* "HEAD" latest in repository
* "BASE" base rev of item's working copy
* "COMMITTED" last commit at or before BASE
* "PREV" revision just before COMMITTED',
* // either 'r' or 'revision' may be used
* 'q [quiet]' => true|false,
* // print as little as possible
* 'dry-run' => true|false,
* // try operation but make no changes
* 'force' => true|false,
* // force operation to run
* 'N' => true|false,
* // operate on single directory only
* 'non-recursive' => true|false,
* // operate on single directory only
* 'diff3-cmd' => 'ARG',
* // use ARG as merge command
* 'ignore-ancestry' => true|false,
* // ignore ancestry when calculating merges
* 'username' => 'Subversion repository login',
* 'password' => 'Subversion repository password',
* 'no-auth-cache' => true|false,
* // Do not cache authentication tokens
* 'config-dir' => 'Path to a Subversion configuration directory'
* );
*
* </code>
*
* Note: Subversion does not offer an XML output option for this subcommand
*
* The non-interactive option available on the command-line
* svn client may also be set (true|false), but it is set to true by default.
*
* @category VersionControl
* @package VersionControl_SVN
* @author Clay Loveless <clay@killersoft.com>
* @author Alexander Opitz <opitz.alexander@gmail.com>
* @license http://www.opensource.org/licenses/bsd-license.php BSD License
* @version @version@
* @link http://pear.php.net/package/VersionControl_SVN
*/
class VersionControl_SVN_Command_Merge extends VersionControl_SVN_Command
{
/**
* Minimum number of args required by this subcommand.
* See {@link http://svnbook.red-bean.com/svnbook/ Version Control with Subversion},
* Subversion Complete Reference for details on arguments for this subcommand.
*
* @var int $minArgs
*/
protected $minArgs = 1;
/**
* Constuctor of command. Adds available switches.
*/
public function __construct()
{
parent::__construct();
$this->validSwitchesValue = array_merge(
$this->validSwitchesValue,
array(
'r', 'revision',
'c', 'change',
'depth',
'diff-cmd',
'x', 'extensions',
'accept'
)
);
$this->validSwitches = array_merge(
$this->validSwitches,
array(
'N', 'non-recursive',
'q', 'quiet',
'force',
'dry-run',
'record-only',
'ignore-ancestry',
'reintegrated',
)
);
}
}
?>