← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/mutabletree.py

  • Committer: Andrew Bennetts
  • Date: 2010-10-13 00:26:41 UTC
  • mto: This revision was merged to the branch mainline in revision 5498.
  • Revision ID: andrew.bennetts@canonical.com-20101013002641-9tlh9k89mlj1666m
Keep docs-plain working.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/mutabletree.py
1
 
# Copyright (C) 2006-2011 Canonical Ltd
 
1
# Copyright (C) 2006-2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
418
418
 
419
419
        # expand any symlinks in the directory part, while leaving the
420
420
        # filename alone
421
 
        # only expanding if symlinks are supported avoids windows path bugs
422
 
        if osutils.has_symlinks():
423
 
            file_list = map(osutils.normalizepath, file_list)
 
421
        file_list = map(osutils.normalizepath, file_list)
424
422
 
425
423
        # validate user file paths and convert all paths to tree
426
424
        # relative : it's cheaper to make a tree relative path an abspath
547
545
                        this_ie = None
548
546
                    else:
549
547
                        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)
557
548
 
558
549
                for subf in sorted(os.listdir(abspath)):
559
550
                    # here we could use TreeDirectory rather than