← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.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_4.py
148
148
        #-------------
149
149
        self._setup_directory_is_tree_reference()
150
150
        self._detect_case_handling()
 
151
        self._rules_searcher = None
151
152
 
152
153
    @needs_tree_write_lock
153
154
    def _add(self, files, ids, kinds):
2459
2460
                                new_executable = bool(
2460
2461
                                    stat.S_ISREG(current_path_info[3].st_mode)
2461
2462
                                    and stat.S_IEXEC & current_path_info[3].st_mode)
 
2463
                                try:
 
2464
                                    relpath_unicode = utf8_decode(current_path_info[0])[0]
 
2465
                                except UnicodeDecodeError:
 
2466
                                    raise errors.BadFilenameEncoding(
 
2467
                                        current_path_info[0], osutils._fs_enc)
2462
2468
                                yield (None,
2463
 
                                    (None, utf8_decode(current_path_info[0])[0]),
 
2469
                                    (None, relpath_unicode),
2464
2470
                                    True,
2465
2471
                                    (False, False),
2466
2472
                                    (None, None),