← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Andrew Bennetts
  • Date: 2008-07-28 06:53:44 UTC
  • mfrom: (3581 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3583.
  • Revision ID: andrew.bennetts@canonical.com-20080728065344-ocndjoycs903q6fz
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
246
246
            # permitted to do this.
247
247
            self._set_inventory(_inventory, dirty=False)
248
248
        self._detect_case_handling()
 
249
        self._rules_searcher = None
249
250
 
250
251
    def _detect_case_handling(self):
251
252
        wt_trans = self.bzrdir.get_workingtree_transport(None)
1591
1592
                if subf == '.bzr':
1592
1593
                    continue
1593
1594
                if subf not in dir_entry.children:
1594
 
                    subf_norm, can_access = osutils.normalized_filename(subf)
 
1595
                    try:
 
1596
                        (subf_norm,
 
1597
                         can_access) = osutils.normalized_filename(subf)
 
1598
                    except UnicodeDecodeError:
 
1599
                        path_os_enc = path.encode(osutils._fs_enc)
 
1600
                        relpath = path_os_enc + '/' + subf
 
1601
                        raise errors.BadFilenameEncoding(relpath,
 
1602
                                                         osutils._fs_enc)
1595
1603
                    if subf_norm != subf and can_access:
1596
1604
                        if subf_norm not in dir_entry.children:
1597
1605
                            fl.append(subf_norm)
2477
2485
        """
2478
2486
        return
2479
2487
 
 
2488
    @needs_read_lock
 
2489
    def _get_rules_searcher(self, default_searcher):
 
2490
        """See Tree._get_rules_searcher."""
 
2491
        if self._rules_searcher is None:
 
2492
            self._rules_searcher = super(WorkingTree,
 
2493
                self)._get_rules_searcher(default_searcher)
 
2494
        return self._rules_searcher
 
2495
 
2480
2496
 
2481
2497
class WorkingTree2(WorkingTree):
2482
2498
    """This is the Format 2 working tree.