← 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-08-17 06:45:33 UTC
  • mfrom: (5050.17.9 2.2)
  • mto: This revision was merged to the branch mainline in revision 5379.
  • Revision ID: andrew.bennetts@canonical.com-20100817064533-kof2i2f3r6mr4ayb
Merge lp:bzr/2.2 into lp:bzr, including fixes for #192859, #224373, #300062, #585667, #614404, #617503.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/mutabletree.py
32
32
    hooks,
33
33
    osutils,
34
34
    revisiontree,
 
35
    inventory,
35
36
    symbol_versioning,
36
37
    trace,
37
38
    tree,
415
416
            for c in self.conflicts():
416
417
                conflicts_related.update(c.associated_filenames())
417
418
 
 
419
        # expand any symlinks in the directory part, while leaving the
 
420
        # filename alone
 
421
        file_list = map(osutils.normalizepath, file_list)
 
422
 
418
423
        # validate user file paths and convert all paths to tree
419
424
        # relative : it's cheaper to make a tree relative path an abspath
420
425
        # than to convert an abspath to tree relative, and it's cheaper to
719
724
        file_id or None to generate a new file id
720
725
    :returns: None
721
726
    """
 
727
    # if the parent exists, but isn't a directory, we have to do the
 
728
    # kind change now -- really the inventory shouldn't pretend to know
 
729
    # the kind of wt files, but it does.
 
730
    if parent_ie.kind != 'directory':
 
731
        # nb: this relies on someone else checking that the path we're using
 
732
        # doesn't contain symlinks.
 
733
        new_parent_ie = inventory.make_entry('directory', parent_ie.name,
 
734
            parent_ie.parent_id, parent_ie.file_id)
 
735
        del inv[parent_ie.file_id]
 
736
        inv.add(new_parent_ie)
 
737
        parent_ie = new_parent_ie
722
738
    file_id = file_id_callback(inv, parent_ie, path, kind)
723
739
    entry = inv.make_entry(kind, path.base_path, parent_ie.file_id,
724
740
        file_id=file_id)