← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: John Arbash Meinel
  • Date: 2006-07-30 13:54:37 UTC
  • mto: (1946.2.6 reduce-knit-churn)
  • mto: This revision was merged to the branch mainline in revision 1898.
  • Revision ID: john@arbash-meinel.com-20060730135437-1d722abdb14bff76
(jelmer) Install new intertree tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_ls.py
1
 
# Copyright (C) 2006 Canonical Ltd
 
1
# Copyright (C) 2006 by Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
28
28
        super(TestLS, self).setUp()
29
29
        
30
30
        # Create a simple branch that can be used in testing
31
 
        ignores._set_user_ignores(['user-ignore'])
 
31
        ignores._set_user_ignores(['./.bazaar', 'user-ignore'])
32
32
 
33
33
        self.wt = self.make_branch_and_tree('.')
34
34
        self.build_tree_contents([
48
48
 
49
49
    def test_ls_basic(self):
50
50
        """Test the abilities of 'bzr ls'"""
51
 
        self.ls_equals('.bzrignore\na\n')
52
 
        self.ls_equals('?        .bzrignore\n'
 
51
        self.ls_equals('.bazaar\n.bzrignore\na\n')
 
52
        self.ls_equals('I        .bazaar/\n'
 
53
                       '?        .bzrignore\n'
53
54
                       '?        a\n',
54
55
                       '--verbose')
55
56
        self.ls_equals('.bzrignore\n'
56
57
                       'a\n',
57
58
                       '--unknown')
58
 
        self.ls_equals('', '--ignored')
 
59
        self.ls_equals('.bazaar\n', '--ignored')
59
60
        self.ls_equals('', '--versioned')
60
 
        self.ls_equals('.bzrignore\n'
 
61
        self.ls_equals('.bazaar\n'
 
62
                       '.bzrignore\n'
61
63
                       'a\n',
62
64
                       '--unknown', '--ignored', '--versioned')
63
 
        self.ls_equals('', '--ignored', '--versioned')
64
 
        self.ls_equals('.bzrignore\0a\0', '--null')
 
65
        self.ls_equals('.bazaar\n', '--ignored', '--versioned')
 
66
        self.ls_equals('.bazaar\0.bzrignore\0a\0', '--null')
65
67
 
66
68
    def test_ls_added(self):
67
69
        self.wt.add(['a'])
68
 
        self.ls_equals('?        .bzrignore\n'
 
70
        self.ls_equals('I        .bazaar/\n'
 
71
                       '?        .bzrignore\n'
69
72
                       'V        a\n',
70
73
                       '--verbose')
71
74
        self.wt.commit('add')
72
75
        
73
76
        self.build_tree(['subdir/'])
74
 
        self.ls_equals('?        .bzrignore\n'
 
77
        self.ls_equals('I        .bazaar/\n'
 
78
                       '?        .bzrignore\n'
75
79
                       'V        a\n'
76
80
                       '?        subdir/\n'
77
81
                       , '--verbose')
78
82
        self.build_tree(['subdir/b'])
79
83
        self.wt.add(['subdir/', 'subdir/b', '.bzrignore'])
80
 
        self.ls_equals('V        .bzrignore\n'
 
84
        self.ls_equals('I        .bazaar/\n'
 
85
                       'V        .bzrignore\n'
81
86
                       'V        a\n'
82
87
                       'V        subdir/\n'
83
88
                       'V        subdir/b\n'
87
92
        self.build_tree(['subdir/', 'subdir/b'])
88
93
        self.wt.add(['a', 'subdir/', 'subdir/b', '.bzrignore'])
89
94
 
90
 
        self.ls_equals('.bzrignore\n'
 
95
        self.ls_equals('.bazaar\n'
 
96
                       '.bzrignore\n'
91
97
                       'a\n'
92
98
                       'subdir\n'
93
99
                       , '--non-recursive')
94
100
 
95
 
        self.ls_equals('V        .bzrignore\n'
 
101
        self.ls_equals('I        .bazaar/\n'
 
102
                       'V        .bzrignore\n'
96
103
                       'V        a\n'
97
104
                       'V        subdir/\n'
98
105
                       , '--verbose', '--non-recursive')
102
109
        self.ls_equals('b\n')
103
110
        self.ls_equals('b\0'
104
111
                  , '--null')
105
 
        self.ls_equals('.bzrignore\n'
 
112
        self.ls_equals('.bazaar\n'
 
113
                       '.bzrignore\n'
106
114
                       'a\n'
107
115
                       'subdir\n'
108
116
                       'subdir/b\n'
109
117
                       , '--from-root')
110
 
        self.ls_equals('.bzrignore\0'
 
118
        self.ls_equals('.bazaar\0'
 
119
                       '.bzrignore\0'
111
120
                       'a\0'
112
121
                       'subdir\0'
113
122
                       'subdir/b\0'
114
123
                       , '--from-root', '--null')
115
 
        self.ls_equals('.bzrignore\n'
 
124
        self.ls_equals('.bazaar\n'
 
125
                       '.bzrignore\n'
116
126
                       'a\n'
117
127
                       'subdir\n'
118
128
                       , '--from-root', '--non-recursive')
136
146
        self.wt.add(['a', '.bzrignore'])
137
147
 
138
148
        self.build_tree(['blah.py', 'blah.pyo', 'user-ignore'])
139
 
        self.ls_equals('.bzrignore\n'
 
149
        self.ls_equals('.bazaar\n'
 
150
                       '.bzrignore\n'
140
151
                       'a\n'
141
152
                       'blah.py\n'
142
153
                       'blah.pyo\n'
143
154
                       'user-ignore\n'
144
155
                       )
145
 
        self.ls_equals('V        .bzrignore\n'
 
156
        self.ls_equals('I        .bazaar/\n'
 
157
                       'V        .bzrignore\n'
146
158
                       'V        a\n'
147
159
                       '?        blah.py\n'
148
160
                       'I        blah.pyo\n'
149
161
                       'I        user-ignore\n'
150
162
                       , '--verbose')
151
 
        self.ls_equals('blah.pyo\n'
 
163
        self.ls_equals('.bazaar\n'
 
164
                       'blah.pyo\n'
152
165
                       'user-ignore\n'
153
166
                       , '--ignored')
154
167
        self.ls_equals('blah.py\n'