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

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-07-25 00:54:22 UTC
  • mfrom: (7045.1.23 python3-p)
  • Revision ID: breezy.the.bot@gmail.com-20180725005422-a1rubn7zssfn2uvu
Fix some more tests on Python 3.

Merged from https://code.launchpad.net/~jelmer/brz/python3-p/+merge/349784

Show diffs side-by-side

added added

removed removed

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