Kiln » largefiles » largefiles-kiln-truncated changes meant to be shipped in Kiln Extensions to aid migration path to Mercurial-bundled largefiles
Clone URL:  

Fixed /usr/bin/python -> /usr/bin/env python.

Changeset 365d9fb077fe…

Parent 781d87b4b827…

by David Golub

Changes to 26 files · Browse files at 365d9fb077fe Showing diff from parent 781d87b4b827 Diff from another changeset...

Change 1 of 1 Show Entire File tests/​test-add.py Stacked
 
1
 
2
3
4
 
 
1
2
3
4
@@ -1,4 +1,4 @@
-#!/usr/bin/python +#!/usr/bin/env python    # Test various tricky bfadd corner cases.  
Change 1 of 1 Show Entire File tests/​test-addremove.py Stacked
 
1
 
2
3
4
 
 
1
2
3
4
@@ -1,4 +1,4 @@
-#!/usr/bin/python +#!/usr/bin/env python  #  # Test basic kiln interaction  
Change 1 of 1 Show Entire File tests/​test-archive.py Stacked
 
1
 
2
3
4
 
 
1
2
3
4
@@ -1,4 +1,4 @@
-#!/usr/bin/python +#!/usr/bin/env python    # Test various tricky bfadd corner cases.  
Change 1 of 1 Show Entire File tests/​test-backout.py Stacked
 
1
 
2
3
4
 
 
1
2
3
4
@@ -1,4 +1,4 @@
-#!/usr/bin/python +#!/usr/bin/env python  #  # Every commit needs time stamps so that the commits are unique (Mercurial backout test  # does the same thing).
Change 1 of 1 Show Entire File tests/​test-bisect.py Stacked
 
1
 
2
3
4
 
 
1
2
3
4
@@ -1,4 +1,4 @@
-#!/usr/bin/python +#!/usr/bin/env python    # Test various tricky bfadd corner cases.  
Change 1 of 1 Show Entire File tests/​test-clone.py Stacked
 
1
 
2
3
4
 
 
1
2
3
4
@@ -1,4 +1,4 @@
-#!/usr/bin/python +#!/usr/bin/env python    # Test cloning a repo  
Change 1 of 1 Show Entire File tests/​test-commit.py Stacked
 
1
 
2
3
4
 
 
1
2
3
4
@@ -1,4 +1,4 @@
-#!/usr/bin/python +#!/usr/bin/env python  #  # Test commit (lots of other tests commit all files so just try committing specific files)  #
Change 1 of 1 Show Entire File tests/​test-convert.py Stacked
 
1
 
2
3
4
 
 
1
2
3
4
@@ -1,4 +1,4 @@
-#!/usr/bin/python +#!/usr/bin/env python    # Test various tricky bfadd corner cases.  
Change 1 of 1 Show Entire File tests/​test-converttags.py Stacked
 
1
 
2
3
4
 
 
1
2
3
4
@@ -1,4 +1,4 @@
-#!/usr/bin/python +#!/usr/bin/env python    # Test that kbfconvert handles tags properly  
Change 1 of 1 Show Entire File tests/​test-copyrename.py Stacked
 
1
 
2
3
4
 
 
1
2
3
4
@@ -1,4 +1,4 @@
-#!/usr/bin/python +#!/usr/bin/env python    # Test copy and rename  
Change 1 of 1 Show Entire File tests/​test-edit.py Stacked
 
1
 
2
3
4
 
 
1
2
3
4
@@ -1,4 +1,4 @@
-#!/usr/bin/python +#!/usr/bin/env python    # Test that edited bfiles show up as modified  
Change 1 of 1 Show Entire File tests/​test-fetch.py Stacked
 
1
 
2
3
4
 
 
1
2
3
4
@@ -1,4 +1,4 @@
-#!/usr/bin/python +#!/usr/bin/env python  #  # Test the fetch extension. Always give it a specific message because the message  # it automatically adds includes the path which is randomly generated.
Change 1 of 1 Show Entire File tests/​test-forget.py Stacked
 
1
 
2
3
4
 
 
1
2
3
4
@@ -1,4 +1,4 @@
-#!/usr/bin/python +#!/usr/bin/env python    # Test remove  
Change 1 of 1 Show Entire File tests/​test-kiln.py Stacked
 
1
 
2
3
4
 
 
1
2
3
4
@@ -1,4 +1,4 @@
-#!/usr/bin/python +#!/usr/bin/env python  #  # Test basic kiln interaction  
Change 1 of 1 Show Entire File tests/​test-kilnnobfiles.py Stacked
 
1
 
2
3
4
 
 
1
2
3
4
@@ -1,4 +1,4 @@
-#!/usr/bin/python +#!/usr/bin/env python  #  # Test basic kiln interaction  
Change 1 of 1 Show Entire File tests/​test-outgoing.py Stacked
 
1
 
2
3
4
 
 
1
2
3
4
@@ -1,4 +1,4 @@
-#!/usr/bin/python +#!/usr/bin/env python  #  # Test summary  
Change 1 of 1 Show Entire File tests/​test-permissions.py Stacked
 
1
 
2
3
4
 
 
1
2
3
4
@@ -1,4 +1,4 @@
-#!/usr/bin/python +#!/usr/bin/env python    # Test various tricky bfadd corner cases.  
Change 1 of 1 Show Changes Only tests/​test-pushpull.py Stacked
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
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
 
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
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
-#!/usr/bin/python +#!/usr/bin/env python    # Test push pull    import os  import common    hgt = common.BfilesTester()    # add size and patterns for adding as bfiles  hgt.updaterc()  hgt.announce('setup')  os.mkdir('repo1')  os.chdir('repo1')  hgt.hg(['init'])  os.mkdir('dir')  hgt.writefile('b1', 'b1')  hgt.writefile('n1', 'n1')  hgt.writefile('dir/b2', 'b2')  hgt.writefile('dir/n2', 'n2')  hgt.hg(['add', '--bf', 'b1', 'dir/b2'])  hgt.hg(['add', 'n1', 'dir/n2'])  hgt.hg(['commit', '-m', 'added files'])  os.chdir('..')  hgt.hg(['clone', 'repo1', 'repo2'],   stdout='''updating to branch default  4 files updated, 0 files merged, 0 files removed, 0 files unresolved  getting changed bfiles  2 big files updated, 0 removed  ''')  common.checkrepos(hgt, 'repo1', 'repo2', [0])    hgt.announce('push and merge')  os.chdir('repo2')  hgt.writefile('dir/b2', 'b3')  hgt.writefile('dir/n2', 'n3')  hgt.writefile('b3', 'b3')  hgt.writefile('n3', 'n3')  hgt.hg(['add', '--bf', 'b3'])  hgt.hg(['add', 'n3'])  hgt.hg(['commit', '-m', 'changed and add'])  os.chdir('../repo1')  hgt.writefile('b1', 'b2')  hgt.writefile('n1', 'n2')  hgt.writefile('dir/b4', 'b4')  hgt.writefile('dir/n4', 'n4')  hgt.hg(['add', '--bf', 'dir/b4'])  hgt.hg(['add', 'dir/n4'])  hgt.hg(['commit', '-m', 'changed and add'])  hgt.hg(['pull', '../repo2'],   stdout='''pulling from ../repo2  searching for changes  adding changesets  adding manifests  adding file changes  added 1 changesets with 4 changes to 4 files (+1 heads)  (run 'hg heads' to see heads, 'hg merge' to merge)  ''')  hgt.hg(['merge'],   stdout='''4 files updated, 0 files merged, 0 files removed, 0 files unresolved  (branch merge, don't forget to commit)  getting changed bfiles  2 big files updated, 0 removed  ''')  hgt.asserttrue(os.path.exists('b3'), 'merged bfile should exist')  hgt.asserttrue(os.path.exists('.kbf/b3'), 'merged bfile should exist')  hgt.hg(['commit', '-m', 'merge'])  hgt.hg(['push', '../repo2'],   stdout='''pushing to ../repo2  searching for changes  searching for changes  adding changesets  adding manifests  adding file changes  added 2 changesets with 4 changes to 4 files  ''')  os.chdir('..')  common.checkrepos(hgt, 'repo1', 'repo2', [0, 3])    hgt.announce('just push')  os.chdir('repo2')  hgt.hg(['remove', 'b3'])  hgt.writefile('b1', 'tomrocks')  hgt.hg(['commit', '-m', 'update files'])  hgt.hg(['push', '../repo1'],   stdout='''pushing to ../repo1  searching for changes  searching for changes  adding changesets  adding manifests  adding file changes  added 1 changesets with 1 changes to 1 files  ''')  os.chdir('..')  common.checkrepos(hgt, 'repo1', 'repo2', [0, 3, 4])    os.chdir('repo1')  hgt.writefile('dir/b1.foo', 'foo1')  hgt.writefile('dir/b2.foo', 'foo1')  hgt.writefile('dir/b3.foo', 'foo1')  hgt.writefile('dir/b4.foo', 'foo1')  hgt.writefile('dir/b5', 'should not add')  hgt.writefile('dir/blahblah', 'should not add')  hgt.writefile('dir/stuffnthings', 'should not add')  hgt.hg(['add', '--bf', 'glob:**.foo'],   stdout='''adding dir/b1.foo as bfile  adding dir/b2.foo as bfile  adding dir/b3.foo as bfile  adding dir/b4.foo as bfile  ''')  hgt.hg(['commit', '-m', 'add some files'])  hgt.hg(['status', '-A'],   stdout='''? dir/b5  ? dir/blahblah  ? dir/stuffnthings  C b1  C dir/b1.foo  C dir/b2  C dir/b2.foo  C dir/b3.foo  C dir/b4  C dir/b4.foo  C dir/n2  C dir/n4  C n1  C n3  ''')  os.unlink('dir/b5')  os.unlink('dir/blahblah')  os.unlink('dir/stuffnthings')  hgt.hg(['status', '-A'],   stdout='''C b1  C dir/b1.foo  C dir/b2  C dir/b2.foo  C dir/b3.foo  C dir/b4  C dir/b4.foo  C dir/n2  C dir/n4  C n1  C n3  ''')  hgt.hg(['push', '../repo2'],   stdout='''pushing to ../repo2  searching for changes  searching for changes  adding changesets  adding manifests  adding file changes  added 1 changesets with 4 changes to 4 files  ''')  os.chdir('..')  common.checkrepos(hgt, 'repo1', 'repo2', [0, 3, 4, 5])    hgt.announce('rename edit')  os.chdir('repo1')  hgt.writefile('dir/b2.foo', 'foo2')  hgt.writefile('n1', 'change normal1')  hgt.hg(['commit', '-m', 'edit b2.foo and n1'])  os.chdir('../repo2')  hgt.hg(['rename', 'dir/b2.foo', 'dir/b2222.foo'])  hgt.hg(['rename', 'n1', 'n1111'])  hgt.hg(['commit', '-m', 'rename b2.foo and n1'])  hgt.hg(['pull', '../repo1'],   stdout='''pulling from ../repo1  searching for changes  adding changesets  adding manifests  adding file changes  added 1 changesets with 2 changes to 2 files (+1 heads)  (run 'hg heads' to see heads, 'hg merge' to merge)  ''')  hgt.hg(['heads'],   stdout='''changeset: 7:4ca7018cd3ad  tag: tip  parent: 5:9ac6c128161c  user: test  date: Thu Jan 01 00:00:00 1970 +0000  summary: edit b2.foo and n1    changeset: 6:09ca64279b78  user: test  date: Thu Jan 01 00:00:00 1970 +0000  summary: rename b2.foo and n1    ''')  hgt.hg(['merge'],   stdout='''merging dir/b2222.foo and dir/b2.foo to dir/b2222.foo  merging n1111 and n1 to n1111  0 files updated, 2 files merged, 0 files removed, 0 files unresolved  (branch merge, don't forget to commit)  getting changed bfiles  1 big files updated, 0 removed  ''')  hgt.asserttrue(hgt.readfile('dir/b2222.foo') == 'foo2', 'merge failed')  hgt.hg(['commit', '-m', 'merge'])  os.chdir('../repo1')  hgt.hg(['pull', '../repo2'],   stdout='''pulling from ../repo2  searching for changes  adding changesets  adding manifests  adding file changes  added 2 changesets with 4 changes to 2 files  (run 'hg update' to get a working copy)  ''')  hgt.hg(['up'],   stdout='''2 files updated, 0 files merged, 2 files removed, 0 files unresolved  getting changed bfiles  1 big files updated, 1 removed  ''')  os.chdir('..')  common.checkrepos(hgt, 'repo1', 'repo2', [0, 3, 4, 5, 8])    hgt.announce('both edit to same value')  os.chdir('repo2')  hgt.writefile('dir/b3.foo', 'change')  hgt.writefile('n3', 'change')  # Set date because otherwise the two commits will be identical  # because the test suite normally changes dates to one value  hgt.hg(['commit', '-m', 'change dir/b3.foo and n3', '-d', '2007-1-1'])  os.chdir('../repo1')  hgt.writefile('dir/b3.foo', 'change')  hgt.writefile('n3', 'change')  hgt.hg(['commit', '-m', 'change dir/b3.foo and n3', '-d', '2006-1-1'])  hgt.hg(['pull', '../repo2'],   stdout='''pulling from ../repo2  searching for changes  adding changesets  adding manifests  adding file changes  added 1 changesets with 0 changes to 2 files (+1 heads)  (run 'hg heads' to see heads, 'hg merge' to merge)  ''')  hgt.hg(['merge'],   stdout='''0 files updated, 0 files merged, 0 files removed, 0 files unresolved  (branch merge, don't forget to commit)  getting changed bfiles  0 big files updated, 0 removed  ''')  hgt.hg(['commit', '-m', 'merge'])  os.chdir('../repo2')  hgt.hg(['pull', '../repo1'],   stdout='''pulling from ../repo1  searching for changes  adding changesets  adding manifests  adding file changes  added 2 changesets with 0 changes to 2 files  (run 'hg update' to get a working copy)  ''')  hgt.hg(['up'],   stdout='''0 files updated, 0 files merged, 0 files removed, 0 files unresolved  getting changed bfiles  0 big files updated, 0 removed  ''')  os.chdir('..')  common.checkrepos(hgt, 'repo1', 'repo2', [0, 3, 4, 5, 8, 11])    hgt.announce('delete edit')  os.chdir('repo1')  hgt.hg(['rm', 'dir/b3.foo', 'n3'])  hgt.hg(['commit', '-m', 'remove dir/b3.foo and n3'])  os.chdir('../repo2')  hgt.writefile('dir/b3.foo', 'changechange')  hgt.writefile('n3', 'changechange')  hgt.hg(['commit', '-m', 'edit dir/b3.foo and n3'])  hgt.hg(['pull', '../repo1'],   stdout='''pulling from ../repo1  searching for changes  adding changesets  adding manifests  adding file changes  added 1 changesets with 0 changes to 0 files (+1 heads)  (run 'hg heads' to see heads, 'hg merge' to merge)  ''')  hgt.hg(['merge'],   stdout=''' local changed .kbf/dir/b3.foo which remote deleted  use (c)hanged version or (d)elete? c   local changed n3 which remote deleted  use (c)hanged version or (d)elete? c  0 files updated, 0 files merged, 0 files removed, 0 files unresolved  (branch merge, don't forget to commit)  getting changed bfiles  0 big files updated, 0 removed  ''')  hgt.hg(['commit', '-m', 'merge'])  hgt.hg(['push', '../repo1'],   stdout='''pushing to ../repo1  searching for changes  searching for changes  adding changesets  adding manifests  adding file changes  added 2 changesets with 2 changes to 2 files  ''')  os.chdir('../repo1')  hgt.hg(['up'],   stdout='''2 files updated, 0 files merged, 0 files removed, 0 files unresolved  getting changed bfiles  1 big files updated, 0 removed  ''')  os.chdir('..')  common.checkrepos(hgt, 'repo1', 'repo2', [0, 3, 4, 5, 8, 11, 14])    hgt.announce('copy edit')  os.chdir('repo1')  hgt.hg(['cp', 'dir/b3.foo', 'dir/b3333.foo'])  hgt.hg(['cp', 'n3', 'n3333'])  hgt.hg(['commit', '-m', 'copy dir/b3.foo and n3'])  os.chdir('../repo2')  hgt.writefile('dir/b3.foo', 'changechangechange')  hgt.writefile('n3', 'changechangechange')  hgt.hg(['commit', '-m', 'edit dir/b3.foo and n3'])  hgt.hg(['pull', '../repo1'],   stdout='''pulling from ../repo1  searching for changes  adding changesets  adding manifests  adding file changes  added 1 changesets with 2 changes to 2 files (+1 heads)  (run 'hg heads' to see heads, 'hg merge' to merge)  ''')  hgt.hg(['merge'],   stdout='''merging dir/b3.foo and dir/b3333.foo to dir/b3333.foo  merging n3 and n3333 to n3333  0 files updated, 2 files merged, 0 files removed, 0 files unresolved  (branch merge, don't forget to commit)  getting changed bfiles  1 big files updated, 0 removed  ''')  hgt.asserttrue(hgt.readfile('dir/b3.foo') == 'changechangechange', 'merge failed')  hgt.asserttrue(hgt.readfile('dir/b3333.foo') == 'changechangechange', 'merge failed')  hgt.hg(['commit', '-m', 'merge'])  hgt.hg(['push', '../repo1'],   stdout='''pushing to ../repo1  searching for changes  searching for changes  adding changesets  adding manifests  adding file changes  added 2 changesets with 4 changes to 4 files  ''')  os.chdir('../repo1')  hgt.hg(['up'],   stdout='''4 files updated, 0 files merged, 0 files removed, 0 files unresolved  getting changed bfiles  2 big files updated, 0 removed  ''')  os.chdir('..')  common.checkrepos(hgt, 'repo1', 'repo2', [0, 3, 4, 5, 8, 11, 14, 17])
Change 1 of 1 Show Entire File tests/​test-remove.py Stacked
 
1
 
2
3
4
 
 
1
2
3
4
@@ -1,4 +1,4 @@
-#!/usr/bin/python +#!/usr/bin/env python    # Test remove  
Change 1 of 1 Show Entire File tests/​test-reposetup.py Stacked
 
1
 
2
3
4
 
 
1
2
3
4
@@ -1,4 +1,4 @@
-#!/usr/bin/python +#!/usr/bin/env python    # Test that bfiles does not conflict with other extensions  # (e.g. bookmarks) that override localrepository.commit().
Change 1 of 1 Show Entire File tests/​test-revert.py Stacked
 
1
 
2
3
4
 
 
1
2
3
4
@@ -1,4 +1,4 @@
-#!/usr/bin/python +#!/usr/bin/env python    # Test revert  
Change 1 of 1 Show Entire File tests/​test-schemes.py Stacked
 
1
 
2
3
4
 
 
1
2
3
4
@@ -1,4 +1,4 @@
-#!/usr/bin/python +#!/usr/bin/env python  #  # Test schemes with kiln  
Change 1 of 1 Show Entire File tests/​test-status.py Stacked
 
1
 
2
3
4
 
 
1
2
3
4
@@ -1,4 +1,4 @@
-#!/usr/bin/python +#!/usr/bin/env python    # Test status  
Change 1 of 1 Show Entire File tests/​test-summary.py Stacked
 
1
 
2
3
4
 
 
1
2
3
4
@@ -1,4 +1,4 @@
-#!/usr/bin/python +#!/usr/bin/env python  #  # Test summary  
Change 1 of 1 Show Entire File tests/​test-update.py Stacked
 
1
 
2
3
4
 
 
1
2
3
4
@@ -1,4 +1,4 @@
-#!/usr/bin/python +#!/usr/bin/env python    # Test update/update -c/update -C  
Change 1 of 1 Show Entire File tests/​test-verify.py Stacked
 
1
 
2
3
4
 
 
1
2
3
4
@@ -1,4 +1,4 @@
-#!/usr/bin/python +#!/usr/bin/env python  #  # Test verify