/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
2052.3.2 by John Arbash Meinel
Change Copyright .. by Canonical to Copyright ... Canonical
1
# Copyright (C) 2005 Canonical Ltd
1185.50.9 by John Arbash Meinel
[bug 3632] Matthieu Moy- bzr cat should default to last revision
2
# -*- coding: utf-8 -*-
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
3
#
1185.50.9 by John Arbash Meinel
[bug 3632] Matthieu Moy- bzr cat should default to last revision
4
# This program is free software; you can redistribute it and/or modify
5
# it under the terms of the GNU General Public License as published by
6
# the Free Software Foundation; either version 2 of the License, or
7
# (at your option) any later version.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
8
#
1185.50.9 by John Arbash Meinel
[bug 3632] Matthieu Moy- bzr cat should default to last revision
9
# This program is distributed in the hope that it will be useful,
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
12
# GNU General Public License for more details.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
13
#
1185.50.9 by John Arbash Meinel
[bug 3632] Matthieu Moy- bzr cat should default to last revision
14
# You should have received a copy of the GNU General Public License
15
# along with this program; if not, write to the Free Software
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
17
18
19
"""Black-box tests for bzr cat.
20
"""
21
22
import os
3063.4.1 by Lukáš Lalinský
Fix UnboundLocalError in cmd_cat.
23
import sys
1185.50.9 by John Arbash Meinel
[bug 3632] Matthieu Moy- bzr cat should default to last revision
24
2158.1.1 by Wouter van Heyst
Fix #73500 mostly by catching a NotLocalUrl exception in cmd_cat.
25
from bzrlib.tests.blackbox import TestCaseWithTransport
1185.50.9 by John Arbash Meinel
[bug 3632] Matthieu Moy- bzr cat should default to last revision
26
2158.1.1 by Wouter van Heyst
Fix #73500 mostly by catching a NotLocalUrl exception in cmd_cat.
27
class TestCat(TestCaseWithTransport):
1185.50.9 by John Arbash Meinel
[bug 3632] Matthieu Moy- bzr cat should default to last revision
28
29
    def test_cat(self):
2664.13.1 by Daniel Watkins
tests.blackbox.test_cat now uses internals where appropriate.
30
        tree = self.make_branch_and_tree('branch')
31
        self.build_tree_contents([('branch/a', 'foo\n')])
32
        tree.add('a')
1907.4.3 by Matthieu Moy
bzr cat now works nicely with revno:N:path too
33
        os.chdir('branch')
1185.50.9 by John Arbash Meinel
[bug 3632] Matthieu Moy- bzr cat should default to last revision
34
        # 'bzr cat' without an option should cat the last revision
2738.4.7 by Martin Pool
Fix up calls to run_bzr from test_cat
35
        self.run_bzr(['cat', 'a'], retcode=3)
2664.13.1 by Daniel Watkins
tests.blackbox.test_cat now uses internals where appropriate.
36
37
        tree.commit(message='1')
38
        self.build_tree_contents([('a', 'baz\n')])
39
2738.4.3 by Daniel Watkins
Converted run_bzr to run_bzr_subprocess where appropriate in cat.
40
        # We use run_bzr_subprocess rather than run_bzr here so that we can
41
        # test mangling of line-endings on Windows.
2738.4.7 by Martin Pool
Fix up calls to run_bzr from test_cat
42
        self.assertEquals(self.run_bzr_subprocess(['cat', 'a'])[0], 'foo\n')
2664.13.1 by Daniel Watkins
tests.blackbox.test_cat now uses internals where appropriate.
43
44
        tree.commit(message='2')
2738.4.7 by Martin Pool
Fix up calls to run_bzr from test_cat
45
        self.assertEquals(self.run_bzr_subprocess(['cat', 'a'])[0], 'baz\n')
46
        self.assertEquals(self.run_bzr_subprocess(
47
            ['cat', 'a', '-r', '1'])[0],
48
            'foo\n')
49
        self.assertEquals(self.run_bzr_subprocess(
50
            ['cat', 'a', '-r', '-1'])[0],
51
            'baz\n')
2664.13.1 by Daniel Watkins
tests.blackbox.test_cat now uses internals where appropriate.
52
2738.4.1 by Daniel Watkins
Merged original changes and tweaked cat.
53
        rev_id = tree.branch.last_revision()
2664.13.1 by Daniel Watkins
tests.blackbox.test_cat now uses internals where appropriate.
54
2738.4.7 by Martin Pool
Fix up calls to run_bzr from test_cat
55
        self.assertEquals(self.run_bzr_subprocess(
56
            ['cat', 'a', '-r', 'revid:%s' % rev_id])[0],
57
            'baz\n')
2664.13.1 by Daniel Watkins
tests.blackbox.test_cat now uses internals where appropriate.
58
1907.4.3 by Matthieu Moy
bzr cat now works nicely with revno:N:path too
59
        os.chdir('..')
2664.13.1 by Daniel Watkins
tests.blackbox.test_cat now uses internals where appropriate.
60
2738.4.7 by Martin Pool
Fix up calls to run_bzr from test_cat
61
        self.assertEquals(self.run_bzr_subprocess(
62
            ['cat', 'branch/a', '-r', 'revno:1:branch'])[0],
63
            'foo\n')
64
        self.run_bzr(['cat', 'a'], retcode=3)
65
        self.run_bzr(
66
                ['cat', 'a', '-r', 'revno:1:branch-that-does-not-exist'],
67
                retcode=3)
2664.13.1 by Daniel Watkins
tests.blackbox.test_cat now uses internals where appropriate.
68
2073.2.4 by wang
Fix syntax error in test.
69
    def test_cat_different_id(self):
2073.2.1 by wang
``bzr cat`` can look up contents of removed or renamed files. If the
70
        """'cat' works with old and new files"""
2073.2.4 by wang
Fix syntax error in test.
71
        tree = self.make_branch_and_tree('.')
2073.2.3 by wang
Change option name to --name-from-revision. Always make new tree the
72
        # the files are named after their path in the revision and
73
        # current trees later in the test case
74
        # a-rev-tree is special because it appears in both the revision
75
        # tree and the working tree
76
        self.build_tree_contents([('a-rev-tree', 'foo\n'),
77
            ('c-rev', 'baz\n'), ('d-rev', 'bar\n')])
78
        tree.lock_write()
79
        try:
80
            tree.add(['a-rev-tree', 'c-rev', 'd-rev'])
81
            tree.commit('add test files')
2255.7.70 by Robert Collins
Workaround WorkingTree4 not having a native remove() in test_cat.
82
            # remove currently uses self._write_inventory - 
83
            # work around that for now.
84
            tree.flush()
2073.2.3 by wang
Change option name to --name-from-revision. Always make new tree the
85
            tree.remove(['d-rev'])
86
            tree.rename_one('a-rev-tree', 'b-tree')
87
            tree.rename_one('c-rev', 'a-rev-tree')
88
        finally:
2379.6.1 by Alexander Belchenko
blackbox: test_cat_different_id: calling bzr as another process require free lock on win32
89
            # calling bzr as another process require free lock on win32
2073.2.3 by wang
Change option name to --name-from-revision. Always make new tree the
90
            tree.unlock()
91
2379.6.1 by Alexander Belchenko
blackbox: test_cat_different_id: calling bzr as another process require free lock on win32
92
        # 'b-tree' is not present in the old tree.
93
        self.run_bzr_error(["^bzr: ERROR: u?'b-tree' "
94
                            "is not present in revision .+$"],
2552.2.3 by Vincent Ladeuil
Deprecate the varargs syntax and fix the tests.
95
                           'cat b-tree --name-from-revision')
2379.6.1 by Alexander Belchenko
blackbox: test_cat_different_id: calling bzr as another process require free lock on win32
96
97
        # get to the old file automatically
2738.4.3 by Daniel Watkins
Converted run_bzr to run_bzr_subprocess where appropriate in cat.
98
        out, err = self.run_bzr_subprocess('cat d-rev')
2379.6.1 by Alexander Belchenko
blackbox: test_cat_different_id: calling bzr as another process require free lock on win32
99
        self.assertEqual('bar\n', out)
100
        self.assertEqual('', err)
101
2738.4.6 by Daniel Watkins
Rewrapped lines longer than 79 characters.
102
        out, err = \
103
                self.run_bzr_subprocess('cat a-rev-tree --name-from-revision')
2379.6.1 by Alexander Belchenko
blackbox: test_cat_different_id: calling bzr as another process require free lock on win32
104
        self.assertEqual('foo\n', out)
105
        self.assertEqual('', err)
106
2738.4.3 by Daniel Watkins
Converted run_bzr to run_bzr_subprocess where appropriate in cat.
107
        out, err = self.run_bzr_subprocess('cat a-rev-tree')
2379.6.1 by Alexander Belchenko
blackbox: test_cat_different_id: calling bzr as another process require free lock on win32
108
        self.assertEqual('baz\n', out)
109
        self.assertEqual('', err)
110
2158.1.1 by Wouter van Heyst
Fix #73500 mostly by catching a NotLocalUrl exception in cmd_cat.
111
    def test_remote_cat(self):
112
        wt = self.make_branch_and_tree('.')
2158.1.2 by Wouter van Heyst
Actually check if cat returns the right content.
113
        self.build_tree(['README'])
2158.1.1 by Wouter van Heyst
Fix #73500 mostly by catching a NotLocalUrl exception in cmd_cat.
114
        wt.add('README')
115
        wt.commit('Making sure there is a basis_tree available')
116
117
        url = self.get_readonly_url() + '/README'
2738.4.3 by Daniel Watkins
Converted run_bzr to run_bzr_subprocess where appropriate in cat.
118
        out, err = self.run_bzr_subprocess(['cat', url])
2158.1.2 by Wouter van Heyst
Actually check if cat returns the right content.
119
        self.assertEqual('contents of README\n', out)
2309.1.1 by James Westby
Allow bzr cat to be used against treeless repositories.
120
121
    def test_cat_no_working_tree(self):
122
        wt = self.make_branch_and_tree('.')
123
        self.build_tree(['README'])
124
        wt.add('README')
125
        wt.commit('Making sure there is a basis_tree available')
126
        wt.branch.bzrdir.destroy_workingtree()
127
128
        url = self.get_readonly_url() + '/README'
2738.4.3 by Daniel Watkins
Converted run_bzr to run_bzr_subprocess where appropriate in cat.
129
        out, err = self.run_bzr_subprocess(['cat', url])
2309.1.1 by James Westby
Allow bzr cat to be used against treeless repositories.
130
        self.assertEqual('contents of README\n', out)
2738.4.6 by Daniel Watkins
Rewrapped lines longer than 79 characters.
131
3063.4.2 by John Arbash Meinel
Fix 'nonexistent'
132
    def test_cat_nonexistent_branch(self):
3063.4.1 by Lukáš Lalinský
Fix UnboundLocalError in cmd_cat.
133
        if sys.platform == "win32":
134
            location = "C:/i/do/not/exist"
135
        else:
136
            location = "/i/do/not/exist"
137
        self.run_bzr_error(['^bzr: ERROR: Not a branch'], ['cat', location])