← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Martin Pool
  • Date: 2006-04-13 05:51:35 UTC
  • mto: This revision was merged to the branch mainline in revision 1662.
  • Revision ID: mbp@sourcefrog.net-20060413055135-1a40ec5436f0dbd0
diff on unversiond files should give an error (Malone #3619)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_diff.py
55
55
        # (Malone #3619)
56
56
        self.make_example_branch()
57
57
        out, err = self.runbzr('diff does-not-exist', retcode=3)
58
 
        # should be an error that refers to the file that causes a problem
59
58
        self.assertContainsRe(err, 'not versioned.*does-not-exist')
60
59
 
61
 
        # TODO: Get an error diffing a file that is not versioned
62
 
        # TODO: How to handle a file deleted in working tree?
 
60
    def test_diff_unversioned(self):
 
61
        # Get an error when diffing a non-versioned file.
 
62
        # (Malone #3619)
 
63
        self.make_example_branch()
 
64
        self.build_tree(['unversioned-file'])
 
65
        out, err = self.runbzr('diff unversioned-file', retcode=3)
 
66
        self.assertContainsRe(err, 'not versioned.*unversioned-file')
 
67
 
 
68
    # TODO: What should diff say for a file deleted in working tree?
63
69
 
64
70
    def example_branches(self):
65
71
        self.build_tree(['branch1/', 'branch1/file'], line_endings='binary')