← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_delta.py

  • Committer: Rory Yorke
  • Date: 2010-10-20 14:38:53 UTC
  • mto: This revision was merged to the branch mainline in revision 5519.
  • Revision ID: rory.yorke@gmail.com-20101020143853-9kfd2ldcjfroh8jw
Show missing files in bzr status (bug 134168).

"bzr status" will now show missing files, that is, those added with "bzr
add" and then removed by non bzr means (e.g., rm).

Blackbox tests were added for this case, and tests were also added to
test_delta, since the implementation change is in bzrlib.delta.

Might also affect bug 189709.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_delta.py
122
122
            renamed=False, modified='created', exe_change=False,
123
123
            kind=(None, 'file'), unversioned_filter=lambda x:True)
124
124
 
 
125
    def test_missing(self):
 
126
        self.assertReport('+!  missing.c', file_id=None, path='missing.c',
 
127
             old_path=None, versioned_change='added',
 
128
             renamed=False, modified='missing', exe_change=False,
 
129
             kind=(None, None))
 
130
 
125
131
    def test_view_filtering(self):
126
132
        # If a file in within the view, it should appear in the output
127
133
        expected_lines = [
279
285
                                  ('branch/f2', '2\n'),
280
286
                                  ('branch/f3', '3\n'),
281
287
                                  ('branch/f4', '4\n'),
 
288
                                  ('branch/f5', '5\n'),
282
289
                                  ('branch/dir/',),
283
290
                                 ])
284
291
        wt.add(['f1', 'f2', 'f3', 'f4', 'dir'],
285
292
               ['f1-id', 'f2-id', 'f3-id', 'f4-id', 'dir-id'])
286
293
        wt.commit('commit one', rev_id='1')
287
294
 
 
295
        # TODO add rename,removed,etc. here?
 
296
        wt.add('f5')
 
297
        os.unlink('branch/f5')
 
298
 
288
299
        long_status = """added:
289
300
  dir/
290
301
  f1
291
302
  f2
292
303
  f3
293
304
  f4
 
305
missing:
 
306
  f5
294
307
"""
295
308
        short_status = """A  dir/
296
309
A  f1
297
310
A  f2
298
311
A  f3
299
312
A  f4
 
313
!  f5
300
314
"""
301
315
 
302
316
        repo = wt.branch.repository