← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/mutabletree.py

  • Committer: Jelmer Vernooij
  • Date: 2010-12-20 11:57:14 UTC
  • mto: This revision was merged to the branch mainline in revision 5577.
  • Revision ID: jelmer@samba.org-20101220115714-2ru3hfappjweeg7q
Don't use no-plugins.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/mutabletree.py
418
418
 
419
419
        # expand any symlinks in the directory part, while leaving the
420
420
        # filename alone
421
 
        file_list = map(osutils.normalizepath, file_list)
 
421
        # only expanding if symlinks are supported avoids windows path bugs
 
422
        if osutils.has_symlinks():
 
423
            file_list = map(osutils.normalizepath, file_list)
422
424
 
423
425
        # validate user file paths and convert all paths to tree
424
426
        # relative : it's cheaper to make a tree relative path an abspath
545
547
                        this_ie = None
546
548
                    else:
547
549
                        this_ie = inv[this_id]
 
550
                        # Same as in _add_one below, if the inventory doesn't
 
551
                        # think this is a directory, update the inventory
 
552
                        if this_ie.kind != 'directory':
 
553
                            this_ie = inventory.make_entry('directory',
 
554
                                this_ie.name, this_ie.parent_id, this_id)
 
555
                            del inv[this_id]
 
556
                            inv.add(this_ie)
548
557
 
549
558
                for subf in sorted(os.listdir(abspath)):
550
559
                    # here we could use TreeDirectory rather than