/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-11-16 10:50:21 UTC
  • mfrom: (7164 work)
  • mto: This revision was merged to the branch mainline in revision 7165.
  • Revision ID: jelmer@jelmer.uk-20181116105021-xl419v2rh4aus1au
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/workingtree.py
418
418
        ignored = {}
419
419
        user_dirs = []
420
420
        def call_action(filepath, kind):
 
421
            if filepath == '':
 
422
                return
421
423
            if action is not None:
422
424
                parent_path = posixpath.dirname(filepath)
423
425
                parent_id = self.path2id(parent_path)
487
489
                            continue
488
490
                        if subp in conflicts_related:
489
491
                            continue
490
 
                        call_action(filepath, kind)
 
492
                        call_action(subp, kind)
491
493
                        if save:
492
494
                            self._index_add_entry(subp, kind)
493
495
                        added.append(subp)