/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: Robert Collins
  • Date: 2007-07-02 05:26:25 UTC
  • mfrom: (2566 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2568.
  • Revision ID: robertc@robertcollins.net-20070702052625-motr7ljwhmqvw9rg
Merge with bzr.dev.

Show diffs side-by-side

added added

removed removed

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