/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: Matthieu Moy
  • Date: 2006-07-25 06:10:58 UTC
  • mto: (1711.2.98 jam-integration)
  • mto: This revision was merged to the branch mainline in revision 1887.
  • Revision ID: Matthieu.Moy@imag.fr-20060725061058-d9a10e5c73fdd69d
Fixed and tested "bzr diff" outside a working tree.

Some bugs were introduced by my patch for revno:N:path revisionspec.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_outside_wt.py
41
41
                                url, retcode=3)
42
42
        self.assertEqual(u'bzr: ERROR: Not a branch:'
43
43
                         u' %s\n' % url, err)
 
44
    def test_diff_ouside_tree(self):
 
45
        os.chdir(tempfile.mkdtemp())
 
46
        self.run_bzr_captured(['init', 'branch1'])
 
47
        self.run_bzr_captured(['commit', '-m', 'nothing', '--unchanged', 'branch1'])
 
48
        self.run_bzr_captured(['commit', '-m', 'nothing', '--unchanged', 'branch1'])
 
49
        # -r X..Y
 
50
        out, err = self.run_bzr_captured(['diff', '-r', 'revno:2:branch2..revno:1'],
 
51
                                         retcode=3)
 
52
        self.assertEquals('', out)
 
53
        self.assertEqual(u'bzr: ERROR: Not a branch: %s/\n' % (getcwd(),),
 
54
                         err)
 
55
        # -r X
 
56
        out, err = self.run_bzr_captured(['diff', '-r', 'revno:2:branch2'],
 
57
                                         retcode=3)
 
58
        self.assertEquals('', out)
 
59
        self.assertEqual(u'bzr: ERROR: Not a branch: %s/\n' % (getcwd(),),
 
60
                         err)
 
61
        # -r X..
 
62
        out, err = self.run_bzr_captured(['diff', '-r', 'revno:2:branch2..'],
 
63
                                         retcode=3)
 
64
        self.assertEquals('', out)
 
65
        self.assertEqual(u'bzr: ERROR: Not a branch: %s/\n' % (getcwd(),),
 
66
                         err)
 
67
        # no -r at all.
 
68
        out, err = self.run_bzr_captured(['diff'],
 
69
                                         retcode=3)
 
70
        self.assertEquals('', out)
 
71
        self.assertEqual(u'bzr: ERROR: Not a branch: %s/\n' % (getcwd(),),
 
72
                         err)
 
73
        
 
74