-
Notifications
You must be signed in to change notification settings - Fork 5
/
Copy path29update-props.t
219 lines (195 loc) · 5.87 KB
/
29update-props.t
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
#!/usr/bin/perl -w
use strict;
use Test::More tests => 42;
use File::Path;
use Cwd;
use SVK::Test;
my ($xd, $svk) = build_test();
our $output;
my ($copath, $corpath) = get_copath();
my (undef, undef, $repos) = $xd->find_repos ('//', 1);
my $uuid = $repos->fs->get_uuid;
$svk->mkdir ('-m', 'trunk', '//trunk');
my $tree = create_basic_tree ($xd, '//trunk');
$svk->ps ('-m', 'set prop', 'prop', 'value', '//trunk/me');
$svk->co ('//trunk', $copath);
flush_co();
# the same prop in outdated checkout
{
$svk->ps ('prop', 'value', "$copath/me");
is_output($svk, 'up', ['-C', $copath], [
"Syncing //trunk(/trunk) in $corpath to 4.",
__(" g $copath/me"),
] );
is_output($svk, 'up', [$copath], [
"Syncing //trunk(/trunk) in $corpath to 4.",
__( " g $copath/me"),
] );
is_output($svk, 'st', [$copath], [
] );
is_output($svk, 'di', [$copath], [
] );
}
flush_co();
# different prop in outdated checkout
{
$svk->ps ('another-prop', 'value', "$copath/me");
is_output($svk, 'up', ['-C', $copath], [
"Syncing //trunk(/trunk) in $corpath to 4.",
__(" U $copath/me"),
] );
is_output($svk, 'up', [$copath], [
"Syncing //trunk(/trunk) in $corpath to 4.",
__(" U $copath/me"),
] );
is_output($svk, 'st', [$copath], [
__(" M $copath/me"),
] );
is_output($svk, 'di', [$copath], [
"",
__("Property changes on: $copath/me"),
"___________________________________________________________________",
"Name: another-prop",
" +value",
"",
] );
}
flush_co();
# conflict on update
{
$svk->ps ('prop', 'another-value', "$copath/me");
is_output($svk, 'up', ['-C', $copath], [
"Syncing //trunk(/trunk) in $corpath to 4.",
__(" C $copath/me"),
"1 conflict found.",
] );
is_output($svk, 'up', [$copath], [
"Syncing //trunk(/trunk) in $corpath to 4.",
__(" C $copath/me"),
"1 conflict found.",
] );
is_output($svk, 'st', [$copath], [
__(" C $copath/me"),
] );
# XXX: this looks wierd a littl without line endings
is_output($svk, 'di', [$copath], [
"",
__("Property changes on: $copath/me"),
"___________________________________________________________________",
"Name: prop",
" -value",
qr" \+>>>> YOUR VERSION Property prop of me \(/trunk\) \d+",
qr" \+another-value==== ORIGINAL VERSION Property prop of me \d+",
qr" \+==== THEIR VERSION Property prop of me \(/trunk\) \d+",
qr" \+value<<<< \d+",
" +",
"",
] );
# TODO: test resolved command, test ps command
}
# TODO: test props resolver on update
### The same tests on a dir instead of file
$svk->ps ('-m', 'set prop', 'prop', 'value', '//trunk/A');
flush_co_dir();
# the same prop on a dir in outdated checkout
{
$svk->ps ('prop', 'value', "$copath/A");
is_output($svk, 'up', ['-C', $copath], [
"Syncing //trunk(/trunk) in $corpath to 5.",
__(" g $copath/A"),
] );
is_output($svk, 'up', [$copath], [
"Syncing //trunk(/trunk) in $corpath to 5.",
__(" g $copath/A"),
] );
is_output($svk, 'st', [$copath], [
] );
is_output($svk, 'di', [$copath], [
] );
}
flush_co_dir();
# different prop in outdated checkout
{
$svk->ps ('another-prop', 'value', "$copath/A");
is_output($svk, 'up', ['-C', $copath], [
"Syncing //trunk(/trunk) in $corpath to 5.",
__(" U $copath/A"),
] );
is_output($svk, 'up', [$copath], [
"Syncing //trunk(/trunk) in $corpath to 5.",
__(" U $copath/A"),
] );
is_output($svk, 'st', [$copath], [
__(" M $copath/A"),
] );
is_output($svk, 'di', [$copath], [
"",
__("Property changes on: $copath/A"),
"___________________________________________________________________",
"Name: another-prop",
" +value",
"",
] );
}
flush_co_dir();
# conflict on update
{
$svk->ps ('prop', 'another-value', "$copath/A");
is_output($svk, 'up', ['-C', $copath], [
"Syncing //trunk(/trunk) in $corpath to 5.",
__(" C $copath/A"),
"1 conflict found.",
] );
is_output($svk, 'up', [$copath], [
"Syncing //trunk(/trunk) in $corpath to 5.",
__(" C $copath/A"),
"1 conflict found.",
] );
is_output($svk, 'st', [$copath], [
__(" C $copath/A"),
] );
# XXX: this looks wierd a littl without line endings
is_output($svk, 'di', [$copath], [
"",
__("Property changes on: $copath/A"),
"___________________________________________________________________",
"Name: prop",
" -value",
qr" \+>>>> YOUR VERSION Property prop of A \(/trunk\) \d+",
qr" \+another-value==== ORIGINAL VERSION Property prop of A \d+",
qr" \+==== THEIR VERSION Property prop of A \(/trunk\) \d+",
qr" \+value<<<< \d+",
" +",
"",
] );
# TODO: test resolved command, test ps command
}
# flush to required state: revert, update to revision before propset on //trunk
sub flush_co {
$svk->revert('-R', $copath);
$svk->up($copath);
$svk->up('-r3', $copath);
is_output($svk, 'up', ['-C', $copath], [
#XXX, TODO: why it's corpath instead copath?
"Syncing //trunk(/trunk) in $corpath to 4.",
__(" U $copath/me"),
] );
is_output($svk, 'st', [$copath], [
] );
is_output($svk, 'di', [$copath], [
] );
}
sub flush_co_dir {
$svk->revert('-R', $copath);
$svk->up($copath);
$svk->up('-r4', $copath);
is_output($svk, 'up', ['-C', $copath], [
#XXX, TODO: why it's corpath instead copath?
"Syncing //trunk(/trunk) in $corpath to 5.",
__(" U $copath/A"),
] );
is_output($svk, 'st', [$copath], [
] );
is_output($svk, 'di', [$copath], [
] );
}