/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-07-08 17:09:38 UTC
  • mfrom: (3287.20.5 non_utf8_77657)
  • Revision ID: pqm@pqm.ubuntu.com-20080708170938-gt3lvh2xejc4w8vf
(jam) Give a better error when encountering a bad filename (bug
        #77657)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1592
1592
                if subf == '.bzr':
1593
1593
                    continue
1594
1594
                if subf not in dir_entry.children:
1595
 
                    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)
1596
1603
                    if subf_norm != subf and can_access:
1597
1604
                        if subf_norm not in dir_entry.children:
1598
1605
                            fl.append(subf_norm)