/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: 2018-08-14 20:31:23 UTC
  • mfrom: (7067 work)
  • mto: This revision was merged to the branch mainline in revision 7078.
  • Revision ID: jelmer@jelmer.uk-20180814203123-eiq2h8j2hei4lpxm
Merge truk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/workingtree.py
631
631
        match = self._global_ignoreglobster.match(filename)
632
632
        if match is not None:
633
633
            return match
634
 
        encoded_filename = filename.encode('utf-8')
635
634
        try:
636
635
            if self.kind(filename) == 'directory':
637
 
                encoded_filename += b'/'
 
636
                filename += '/'
638
637
        except errors.NoSuchFile:
639
638
            pass
640
 
        encoded_filename = encoded_filename.lstrip(b'/')
 
639
        filename = filename.lstrip('/')
641
640
        ignore_manager = self._get_ignore_manager()
642
641
        ps = list(ignore_manager.find_matching(filename))
643
642
        if not ps: