← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_outside_wt.py
1
1
# Copyright (C) 2006 by Canonical Ltd
2
2
# -*- coding: utf-8 -*-
3
 
 
 
3
#
4
4
# This program is free software; you can redistribute it and/or modify
5
5
# it under the terms of the GNU General Public License as published by
6
6
# the Free Software Foundation; either version 2 of the License, or
7
7
# (at your option) any later version.
8
 
 
 
8
#
9
9
# This program is distributed in the hope that it will be useful,
10
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
12
12
# GNU General Public License for more details.
13
 
 
 
13
#
14
14
# You should have received a copy of the GNU General Public License
15
15
# along with this program; if not, write to the Free Software
16
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
41
41
                                url, retcode=3)
42
42
        self.assertEqual(u'bzr: ERROR: Not a branch:'
43
43
                         u' %s\n' % url, err)
 
44
 
 
45
    def test_diff_ouside_tree(self):
 
46
        os.chdir(tempfile.mkdtemp())
 
47
        self.run_bzr_captured(['init', 'branch1'])
 
48
        self.run_bzr_captured(['commit', '-m', 'nothing', 
 
49
                               '--unchanged', 'branch1'])
 
50
        self.run_bzr_captured(['commit', '-m', 'nothing', 
 
51
                               '--unchanged', 'branch1'])
 
52
        # -r X..Y
 
53
        out, err = self.run_bzr_captured(['diff', 
 
54
                                          '-r', 'revno:2:branch2..revno:1'],
 
55
                                         retcode=3)
 
56
        self.assertEquals('', out)
 
57
        self.assertEqual(u'bzr: ERROR: Not a branch: %s/\n' % (getcwd(),),
 
58
                         err)
 
59
        # -r X
 
60
        out, err = self.run_bzr_captured(['diff', '-r', 'revno:2:branch2'],
 
61
                                         retcode=3)
 
62
        self.assertEquals('', out)
 
63
        self.assertEqual(u'bzr: ERROR: Not a branch: %s/\n' % (getcwd(),),
 
64
                         err)
 
65
        # -r X..
 
66
        out, err = self.run_bzr_captured(['diff', '-r', 'revno:2:branch2..'],
 
67
                                         retcode=3)
 
68
        self.assertEquals('', out)
 
69
        self.assertEqual(u'bzr: ERROR: Not a branch: %s/\n' % (getcwd(),),
 
70
                         err)
 
71
        # no -r at all.
 
72
        out, err = self.run_bzr_captured(['diff'],
 
73
                                         retcode=3)
 
74
        self.assertEquals('', out)
 
75
        self.assertEqual(u'bzr: ERROR: Not a branch: %s/\n' % (getcwd(),),
 
76
                         err)
 
77
        
 
78