← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_too_much.py

Remove the default ignores list from bzr, lowering the minimum overhead in bzr add.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_too_much.py
103
103
        self.runbzr("--pants off", retcode=3)
104
104
        self.runbzr("diff --message foo", retcode=3)
105
105
 
106
 
    def test_ignore_patterns(self):
107
 
        self.runbzr('init')
108
 
        self.assertEquals(self.capture('unknowns'), '')
109
 
 
110
 
        file('foo.tmp', 'wt').write('tmp files are ignored')
111
 
        self.assertEquals(self.capture('unknowns'), '')
112
 
 
113
 
        file('foo.c', 'wt').write('int main() {}')
114
 
        self.assertEquals(self.capture('unknowns'), 'foo.c\n')
115
 
 
116
 
        self.runbzr(['add', 'foo.c'])
117
 
        self.assertEquals(self.capture('unknowns'), '')
118
 
 
119
 
        # 'ignore' works when creating the .bzignore file
120
 
        file('foo.blah', 'wt').write('blah')
121
 
        self.assertEquals(self.capture('unknowns'), 'foo.blah\n')
122
 
        self.runbzr('ignore *.blah')
123
 
        self.assertEquals(self.capture('unknowns'), '')
124
 
        self.assertEquals(file('.bzrignore', 'rU').read(), '*.blah\n')
125
 
 
126
 
        # 'ignore' works when then .bzrignore file already exists
127
 
        file('garh', 'wt').write('garh')
128
 
        self.assertEquals(self.capture('unknowns'), 'garh\n')
129
 
        self.runbzr('ignore garh')
130
 
        self.assertEquals(self.capture('unknowns'), '')
131
 
        self.assertEquals(file('.bzrignore', 'rU').read(), '*.blah\ngarh\n')
132
 
 
133
106
    def test_revert(self):
134
107
        self.runbzr('init')
135
108
 
296
269
            self.assertEquals(out, value)
297
270
 
298
271
        bzr('init')
299
 
        open('a', 'wb').write('hello\n')
 
272
        self.build_tree_contents(
 
273
            [('.bzrignore', '*.pyo\n'),
 
274
             ('a', 'hello\n'),
 
275
             ])
300
276
 
301
277
        # Can't supply both
302
278
        bzr('ls --verbose --null', retcode=3)
303
279
 
304
 
        ls_equals('a\n')
305
 
        ls_equals('?        a\n', '--verbose')
306
 
        ls_equals('a\n', '--unknown')
 
280
        ls_equals('.bzrignore\na\n')
 
281
        ls_equals('?        .bzrignore\n'
 
282
                  '?        a\n',
 
283
                  '--verbose')
 
284
        ls_equals('.bzrignore\n'
 
285
                  'a\n',
 
286
                  '--unknown')
307
287
        ls_equals('', '--ignored')
308
288
        ls_equals('', '--versioned')
309
 
        ls_equals('a\n', '--unknown', '--ignored', '--versioned')
 
289
        ls_equals('.bzrignore\n'
 
290
                  'a\n',
 
291
                  '--unknown', '--ignored', '--versioned')
310
292
        ls_equals('', '--ignored', '--versioned')
311
 
        ls_equals('a\0', '--null')
 
293
        ls_equals('.bzrignore\0a\0', '--null')
312
294
 
313
295
        bzr('add a')
314
 
        ls_equals('V        a\n', '--verbose')
 
296
        ls_equals('?        .bzrignore\nV        a\n', '--verbose')
315
297
        bzr('commit -m add')
316
298
        
317
299
        os.mkdir('subdir')
318
 
        ls_equals('V        a\n'
 
300
        ls_equals('?        .bzrignore\n'
 
301
                  'V        a\n'
319
302
                  '?        subdir/\n'
320
303
                  , '--verbose')
321
304
        open('subdir/b', 'wb').write('b\n')
322
305
        bzr('add')
323
 
        ls_equals('V        a\n'
 
306
        ls_equals('V        .bzrignore\n'
 
307
                  'V        a\n'
324
308
                  'V        subdir/\n'
325
309
                  'V        subdir/b\n'
326
310
                  , '--verbose')
327
311
        bzr('commit -m subdir')
328
312
 
329
 
        ls_equals('a\n'
 
313
        ls_equals('.bzrignore\n'
 
314
                  'a\n'
330
315
                  'subdir\n'
331
316
                  , '--non-recursive')
332
317
 
333
 
        ls_equals('V        a\n'
 
318
        ls_equals('V        .bzrignore\n'
 
319
                  'V        a\n'
334
320
                  'V        subdir/\n'
335
321
                  , '--verbose', '--non-recursive')
336
322
 
339
325
        ls_equals('b\n')
340
326
        ls_equals('b\0'
341
327
                  , '--null')
342
 
        ls_equals('a\n'
 
328
        ls_equals('.bzrignore\n'
 
329
                  'a\n'
343
330
                  'subdir\n'
344
331
                  'subdir/b\n'
345
332
                  , '--from-root')
346
 
        ls_equals('a\0'
 
333
        ls_equals('.bzrignore\0'
 
334
                  'a\0'
347
335
                  'subdir\0'
348
336
                  'subdir/b\0'
349
337
                  , '--from-root', '--null')
350
 
        ls_equals('a\n'
 
338
        ls_equals('.bzrignore\n'
 
339
                  'a\n'
351
340
                  'subdir\n'
352
341
                  , '--from-root', '--non-recursive')
353
342
 
365
354
        os.chdir('..')
366
355
        open('blah.py', 'wb').write('unknown\n')
367
356
        open('blah.pyo', 'wb').write('ignored\n')
368
 
        ls_equals('a\n'
 
357
        ls_equals('.bzrignore\n'
 
358
                  'a\n'
369
359
                  'blah.py\n'
370
360
                  'blah.pyo\n'
371
361
                  'subdir\n'
372
362
                  'subdir/b\n')
373
 
        ls_equals('V        a\n'
 
363
        ls_equals('V        .bzrignore\n'
 
364
                  'V        a\n'
374
365
                  '?        blah.py\n'
375
366
                  'I        blah.pyo\n'
376
367
                  'V        subdir/\n'
380
371
                  , '--ignored')
381
372
        ls_equals('blah.py\n'
382
373
                  , '--unknown')
383
 
        ls_equals('a\n'
 
374
        ls_equals('.bzrignore\n'
 
375
                  'a\n'
384
376
                  'subdir\n'
385
377
                  'subdir/b\n'
386
378
                  , '--versioned')