← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1642
1642
 
1643
1643
            fl = []
1644
1644
            for subf in os.listdir(dirabs):
1645
 
                if subf == '.bzr':
 
1645
                if self.bzrdir.is_control_filename(subf):
1646
1646
                    continue
1647
1647
                if subf not in dir_entry.children:
1648
1648
                    try:
2374
2374
                    bzrdir_loc = bisect_left(cur_disk_dir_content,
2375
2375
                        ('.bzr', '.bzr'))
2376
2376
                    if (bzrdir_loc < len(cur_disk_dir_content)
2377
 
                        and cur_disk_dir_content[bzrdir_loc][0] == '.bzr'):
 
2377
                        and self.bzrdir.is_control_filename(
 
2378
                            cur_disk_dir_content[bzrdir_loc][0])):
2378
2379
                        # we dont yield the contents of, or, .bzr itself.
2379
2380
                        del cur_disk_dir_content[bzrdir_loc]
2380
2381
            if inv_finished: