/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 breezy/git/workingtree.py

  • Committer: Jelmer Vernooij
  • Date: 2019-03-02 22:31:28 UTC
  • mfrom: (7291 work)
  • mto: This revision was merged to the branch mainline in revision 7293.
  • Revision ID: jelmer@jelmer.uk-20190302223128-0qk1i5tozmzq5nyq
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/workingtree.py
536
536
                    if not self._has_dir(relpath):
537
537
                        dirnames.remove(name)
538
538
            for name in filenames:
539
 
                if not self.mapping.is_special_file(name):
540
 
                    yp = os.path.join(dir_relpath, name)
541
 
                    try:
542
 
                        yield yp.decode(osutils._fs_enc)
543
 
                    except UnicodeDecodeError:
544
 
                        raise errors.BadFilenameEncoding(
545
 
                            yp, osutils._fs_enc)
 
539
                if self.mapping.is_special_file(name):
 
540
                    continue
 
541
                if self.controldir.is_control_filename(
 
542
                        name.decode(osutils._fs_enc, 'replace')):
 
543
                    continue
 
544
                yp = os.path.join(dir_relpath, name)
 
545
                try:
 
546
                    yield yp.decode(osutils._fs_enc)
 
547
                except UnicodeDecodeError:
 
548
                    raise errors.BadFilenameEncoding(
 
549
                        yp, osutils._fs_enc)
546
550
 
547
551
    def extras(self):
548
552
        """Yield all unversioned files in this WorkingTree.