Kiln » Kiln Extensions
Clone URL:  
test-revert.py
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
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
#!/usr/bin/env python # Test revert import os import common hgt = common.BfilesTester() def checkfile(file, contents): hgt.asserttrue(hgt.readfile(file) == contents, 'file contents dont match') # add size and patterns for adding as bfiles hgt.updaterc() hgt.announce('setup') os.mkdir('repo1') os.chdir('repo1') os.mkdir('dir') os.mkdir('dir/dir') hgt.hg(['init', '-q']) hgt.writefile('n1', 'n1') hgt.writefile('n2.txt', 'n2') hgt.writefile('dir/n3', 'n3') hgt.writefile('dir/dir/n4.txt', 'n4') hgt.hg(['add', 'n1', 'n2.txt', 'dir/n3', 'dir/dir/n4.txt']) hgt.writefile('b1', 'b1') hgt.writefile('b2.txt', 'b2') hgt.writefile('dir/b3', 'b3') hgt.writefile('dir/dir/b4.txt', 'b4') hgt.hg(['add', '--bf'], stdout=('adding b1 as bfile\n' 'adding b2.txt as bfile\n' 'adding dir/b3 as bfile\n' 'adding dir/dir/b4.txt as bfile\n')) hgt.hg(['status'], stdout=('A b1\n' 'A b2.txt\n' 'A dir/b3\n' 'A dir/dir/b4.txt\n' 'A dir/dir/n4.txt\n' 'A dir/n3\n' 'A n1\n' 'A n2.txt\n')) hgt.hg(['commit', '-m', 'added files']) hgt.writefile('n1', 'n2') hgt.writefile('n2.txt', 'n3') hgt.writefile('dir/n3', 'n4') hgt.writefile('dir/dir/n4.txt', 'n5') hgt.writefile('b1', 'b2') hgt.writefile('b2.txt', 'b3') hgt.writefile('dir/b3', 'b4') hgt.writefile('dir/dir/b4.txt', 'b5') hgt.hg(['commit', '-m', 'edit files']) os.mkdir('txtfiles') hgt.hg(['rename', 'glob:**.txt', 'txtfiles'], stdout=('moving dir/dir/n4.txt to txtfiles/n4.txt\n' 'moving n2.txt to txtfiles/n2.txt\n' 'moving .kbf/b2.txt to .kbf/txtfiles/b2.txt\n' 'moving .kbf/dir/dir/b4.txt to .kbf/txtfiles/b4.txt\n')) hgt.hg(['commit', '-m', 'rename files']) hgt.hg(['rm', 'n1', 'dir/b3']) hgt.hg(['commit', '-m', 'remove files']) hgt.announce('revert all') hgt.hg(['revert', '-a']) hgt.hg(['status']) hgt.hg(['revert', '-a', '-r', '0'], stdout='''reverting .kbf/b1 adding .kbf/b2.txt adding .kbf/dir/b3 adding .kbf/dir/dir/b4.txt removing .kbf/txtfiles/b2.txt removing .kbf/txtfiles/b4.txt adding dir/dir/n4.txt reverting dir/n3 adding n1 adding n2.txt removing txtfiles/n2.txt removing txtfiles/n4.txt ''') hgt.asserttrue(hgt.readfile('n1') == 'n1', 'file changed') hgt.asserttrue(hgt.readfile('n2.txt') == 'n2', 'file changed') hgt.asserttrue(hgt.readfile('dir/n3') == 'n3', 'file changed') hgt.asserttrue(hgt.readfile('dir/dir/n4.txt') == 'n4', 'file changed') hgt.asserttrue(hgt.readfile('b1') == 'b1', 'file changed') hgt.asserttrue(hgt.readfile('b2.txt') == 'b2', 'file changed') hgt.asserttrue(hgt.readfile('dir/b3') == 'b3', 'file changed') hgt.asserttrue(hgt.readfile('dir/dir/b4.txt') == 'b4', 'file changed') hgt.assertfalse(os.path.exists('txtfiles/n2.txt'), 'file shouldnt exist') hgt.assertfalse(os.path.exists('txtfiles/n4.txt'), 'file shouldnt exist') hgt.assertfalse(os.path.exists('txtfiles/b2.txt'), 'file shouldnt exist') hgt.assertfalse(os.path.exists('txtfiles/b4.txt'), 'file shouldnt exist') hgt.hg(['status'], stdout='''M b1 M dir/n3 A b2.txt A dir/b3 A dir/dir/b4.txt A dir/dir/n4.txt A n1 A n2.txt R txtfiles/b2.txt R txtfiles/b4.txt R txtfiles/n2.txt R txtfiles/n4.txt ''') hgt.hg(['revert', '-a'], stdout='''reverting .kbf/b1 forgetting .kbf/b2.txt forgetting .kbf/dir/b3 forgetting .kbf/dir/dir/b4.txt undeleting .kbf/txtfiles/b2.txt undeleting .kbf/txtfiles/b4.txt forgetting dir/dir/n4.txt reverting dir/n3 forgetting n1 forgetting n2.txt undeleting txtfiles/n2.txt undeleting txtfiles/n4.txt ''') hgt.asserttrue(hgt.readfile('n1') == 'n1', 'file changed') hgt.asserttrue(hgt.readfile('n2.txt') == 'n2', 'file changed') hgt.asserttrue(hgt.readfile('dir/n3') == 'n4', 'file changed') hgt.asserttrue(hgt.readfile('dir/n3.orig') == 'n3', 'file changed') hgt.asserttrue(hgt.readfile('dir/dir/n4.txt') == 'n4', 'file changed') hgt.asserttrue(hgt.readfile('b1') == 'b2', 'file changed') hgt.asserttrue(hgt.readfile('b1.orig') == 'b1', 'file changed') hgt.asserttrue(hgt.readfile('b2.txt') == 'b2', 'file changed') hgt.asserttrue(hgt.readfile('dir/b3') == 'b3', 'file changed') hgt.asserttrue(hgt.readfile('dir/dir/b4.txt') == 'b4', 'file changed') hgt.asserttrue(hgt.readfile('txtfiles/n2.txt') == 'n3', 'file changed') hgt.asserttrue(hgt.readfile('txtfiles/n4.txt') == 'n5', 'file changed') hgt.asserttrue(hgt.readfile('txtfiles/b2.txt') == 'b3', 'file changed') hgt.asserttrue(hgt.readfile('txtfiles/b4.txt') == 'b5', 'file changed') hgt.hg(['status'], stdout='''? b1.orig ? b2.txt ? dir/b3 ? dir/dir/b4.txt ? dir/dir/n4.txt ? dir/n3.orig ? n1 ? n2.txt ''') os.unlink('b1.orig') os.unlink('b2.txt') os.unlink('dir/dir/b4.txt') os.unlink('dir/dir/n4.txt') os.unlink('dir/n3.orig') os.unlink('n1') os.unlink('n2.txt') os.unlink('dir/b3') os.unlink('.kbf/b1.orig') hgt.announce('revert specific files') hgt.hg(['revert', '-r', '1', 'glob:**.txt'], stdout='''adding .kbf/b2.txt adding .kbf/dir/dir/b4.txt removing .kbf/txtfiles/b2.txt removing .kbf/txtfiles/b4.txt adding dir/dir/n4.txt adding n2.txt removing txtfiles/n2.txt removing txtfiles/n4.txt ''') hgt.asserttrue(hgt.readfile('n2.txt') == 'n3', 'file changed') hgt.asserttrue(hgt.readfile('dir/n3') == 'n4', 'file changed') hgt.asserttrue(hgt.readfile('dir/dir/n4.txt') == 'n5', 'file changed') hgt.asserttrue(hgt.readfile('b1') == 'b2', 'file changed') hgt.asserttrue(hgt.readfile('b2.txt') == 'b3', 'file changed') hgt.asserttrue(hgt.readfile('dir/dir/b4.txt') == 'b5', 'file changed') hgt.assertfalse(os.path.exists('txtfiles/n2.txt'), 'file shouldnt exist') hgt.assertfalse(os.path.exists('txtfiles/n4.txt'), 'file shouldnt exist') hgt.assertfalse(os.path.exists('txtfiles/b2.txt'), 'file shouldnt exist') hgt.assertfalse(os.path.exists('txtfiles/b4.txt'), 'file shouldnt exist') hgt.hg(['status'], stdout='''A b2.txt A dir/dir/b4.txt A dir/dir/n4.txt A n2.txt R txtfiles/b2.txt R txtfiles/b4.txt R txtfiles/n2.txt R txtfiles/n4.txt ''') hgt.hg(['revert', '-r', '0', 'n2.txt', 'b2.txt']) hgt.asserttrue(hgt.readfile('n2.txt') == 'n2', 'file changed') hgt.asserttrue(hgt.readfile('dir/n3') == 'n4', 'file changed') hgt.asserttrue(hgt.readfile('dir/dir/n4.txt') == 'n5', 'file changed') hgt.asserttrue(hgt.readfile('b1') == 'b2', 'file changed') hgt.asserttrue(hgt.readfile('b2.txt') == 'b2', 'file changed') hgt.asserttrue(hgt.readfile('dir/dir/b4.txt') == 'b5', 'file changed') hgt.assertfalse(os.path.exists('txtfiles/n2.txt'), 'file shouldnt exist') hgt.assertfalse(os.path.exists('txtfiles/n4.txt'), 'file shouldnt exist') hgt.assertfalse(os.path.exists('txtfiles/b2.txt'), 'file shouldnt exist') hgt.assertfalse(os.path.exists('txtfiles/b4.txt'), 'file shouldnt exist') hgt.hg(['status'], stdout='''A b2.txt A dir/dir/b4.txt A dir/dir/n4.txt A n2.txt R txtfiles/b2.txt R txtfiles/b4.txt R txtfiles/n2.txt R txtfiles/n4.txt ? b2.txt.orig ? n2.txt.orig ''') # Test that modifying a normal file and a bfile, then reverting the normal file, # does not alter the bfile os.chdir('..') os.mkdir('repo2') os.chdir('repo2') hgt.hg(['init', '-q']) hgt.writefile('n1', 'n1') hgt.hg(['add', 'n1']) hgt.hg(['commit', '-m', 'added normal file']) hgt.writefile('b1', 'b1') hgt.hg(['add', '--bf', 'b1']) hgt.hg(['commit', '-m', 'added bfile']) hgt.writefile('n1', 'n11') hgt.writefile('b1', 'b11') hgt.hg(['revert', 'n1']) hgt.asserttrue(hgt.readfile('b1') == 'b11', 'file changed') # Test that modifying 2 bfiles and reverting one of the bfiles, does not alter the # second bfile os.chdir('..') os.mkdir('repo3') os.chdir('repo3') hgt.hg(['init', '-q']) hgt.writefile('b1', 'b1') hgt.hg(['add', '--bf', 'b1']) hgt.hg(['commit', '-m', 'added first bfile']) hgt.writefile('b2', 'b2') hgt.hg(['add', '--bf', 'b2']) hgt.hg(['commit', '-m', 'added second bfile']) hgt.writefile('b1', 'b11') hgt.writefile('b2', 'b22') hgt.hg(['revert', 'b1']) hgt.asserttrue(hgt.readfile('b2') == 'b22', 'file changed') # Test that a newly added, uncommitted bfile can be reverted hgt.announce('revert uncommitted files') os.chdir('..') os.mkdir('repo4') os.chdir('repo4') hgt.hg(['init', '-q']) hgt.writefile('n1', 'n1') hgt.hg(['add', 'n1']) hgt.hg(['commit', '-m', 'add normal file']) hgt.writefile('b1', 'b1') hgt.hg(['add', '--bf', 'b1']) hgt.hg(['revert', 'b1']) hgt.hg(['status'], stdout='''? b1 ''') hgt.hg(['add', 'b1']) hgt.hg(['status'], stdout='''A b1 ''') hgt.hg(['revert', 'b1']) hgt.hg(['add', '--bf', 'b1']) hgt.hg(['revert', '--all'], stdout='''forgetting .kbf/b1 ''') hgt.hg(['status'], stdout='''? b1 ''') hgt.hg(['add', 'b1']) hgt.hg(['status'], stdout='''A b1 ''') hgt.hg(['revert', 'b1']) hgt.hg(['add', '--bf', 'b1']) hgt.hg(['commit', '-m', 'add bfile']) hgt.writefile('b2', 'b2') hgt.writefile('b3', 'b3') hgt.hg(['add', '--bf', 'b2']) hgt.hg(['revert', 'b2']) hgt.hg(['status'], stdout='''? b2 ? b3 ''') hgt.hg(['add', '--bf', 'b2']) hgt.hg(['revert', '--all'], stdout='''forgetting .kbf/b2 ''') hgt.hg(['status'], stdout='''? b2 ? b3 ''') hgt.hg(['add', '--bf'], stdout='''adding b2 as bfile adding b3 as bfile ''') hgt.hg(['revert', 'b3']) hgt.hg(['status'], stdout='''A b2 ? b3 ''') hgt.hg(['commit', '-m', 'add another bfile']) hgt.hg(['rm', 'b2']) hgt.assertfalse(os.path.exists('b2'), 'file shouldnt exist') hgt.assertfalse(os.path.exists('.kbf/b2'), 'file shouldnt exist') hgt.hg(['revert', 'b2']) hgt.asserttrue(hgt.readfile('b2') == 'b2', 'file changed') hgt.asserttrue(hgt.readfile('.kbf/b2') == '32f28ea03b1b20126629d2ca63fc6665b0bbb604\n', 'file changed') hgt.hg(['rm', 'b2']) hgt.hg(['revert', '--all'], stdout='''undeleting .kbf/b2 ''') hgt.asserttrue(hgt.readfile('b2') == 'b2', 'file changed') hgt.asserttrue(hgt.readfile('.kbf/b2') == '32f28ea03b1b20126629d2ca63fc6665b0bbb604\n', 'file changed')