← 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: Mark Hammond
  • Date: 2008-12-28 05:21:23 UTC
  • mfrom: (3920 +trunk)
  • mto: (3932.1.1 prepare-1.11)
  • mto: This revision was merged to the branch mainline in revision 3937.
  • Revision ID: mhammond@skippinet.com.au-20081228052123-f78xs5sbdkotshwf
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_ls.py
97
97
        self.ls_equals(
98
98
            '.bzrignore                                         \n'
99
99
            'a                                                  a-id\n'
100
 
            'subdir                                             subdir-id\n', 
 
100
            'subdir/                                            subdir-id\n', 
101
101
            '--show-ids')
102
102
        self.ls_equals(
103
103
            '?        .bzrignore\n'
114
114
 
115
115
        self.ls_equals('.bzrignore\n'
116
116
                       'a\n'
117
 
                       'subdir\n'
 
117
                       'subdir/\n'
118
118
                       , '--non-recursive')
119
119
 
120
120
        self.ls_equals('V        .bzrignore\n'
129
129
                  , '--null')
130
130
        self.ls_equals('.bzrignore\n'
131
131
                       'a\n'
132
 
                       'subdir\n'
 
132
                       'subdir/\n'
133
133
                       'subdir/b\n'
134
134
                       , '--from-root')
135
135
        self.ls_equals('.bzrignore\0'
139
139
                       , '--from-root --null')
140
140
        self.ls_equals('.bzrignore\n'
141
141
                       'a\n'
142
 
                       'subdir\n'
 
142
                       'subdir/\n'
143
143
                       , '--from-root --non-recursive')
144
144
 
145
145
    def test_ls_path(self):
151
151
        os.chdir('subdir')
152
152
        self.ls_equals('../.bzrignore\n'
153
153
                       '../a\n'
154
 
                       '../subdir\n'
 
154
                       '../subdir/\n'
155
155
                       '../subdir/b\n' ,
156
156
                       '..')
157
157
        self.ls_equals('../.bzrignore\0'
188
188
        self.wt.commit('committing')
189
189
        branch = self.make_branch('branchdir')
190
190
        branch.pull(self.wt.branch)
191
 
        self.ls_equals('branchdir/subdir\n'
 
191
        self.ls_equals('branchdir/subdir/\n'
192
192
                       'branchdir/subdir/b\n',
193
193
                       'branchdir')
194
 
        self.ls_equals('branchdir/subdir\n'
 
194
        self.ls_equals('branchdir/subdir/\n'
195
195
                       'branchdir/subdir/b\n',
196
196
                       'branchdir --revision 1')
197
197
 
229
229
        self.ls_equals('.bzrignore\n' 
230
230
                       'a\n', 
231
231
                       '--kind=file')
232
 
        self.ls_equals('subdir\n',
 
232
        self.ls_equals('subdir/\n',
233
233
                       '--kind=directory')
234
234
        self.ls_equals('',
235
235
                       '--kind=symlink')