/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 bzrlib/transform.py

  • Committer: Jelmer Vernooij
  • Date: 2012-01-24 01:35:56 UTC
  • mto: This revision was merged to the branch mainline in revision 6464.
  • Revision ID: jelmer@samba.org-20120124013556-kq6eew03kjqi16rl
Fix more tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006-2011 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
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
 
17
from __future__ import absolute_import
 
18
 
17
19
import os
18
20
import errno
19
21
from stat import S_ISREG, S_IEXEC
20
22
import time
21
23
 
22
 
from bzrlib.lazy_import import lazy_import
23
 
lazy_import(globals(), """
 
24
from bzrlib import (
 
25
    errors,
 
26
    lazy_import,
 
27
    registry,
 
28
    trace,
 
29
    tree,
 
30
    )
 
31
lazy_import.lazy_import(globals(), """
24
32
from bzrlib import (
25
33
    annotate,
26
34
    bencode,
27
 
    bzrdir,
 
35
    controldir,
 
36
    commit,
 
37
    conflicts,
28
38
    delta,
29
 
    errors,
30
39
    inventory,
31
40
    multiparent,
32
41
    osutils,
33
42
    revision as _mod_revision,
34
43
    ui,
 
44
    urlutils,
35
45
    )
 
46
from bzrlib.i18n import gettext
36
47
""")
37
 
from bzrlib.errors import (DuplicateKey, MalformedTransform, NoSuchFile,
 
48
from bzrlib.errors import (DuplicateKey, MalformedTransform,
38
49
                           ReusingTransform, CantMoveRoot,
39
 
                           ExistingLimbo, ImmortalLimbo, NoFinalPath,
 
50
                           ImmortalLimbo, NoFinalPath,
40
51
                           UnableCreateSymlink)
41
52
from bzrlib.filters import filtered_output_bytes, ContentFilterContext
42
 
from bzrlib.inventory import InventoryEntry
43
53
from bzrlib.osutils import (
44
54
    delete_any,
45
55
    file_kind,
46
56
    has_symlinks,
47
 
    lexists,
48
57
    pathjoin,
49
58
    sha_file,
50
59
    splitpath,
51
 
    supports_executable,
52
 
)
 
60
    )
53
61
from bzrlib.progress import ProgressPhase
54
62
from bzrlib.symbol_versioning import (
55
 
        deprecated_function,
56
 
        deprecated_in,
57
 
        )
58
 
from bzrlib.trace import mutter, warning
59
 
from bzrlib import tree
60
 
import bzrlib.ui
61
 
import bzrlib.urlutils as urlutils
 
63
    deprecated_function,
 
64
    deprecated_in,
 
65
    deprecated_method,
 
66
    )
62
67
 
63
68
 
64
69
ROOT_PARENT = "root-parent"
65
70
 
66
 
 
67
71
def unique_add(map, key, value):
68
72
    if key in map:
69
73
        raise DuplicateKey(key=key)
70
74
    map[key] = value
71
75
 
72
76
 
 
77
 
73
78
class _TransformResults(object):
74
79
    def __init__(self, modified_paths, rename_count):
75
80
        object.__init__(self)
99
104
        self._new_parent = {}
100
105
        # mapping of trans_id with new contents -> new file_kind
101
106
        self._new_contents = {}
 
107
        # mapping of trans_id => (sha1 of content, stat_value)
 
108
        self._observed_sha1s = {}
102
109
        # Set of trans_ids whose contents will be removed
103
110
        self._removed_contents = set()
104
111
        # Mapping of trans_id -> new execute-bit value
123
130
            self._new_root = self.trans_id_tree_file_id(root_id)
124
131
        else:
125
132
            self._new_root = None
126
 
        # Indictor of whether the transform has been applied
 
133
        # Indicator of whether the transform has been applied
127
134
        self._done = False
128
135
        # A progress bar
129
136
        self._pb = pb
132
139
        # A counter of how many files have been renamed
133
140
        self.rename_count = 0
134
141
 
 
142
    def __enter__(self):
 
143
        """Support Context Manager API."""
 
144
        return self
 
145
 
 
146
    def __exit__(self, exc_type, exc_val, exc_tb):
 
147
        """Support Context Manager API."""
 
148
        self.finalize()
 
149
 
135
150
    def finalize(self):
136
151
        """Release the working tree lock, if held.
137
152
 
212
227
        This means that the old root trans-id becomes obsolete, so it is
213
228
        recommended only to invoke this after the root trans-id has become
214
229
        irrelevant.
 
230
 
215
231
        """
216
232
        new_roots = [k for k, v in self._new_parent.iteritems() if v is
217
233
                     ROOT_PARENT]
223
239
            self._new_root = new_roots[0]
224
240
            return
225
241
        old_new_root = new_roots[0]
226
 
        # TODO: What to do if a old_new_root is present, but self._new_root is
227
 
        #       not listed as being removed? This code explicitly unversions
228
 
        #       the old root and versions it with the new file_id. Though that
229
 
        #       seems like an incomplete delta
230
 
 
231
242
        # unversion the new root's directory.
232
 
        file_id = self.final_file_id(old_new_root)
 
243
        if self.final_kind(self._new_root) is None:
 
244
            file_id = self.final_file_id(old_new_root)
 
245
        else:
 
246
            file_id = self.final_file_id(self._new_root)
233
247
        if old_new_root in self._new_id:
234
248
            self.cancel_versioning(old_new_root)
235
249
        else:
239
253
        if (self.tree_file_id(self._new_root) is not None and
240
254
            self._new_root not in self._removed_id):
241
255
            self.unversion_file(self._new_root)
242
 
        self.version_file(file_id, self._new_root)
 
256
        if file_id is not None:
 
257
            self.version_file(file_id, self._new_root)
243
258
 
244
259
        # Now move children of new root into old root directory.
245
260
        # Ensure all children are registered with the transaction, but don't
314
329
 
315
330
    def delete_contents(self, trans_id):
316
331
        """Schedule the contents of a path entry for deletion"""
317
 
        # Ensure that the object exists in the WorkingTree, this will raise an
318
 
        # exception if there is a problem
319
 
        self.tree_kind(trans_id)
320
 
        self._removed_contents.add(trans_id)
 
332
        kind = self.tree_kind(trans_id)
 
333
        if kind is not None:
 
334
            self._removed_contents.add(trans_id)
321
335
 
322
336
    def cancel_deletion(self, trans_id):
323
337
        """Cancel a scheduled deletion"""
380
394
        return sorted(FinalPaths(self).get_paths(new_ids))
381
395
 
382
396
    def _inventory_altered(self):
383
 
        """Get the trans_ids and paths of files needing new inv entries."""
384
 
        new_ids = set()
385
 
        for id_set in [self._new_name, self._new_parent, self._new_id,
 
397
        """Determine which trans_ids need new Inventory entries.
 
398
 
 
399
        An new entry is needed when anything that would be reflected by an
 
400
        inventory entry changes, including file name, file_id, parent file_id,
 
401
        file kind, and the execute bit.
 
402
 
 
403
        Some care is taken to return entries with real changes, not cases
 
404
        where the value is deleted and then restored to its original value,
 
405
        but some actually unchanged values may be returned.
 
406
 
 
407
        :returns: A list of (path, trans_id) for all items requiring an
 
408
            inventory change. Ordered by path.
 
409
        """
 
410
        changed_ids = set()
 
411
        # Find entries whose file_ids are new (or changed).
 
412
        new_file_id = set(t for t in self._new_id
 
413
                          if self._new_id[t] != self.tree_file_id(t))
 
414
        for id_set in [self._new_name, self._new_parent, new_file_id,
386
415
                       self._new_executability]:
387
 
            new_ids.update(id_set)
 
416
            changed_ids.update(id_set)
 
417
        # removing implies a kind change
388
418
        changed_kind = set(self._removed_contents)
 
419
        # so does adding
389
420
        changed_kind.intersection_update(self._new_contents)
390
 
        changed_kind.difference_update(new_ids)
391
 
        changed_kind = (t for t in changed_kind if self.tree_kind(t) !=
392
 
                        self.final_kind(t))
393
 
        new_ids.update(changed_kind)
394
 
        return sorted(FinalPaths(self).get_paths(new_ids))
 
421
        # Ignore entries that are already known to have changed.
 
422
        changed_kind.difference_update(changed_ids)
 
423
        #  to keep only the truly changed ones
 
424
        changed_kind = (t for t in changed_kind
 
425
                        if self.tree_kind(t) != self.final_kind(t))
 
426
        # all kind changes will alter the inventory
 
427
        changed_ids.update(changed_kind)
 
428
        # To find entries with changed parent_ids, find parents which existed,
 
429
        # but changed file_id.
 
430
        changed_file_id = set(t for t in new_file_id if t in self._removed_id)
 
431
        # Now add all their children to the set.
 
432
        for parent_trans_id in new_file_id:
 
433
            changed_ids.update(self.iter_tree_children(parent_trans_id))
 
434
        return sorted(FinalPaths(self).get_paths(changed_ids))
395
435
 
396
436
    def final_kind(self, trans_id):
397
437
        """Determine the final file kind, after any changes applied.
398
438
 
399
 
        Raises NoSuchFile if the file does not exist/has no contents.
400
 
        (It is conceivable that a path would be created without the
401
 
        corresponding contents insertion command)
 
439
        :return: None if the file does not exist/has no contents.  (It is
 
440
            conceivable that a path would be created without the corresponding
 
441
            contents insertion command)
402
442
        """
403
443
        if trans_id in self._new_contents:
404
444
            return self._new_contents[trans_id]
405
445
        elif trans_id in self._removed_contents:
406
 
            raise NoSuchFile(None)
 
446
            return None
407
447
        else:
408
448
            return self.tree_kind(trans_id)
409
449
 
522
562
        for trans_id in self._removed_id:
523
563
            file_id = self.tree_file_id(trans_id)
524
564
            if file_id is not None:
525
 
                if self._tree.inventory[file_id].kind == 'directory':
 
565
                if self._tree.stored_kind(file_id) == 'directory':
526
566
                    parents.append(trans_id)
527
567
            elif self.tree_kind(trans_id) == 'directory':
528
568
                parents.append(trans_id)
531
571
            # ensure that all children are registered with the transaction
532
572
            list(self.iter_tree_children(parent_id))
533
573
 
 
574
    @deprecated_method(deprecated_in((2, 3, 0)))
534
575
    def has_named_child(self, by_parent, parent_id, name):
535
 
        try:
536
 
            children = by_parent[parent_id]
537
 
        except KeyError:
538
 
            children = []
539
 
        for child in children:
 
576
        return self._has_named_child(
 
577
            name, parent_id, known_children=by_parent.get(parent_id, []))
 
578
 
 
579
    def _has_named_child(self, name, parent_id, known_children):
 
580
        """Does a parent already have a name child.
 
581
 
 
582
        :param name: The searched for name.
 
583
 
 
584
        :param parent_id: The parent for which the check is made.
 
585
 
 
586
        :param known_children: The already known children. This should have
 
587
            been recently obtained from `self.by_parent.get(parent_id)`
 
588
            (or will be if None is passed).
 
589
        """
 
590
        if known_children is None:
 
591
            known_children = self.by_parent().get(parent_id, [])
 
592
        for child in known_children:
540
593
            if self.final_name(child) == name:
541
594
                return True
542
 
        try:
543
 
            path = self._tree_id_paths[parent_id]
544
 
        except KeyError:
 
595
        parent_path = self._tree_id_paths.get(parent_id, None)
 
596
        if parent_path is None:
 
597
            # No parent... no children
545
598
            return False
546
 
        childpath = joinpath(path, name)
547
 
        child_id = self._tree_path_ids.get(childpath)
 
599
        child_path = joinpath(parent_path, name)
 
600
        child_id = self._tree_path_ids.get(child_path, None)
548
601
        if child_id is None:
549
 
            return lexists(self._tree.abspath(childpath))
 
602
            # Not known by the tree transform yet, check the filesystem
 
603
            return osutils.lexists(self._tree.abspath(child_path))
550
604
        else:
551
 
            if self.final_parent(child_id) != parent_id:
552
 
                return False
553
 
            if child_id in self._removed_contents:
554
 
                # XXX What about dangling file-ids?
555
 
                return False
556
 
            else:
557
 
                return True
 
605
            raise AssertionError('child_id is missing: %s, %s, %s'
 
606
                                 % (name, parent_id, child_id))
 
607
 
 
608
    def _available_backup_name(self, name, target_id):
 
609
        """Find an available backup name.
 
610
 
 
611
        :param name: The basename of the file.
 
612
 
 
613
        :param target_id: The directory trans_id where the backup should 
 
614
            be placed.
 
615
        """
 
616
        known_children = self.by_parent().get(target_id, [])
 
617
        return osutils.available_backup_name(
 
618
            name,
 
619
            lambda base: self._has_named_child(
 
620
                base, target_id, known_children))
558
621
 
559
622
    def _parent_loops(self):
560
623
        """No entry should be its own ancestor"""
595
658
        """
596
659
        conflicts = []
597
660
        for trans_id in self._new_id.iterkeys():
598
 
            try:
599
 
                kind = self.final_kind(trans_id)
600
 
            except NoSuchFile:
 
661
            kind = self.final_kind(trans_id)
 
662
            if kind is None:
601
663
                conflicts.append(('versioning no contents', trans_id))
602
664
                continue
603
 
            if not InventoryEntry.versionable_kind(kind):
 
665
            if not inventory.InventoryEntry.versionable_kind(kind):
604
666
                conflicts.append(('versioning bad kind', trans_id, kind))
605
667
        return conflicts
606
668
 
617
679
            if self.final_file_id(trans_id) is None:
618
680
                conflicts.append(('unversioned executability', trans_id))
619
681
            else:
620
 
                try:
621
 
                    non_file = self.final_kind(trans_id) != "file"
622
 
                except NoSuchFile:
623
 
                    non_file = True
624
 
                if non_file is True:
 
682
                if self.final_kind(trans_id) != "file":
625
683
                    conflicts.append(('non-file executability', trans_id))
626
684
        return conflicts
627
685
 
629
687
        """Check for overwrites (not permitted on Win32)"""
630
688
        conflicts = []
631
689
        for trans_id in self._new_contents:
632
 
            try:
633
 
                self.tree_kind(trans_id)
634
 
            except NoSuchFile:
 
690
            if self.tree_kind(trans_id) is None:
635
691
                continue
636
692
            if trans_id not in self._removed_contents:
637
693
                conflicts.append(('overwrite', trans_id,
644
700
        if (self._new_name, self._new_parent) == ({}, {}):
645
701
            return conflicts
646
702
        for children in by_parent.itervalues():
647
 
            name_ids = [(self.final_name(t), t) for t in children]
648
 
            if not self._case_sensitive_target:
649
 
                name_ids = [(n.lower(), t) for n, t in name_ids]
 
703
            name_ids = []
 
704
            for child_tid in children:
 
705
                name = self.final_name(child_tid)
 
706
                if name is not None:
 
707
                    # Keep children only if they still exist in the end
 
708
                    if not self._case_sensitive_target:
 
709
                        name = name.lower()
 
710
                    name_ids.append((name, child_tid))
650
711
            name_ids.sort()
651
712
            last_name = None
652
713
            last_trans_id = None
653
714
            for name, trans_id in name_ids:
654
 
                try:
655
 
                    kind = self.final_kind(trans_id)
656
 
                except NoSuchFile:
657
 
                    kind = None
 
715
                kind = self.final_kind(trans_id)
658
716
                file_id = self.final_file_id(trans_id)
659
717
                if kind is None and file_id is None:
660
718
                    continue
679
737
        return conflicts
680
738
 
681
739
    def _parent_type_conflicts(self, by_parent):
682
 
        """parents must have directory 'contents'."""
 
740
        """Children must have a directory parent"""
683
741
        conflicts = []
684
742
        for parent_id, children in by_parent.iteritems():
685
743
            if parent_id is ROOT_PARENT:
686
744
                continue
687
 
            if not self._any_contents(children):
 
745
            no_children = True
 
746
            for child_id in children:
 
747
                if self.final_kind(child_id) is not None:
 
748
                    no_children = False
 
749
                    break
 
750
            if no_children:
688
751
                continue
689
 
            for child in children:
690
 
                try:
691
 
                    self.final_kind(child)
692
 
                except NoSuchFile:
693
 
                    continue
694
 
            try:
695
 
                kind = self.final_kind(parent_id)
696
 
            except NoSuchFile:
697
 
                kind = None
 
752
            # There is at least a child, so we need an existing directory to
 
753
            # contain it.
 
754
            kind = self.final_kind(parent_id)
698
755
            if kind is None:
 
756
                # The directory will be deleted
699
757
                conflicts.append(('missing parent', parent_id))
700
758
            elif kind != "directory":
 
759
                # Meh, we need a *directory* to put something in it
701
760
                conflicts.append(('non-directory parent', parent_id))
702
761
        return conflicts
703
762
 
704
 
    def _any_contents(self, trans_ids):
705
 
        """Return true if any of the trans_ids, will have contents."""
706
 
        for trans_id in trans_ids:
707
 
            try:
708
 
                kind = self.final_kind(trans_id)
709
 
            except NoSuchFile:
710
 
                continue
711
 
            return True
712
 
        return False
713
 
 
714
763
    def _set_executability(self, path, trans_id):
715
764
        """Set the executability of versioned files """
716
 
        if supports_executable():
 
765
        if self._tree._supports_executable():
717
766
            new_executability = self._new_executability[trans_id]
718
767
            abspath = self._tree.abspath(path)
719
768
            current_mode = os.stat(abspath).st_mode
728
777
                    to_mode |= 0010 & ~umask
729
778
            else:
730
779
                to_mode = current_mode & ~0111
731
 
            os.chmod(abspath, to_mode)
 
780
            osutils.chmod_if_possible(abspath, to_mode)
732
781
 
733
782
    def _new_entry(self, name, parent_id, file_id):
734
783
        """Helper function to create a new filesystem entry."""
738
787
        return trans_id
739
788
 
740
789
    def new_file(self, name, parent_id, contents, file_id=None,
741
 
                 executable=None):
 
790
                 executable=None, sha1=None):
742
791
        """Convenience method to create files.
743
792
 
744
793
        name is the name of the file to create.
751
800
        trans_id = self._new_entry(name, parent_id, file_id)
752
801
        # TODO: rather than scheduling a set_executable call,
753
802
        # have create_file create the file with the right mode.
754
 
        self.create_file(contents, trans_id)
 
803
        self.create_file(contents, trans_id, sha1=sha1)
755
804
        if executable is not None:
756
805
            self.set_executability(executable, trans_id)
757
806
        return trans_id
780
829
        self.create_symlink(target, trans_id)
781
830
        return trans_id
782
831
 
 
832
    def new_orphan(self, trans_id, parent_id):
 
833
        """Schedule an item to be orphaned.
 
834
 
 
835
        When a directory is about to be removed, its children, if they are not
 
836
        versioned are moved out of the way: they don't have a parent anymore.
 
837
 
 
838
        :param trans_id: The trans_id of the existing item.
 
839
        :param parent_id: The parent trans_id of the item.
 
840
        """
 
841
        raise NotImplementedError(self.new_orphan)
 
842
 
 
843
    def _get_potential_orphans(self, dir_id):
 
844
        """Find the potential orphans in a directory.
 
845
 
 
846
        A directory can't be safely deleted if there are versioned files in it.
 
847
        If all the contained files are unversioned then they can be orphaned.
 
848
 
 
849
        The 'None' return value means that the directory contains at least one
 
850
        versioned file and should not be deleted.
 
851
 
 
852
        :param dir_id: The directory trans id.
 
853
 
 
854
        :return: A list of the orphan trans ids or None if at least one
 
855
             versioned file is present.
 
856
        """
 
857
        orphans = []
 
858
        # Find the potential orphans, stop if one item should be kept
 
859
        for child_tid in self.by_parent()[dir_id]:
 
860
            if child_tid in self._removed_contents:
 
861
                # The child is removed as part of the transform. Since it was
 
862
                # versioned before, it's not an orphan
 
863
                continue
 
864
            elif self.final_file_id(child_tid) is None:
 
865
                # The child is not versioned
 
866
                orphans.append(child_tid)
 
867
            else:
 
868
                # We have a versioned file here, searching for orphans is
 
869
                # meaningless.
 
870
                orphans = None
 
871
                break
 
872
        return orphans
 
873
 
783
874
    def _affected_ids(self):
784
875
        """Return the set of transform ids affected by the transform"""
785
876
        trans_ids = set(self._removed_id)
844
935
        Return a (name, parent, kind, executable) tuple
845
936
        """
846
937
        to_name = self.final_name(to_trans_id)
847
 
        try:
848
 
            to_kind = self.final_kind(to_trans_id)
849
 
        except NoSuchFile:
850
 
            to_kind = None
 
938
        to_kind = self.final_kind(to_trans_id)
851
939
        to_parent = self.final_file_id(self.final_parent(to_trans_id))
852
940
        if to_trans_id in self._new_executability:
853
941
            to_executable = self._new_executability[to_trans_id]
927
1015
        """
928
1016
        return _PreviewTree(self)
929
1017
 
930
 
    def commit(self, branch, message, merge_parents=None, strict=False):
 
1018
    def commit(self, branch, message, merge_parents=None, strict=False,
 
1019
               timestamp=None, timezone=None, committer=None, authors=None,
 
1020
               revprops=None, revision_id=None):
931
1021
        """Commit the result of this TreeTransform to a branch.
932
1022
 
933
1023
        :param branch: The branch to commit to.
934
1024
        :param message: The message to attach to the commit.
935
 
        :param merge_parents: Additional parents specified by pending merges.
 
1025
        :param merge_parents: Additional parent revision-ids specified by
 
1026
            pending merges.
 
1027
        :param strict: If True, abort the commit if there are unversioned
 
1028
            files.
 
1029
        :param timestamp: if not None, seconds-since-epoch for the time and
 
1030
            date.  (May be a float.)
 
1031
        :param timezone: Optional timezone for timestamp, as an offset in
 
1032
            seconds.
 
1033
        :param committer: Optional committer in email-id format.
 
1034
            (e.g. "J Random Hacker <jrandom@example.com>")
 
1035
        :param authors: Optional list of authors in email-id format.
 
1036
        :param revprops: Optional dictionary of revision properties.
 
1037
        :param revision_id: Optional revision id.  (Specifying a revision-id
 
1038
            may reduce performance for some non-native formats.)
936
1039
        :return: The revision_id of the revision committed.
937
1040
        """
938
1041
        self._check_malformed()
955
1058
        if self._tree.get_revision_id() != last_rev_id:
956
1059
            raise ValueError('TreeTransform not based on branch basis: %s' %
957
1060
                             self._tree.get_revision_id())
958
 
        builder = branch.get_commit_builder(parent_ids)
 
1061
        revprops = commit.Commit.update_revprops(revprops, branch, authors)
 
1062
        builder = branch.get_commit_builder(parent_ids,
 
1063
                                            timestamp=timestamp,
 
1064
                                            timezone=timezone,
 
1065
                                            committer=committer,
 
1066
                                            revprops=revprops,
 
1067
                                            revision_id=revision_id)
959
1068
        preview = self.get_preview_tree()
960
1069
        list(builder.record_iter_changes(preview, last_rev_id,
961
1070
                                         self.iter_changes()))
1079
1188
        self._deletiondir = None
1080
1189
        # A mapping of transform ids to their limbo filename
1081
1190
        self._limbo_files = {}
 
1191
        self._possibly_stale_limbo_files = set()
1082
1192
        # A mapping of transform ids to a set of the transform ids of children
1083
1193
        # that their limbo directory has
1084
1194
        self._limbo_children = {}
1097
1207
        if self._tree is None:
1098
1208
            return
1099
1209
        try:
1100
 
            entries = [(self._limbo_name(t), t, k) for t, k in
1101
 
                       self._new_contents.iteritems()]
1102
 
            entries.sort(reverse=True)
1103
 
            for path, trans_id, kind in entries:
1104
 
                delete_any(path)
 
1210
            limbo_paths = self._limbo_files.values() + list(
 
1211
                self._possibly_stale_limbo_files)
 
1212
            limbo_paths = sorted(limbo_paths, reverse=True)
 
1213
            for path in limbo_paths:
 
1214
                try:
 
1215
                    delete_any(path)
 
1216
                except OSError, e:
 
1217
                    if e.errno != errno.ENOENT:
 
1218
                        raise
 
1219
                    # XXX: warn? perhaps we just got interrupted at an
 
1220
                    # inconvenient moment, but perhaps files are disappearing
 
1221
                    # from under us?
1105
1222
            try:
1106
1223
                delete_any(self._limbodir)
1107
1224
            except OSError:
1115
1232
        finally:
1116
1233
            TreeTransformBase.finalize(self)
1117
1234
 
 
1235
    def _limbo_supports_executable(self):
 
1236
        """Check if the limbo path supports the executable bit."""
 
1237
        # FIXME: Check actual file system capabilities of limbodir
 
1238
        return osutils.supports_executable()
 
1239
 
1118
1240
    def _limbo_name(self, trans_id):
1119
1241
        """Generate the limbo name of a file"""
1120
1242
        limbo_name = self._limbo_files.get(trans_id)
1156
1278
        entries from _limbo_files, because they are now stale.
1157
1279
        """
1158
1280
        for trans_id in trans_ids:
1159
 
            old_path = self._limbo_files.pop(trans_id)
 
1281
            old_path = self._limbo_files[trans_id]
 
1282
            self._possibly_stale_limbo_files.add(old_path)
 
1283
            del self._limbo_files[trans_id]
1160
1284
            if trans_id not in self._new_contents:
1161
1285
                continue
1162
1286
            new_path = self._limbo_name(trans_id)
1163
 
            osutils.rename(old_path, new_path)
 
1287
            os.rename(old_path, new_path)
 
1288
            self._possibly_stale_limbo_files.remove(old_path)
1164
1289
            for descendant in self._limbo_descendants(trans_id):
1165
1290
                desc_path = self._limbo_files[descendant]
1166
1291
                desc_path = new_path + desc_path[len(old_path):]
1173
1298
            descendants.update(self._limbo_descendants(descendant))
1174
1299
        return descendants
1175
1300
 
1176
 
    def create_file(self, contents, trans_id, mode_id=None):
 
1301
    def create_file(self, contents, trans_id, mode_id=None, sha1=None):
1177
1302
        """Schedule creation of a new file.
1178
1303
 
1179
 
        See also new_file.
1180
 
 
1181
 
        Contents is an iterator of strings, all of which will be written
1182
 
        to the target destination.
1183
 
 
1184
 
        New file takes the permissions of any existing file with that id,
1185
 
        unless mode_id is specified.
 
1304
        :seealso: new_file.
 
1305
 
 
1306
        :param contents: an iterator of strings, all of which will be written
 
1307
            to the target destination.
 
1308
        :param trans_id: TreeTransform handle
 
1309
        :param mode_id: If not None, force the mode of the target file to match
 
1310
            the mode of the object referenced by mode_id.
 
1311
            Otherwise, we will try to preserve mode bits of an existing file.
 
1312
        :param sha1: If the sha1 of this content is already known, pass it in.
 
1313
            We can use it to prevent future sha1 computations.
1186
1314
        """
1187
1315
        name = self._limbo_name(trans_id)
1188
1316
        f = open(name, 'wb')
1189
1317
        try:
1190
 
            try:
1191
 
                unique_add(self._new_contents, trans_id, 'file')
1192
 
            except:
1193
 
                # Clean up the file, it never got registered so
1194
 
                # TreeTransform.finalize() won't clean it up.
1195
 
                f.close()
1196
 
                os.unlink(name)
1197
 
                raise
1198
 
 
 
1318
            unique_add(self._new_contents, trans_id, 'file')
1199
1319
            f.writelines(contents)
1200
1320
        finally:
1201
1321
            f.close()
1202
1322
        self._set_mtime(name)
1203
1323
        self._set_mode(trans_id, mode_id, S_ISREG)
 
1324
        # It is unfortunate we have to use lstat instead of fstat, but we just
 
1325
        # used utime and chmod on the file, so we need the accurate final
 
1326
        # details.
 
1327
        if sha1 is not None:
 
1328
            self._observed_sha1s[trans_id] = (sha1, osutils.lstat(name))
1204
1329
 
1205
1330
    def _read_file_chunks(self, trans_id):
1206
1331
        cur_file = open(self._limbo_name(trans_id), 'rb')
1265
1390
    def cancel_creation(self, trans_id):
1266
1391
        """Cancel the creation of new file contents."""
1267
1392
        del self._new_contents[trans_id]
 
1393
        if trans_id in self._observed_sha1s:
 
1394
            del self._observed_sha1s[trans_id]
1268
1395
        children = self._limbo_children.get(trans_id)
1269
1396
        # if this is a limbo directory with children, move them before removing
1270
1397
        # the directory
1274
1401
            del self._limbo_children_names[trans_id]
1275
1402
        delete_any(self._limbo_name(trans_id))
1276
1403
 
 
1404
    def new_orphan(self, trans_id, parent_id):
 
1405
        # FIXME: There is no tree config, so we use the branch one (it's weird
 
1406
        # to define it this way as orphaning can only occur in a working tree,
 
1407
        # but that's all we have (for now). It will find the option in
 
1408
        # locations.conf or bazaar.conf though) -- vila 20100916
 
1409
        conf = self._tree.branch.get_config()
 
1410
        conf_var_name = 'bzr.transform.orphan_policy'
 
1411
        orphan_policy = conf.get_user_option(conf_var_name)
 
1412
        default_policy = orphaning_registry.default_key
 
1413
        if orphan_policy is None:
 
1414
            orphan_policy = default_policy
 
1415
        if orphan_policy not in orphaning_registry:
 
1416
            trace.warning('%s (from %s) is not a known policy, defaulting '
 
1417
                'to %s' % (orphan_policy, conf_var_name, default_policy))
 
1418
            orphan_policy = default_policy
 
1419
        handle_orphan = orphaning_registry.get(orphan_policy)
 
1420
        handle_orphan(self, trans_id, parent_id)
 
1421
 
 
1422
 
 
1423
class OrphaningError(errors.BzrError):
 
1424
 
 
1425
    # Only bugs could lead to such exception being seen by the user
 
1426
    internal_error = True
 
1427
    _fmt = "Error while orphaning %s in %s directory"
 
1428
 
 
1429
    def __init__(self, orphan, parent):
 
1430
        errors.BzrError.__init__(self)
 
1431
        self.orphan = orphan
 
1432
        self.parent = parent
 
1433
 
 
1434
 
 
1435
class OrphaningForbidden(OrphaningError):
 
1436
 
 
1437
    _fmt = "Policy: %s doesn't allow creating orphans."
 
1438
 
 
1439
    def __init__(self, policy):
 
1440
        errors.BzrError.__init__(self)
 
1441
        self.policy = policy
 
1442
 
 
1443
 
 
1444
def move_orphan(tt, orphan_id, parent_id):
 
1445
    """See TreeTransformBase.new_orphan.
 
1446
 
 
1447
    This creates a new orphan in the `bzr-orphans` dir at the root of the
 
1448
    `TreeTransform`.
 
1449
 
 
1450
    :param tt: The TreeTransform orphaning `trans_id`.
 
1451
 
 
1452
    :param orphan_id: The trans id that should be orphaned.
 
1453
 
 
1454
    :param parent_id: The orphan parent trans id.
 
1455
    """
 
1456
    # Add the orphan dir if it doesn't exist
 
1457
    orphan_dir_basename = 'bzr-orphans'
 
1458
    od_id = tt.trans_id_tree_path(orphan_dir_basename)
 
1459
    if tt.final_kind(od_id) is None:
 
1460
        tt.create_directory(od_id)
 
1461
    parent_path = tt._tree_id_paths[parent_id]
 
1462
    # Find a name that doesn't exist yet in the orphan dir
 
1463
    actual_name = tt.final_name(orphan_id)
 
1464
    new_name = tt._available_backup_name(actual_name, od_id)
 
1465
    tt.adjust_path(new_name, od_id, orphan_id)
 
1466
    trace.warning('%s has been orphaned in %s'
 
1467
                  % (joinpath(parent_path, actual_name), orphan_dir_basename))
 
1468
 
 
1469
 
 
1470
def refuse_orphan(tt, orphan_id, parent_id):
 
1471
    """See TreeTransformBase.new_orphan.
 
1472
 
 
1473
    This refuses to create orphan, letting the caller handle the conflict.
 
1474
    """
 
1475
    raise OrphaningForbidden('never')
 
1476
 
 
1477
 
 
1478
orphaning_registry = registry.Registry()
 
1479
orphaning_registry.register(
 
1480
    'conflict', refuse_orphan,
 
1481
    'Leave orphans in place and create a conflict on the directory.')
 
1482
orphaning_registry.register(
 
1483
    'move', move_orphan,
 
1484
    'Move orphans into the bzr-orphans directory.')
 
1485
orphaning_registry._set_default_key('conflict')
 
1486
 
1277
1487
 
1278
1488
class TreeTransform(DiskTreeTransform):
1279
1489
    """Represent a tree transformation.
1351
1561
        try:
1352
1562
            limbodir = urlutils.local_path_from_url(
1353
1563
                tree._transport.abspath('limbo'))
1354
 
            try:
1355
 
                os.mkdir(limbodir)
1356
 
            except OSError, e:
1357
 
                if e.errno == errno.EEXIST:
1358
 
                    raise ExistingLimbo(limbodir)
 
1564
            osutils.ensure_empty_directory_exists(
 
1565
                limbodir,
 
1566
                errors.ExistingLimbo)
1359
1567
            deletiondir = urlutils.local_path_from_url(
1360
1568
                tree._transport.abspath('pending-deletion'))
1361
 
            try:
1362
 
                os.mkdir(deletiondir)
1363
 
            except OSError, e:
1364
 
                if e.errno == errno.EEXIST:
1365
 
                    raise errors.ExistingPendingDeletion(deletiondir)
 
1569
            osutils.ensure_empty_directory_exists(
 
1570
                deletiondir,
 
1571
                errors.ExistingPendingDeletion)
1366
1572
        except:
1367
1573
            tree.unlock()
1368
1574
            raise
1397
1603
    def tree_kind(self, trans_id):
1398
1604
        """Determine the file kind in the working tree.
1399
1605
 
1400
 
        Raises NoSuchFile if the file does not exist
 
1606
        :returns: The file kind or None if the file does not exist
1401
1607
        """
1402
1608
        path = self._tree_id_paths.get(trans_id)
1403
1609
        if path is None:
1404
 
            raise NoSuchFile(None)
 
1610
            return None
1405
1611
        try:
1406
1612
            return file_kind(self._tree.abspath(path))
1407
 
        except OSError, e:
1408
 
            if e.errno != errno.ENOENT:
1409
 
                raise
1410
 
            else:
1411
 
                raise NoSuchFile(path)
 
1613
        except errors.NoSuchFile:
 
1614
            return None
1412
1615
 
1413
1616
    def _set_mode(self, trans_id, mode_id, typefunc):
1414
1617
        """Set the mode of new file contents.
1434
1637
            else:
1435
1638
                raise
1436
1639
        if typefunc(mode):
1437
 
            os.chmod(self._limbo_name(trans_id), mode)
 
1640
            osutils.chmod_if_possible(self._limbo_name(trans_id), mode)
1438
1641
 
1439
1642
    def iter_tree_children(self, parent_id):
1440
1643
        """Iterate through the entry's tree children, if any"""
1520
1723
        """
1521
1724
        if not no_conflicts:
1522
1725
            self._check_malformed()
1523
 
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
1726
        child_pb = ui.ui_factory.nested_progress_bar()
1524
1727
        try:
1525
1728
            if precomputed_delta is None:
1526
 
                child_pb.update('Apply phase', 0, 2)
 
1729
                child_pb.update(gettext('Apply phase'), 0, 2)
1527
1730
                inventory_delta = self._generate_inventory_delta()
1528
1731
                offset = 1
1529
1732
            else:
1534
1737
            else:
1535
1738
                mover = _mover
1536
1739
            try:
1537
 
                child_pb.update('Apply phase', 0 + offset, 2 + offset)
 
1740
                child_pb.update(gettext('Apply phase'), 0 + offset, 2 + offset)
1538
1741
                self._apply_removals(mover)
1539
 
                child_pb.update('Apply phase', 1 + offset, 2 + offset)
 
1742
                child_pb.update(gettext('Apply phase'), 1 + offset, 2 + offset)
1540
1743
                modified_paths = self._apply_insertions(mover)
1541
1744
            except:
1542
1745
                mover.rollback()
1545
1748
                mover.apply_deletions()
1546
1749
        finally:
1547
1750
            child_pb.finished()
 
1751
        if self.final_file_id(self.root) is None:
 
1752
            inventory_delta = [e for e in inventory_delta if e[0] != '']
1548
1753
        self._tree.apply_inventory_delta(inventory_delta)
 
1754
        self._apply_observed_sha1s()
1549
1755
        self._done = True
1550
1756
        self.finalize()
1551
1757
        return _TransformResults(modified_paths, self.rename_count)
1553
1759
    def _generate_inventory_delta(self):
1554
1760
        """Generate an inventory delta for the current transform."""
1555
1761
        inventory_delta = []
1556
 
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
1762
        child_pb = ui.ui_factory.nested_progress_bar()
1557
1763
        new_paths = self._inventory_altered()
1558
1764
        total_entries = len(new_paths) + len(self._removed_id)
1559
1765
        try:
1560
1766
            for num, trans_id in enumerate(self._removed_id):
1561
1767
                if (num % 10) == 0:
1562
 
                    child_pb.update('removing file', num, total_entries)
 
1768
                    child_pb.update(gettext('removing file'), num, total_entries)
1563
1769
                if trans_id == self._new_root:
1564
1770
                    file_id = self._tree.get_root_id()
1565
1771
                else:
1577
1783
            final_kinds = {}
1578
1784
            for num, (path, trans_id) in enumerate(new_paths):
1579
1785
                if (num % 10) == 0:
1580
 
                    child_pb.update('adding file',
 
1786
                    child_pb.update(gettext('adding file'),
1581
1787
                                    num + len(self._removed_id), total_entries)
1582
1788
                file_id = new_path_file_ids[trans_id]
1583
1789
                if file_id is None:
1584
1790
                    continue
1585
1791
                needs_entry = False
1586
 
                try:
1587
 
                    kind = self.final_kind(trans_id)
1588
 
                except NoSuchFile:
 
1792
                kind = self.final_kind(trans_id)
 
1793
                if kind is None:
1589
1794
                    kind = self._tree.stored_kind(file_id)
1590
1795
                parent_trans_id = self.final_parent(trans_id)
1591
1796
                parent_file_id = new_path_file_ids.get(parent_trans_id)
1622
1827
        """
1623
1828
        tree_paths = list(self._tree_path_ids.iteritems())
1624
1829
        tree_paths.sort(reverse=True)
1625
 
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
1830
        child_pb = ui.ui_factory.nested_progress_bar()
1626
1831
        try:
1627
 
            for num, data in enumerate(tree_paths):
1628
 
                path, trans_id = data
1629
 
                child_pb.update('removing file', num, len(tree_paths))
 
1832
            for num, (path, trans_id) in enumerate(tree_paths):
 
1833
                # do not attempt to move root into a subdirectory of itself.
 
1834
                if path == '':
 
1835
                    continue
 
1836
                child_pb.update(gettext('removing file'), num, len(tree_paths))
1630
1837
                full_path = self._tree.abspath(path)
1631
1838
                if trans_id in self._removed_contents:
1632
1839
                    delete_path = os.path.join(self._deletiondir, trans_id)
1635
1842
                      or trans_id in self._new_parent):
1636
1843
                    try:
1637
1844
                        mover.rename(full_path, self._limbo_name(trans_id))
1638
 
                    except OSError, e:
 
1845
                    except errors.TransformRenameFailed, e:
1639
1846
                        if e.errno != errno.ENOENT:
1640
1847
                            raise
1641
1848
                    else:
1657
1864
        modified_paths = []
1658
1865
        new_path_file_ids = dict((t, self.final_file_id(t)) for p, t in
1659
1866
                                 new_paths)
1660
 
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
1867
        child_pb = ui.ui_factory.nested_progress_bar()
1661
1868
        try:
1662
1869
            for num, (path, trans_id) in enumerate(new_paths):
1663
1870
                if (num % 10) == 0:
1664
 
                    child_pb.update('adding file', num, len(new_paths))
 
1871
                    child_pb.update(gettext('adding file'), num, len(new_paths))
1665
1872
                full_path = self._tree.abspath(path)
1666
1873
                if trans_id in self._needs_rename:
1667
1874
                    try:
1668
1875
                        mover.rename(self._limbo_name(trans_id), full_path)
1669
 
                    except OSError, e:
 
1876
                    except errors.TransformRenameFailed, e:
1670
1877
                        # We may be renaming a dangling inventory id
1671
1878
                        if e.errno != errno.ENOENT:
1672
1879
                            raise
1673
1880
                    else:
1674
1881
                        self.rename_count += 1
 
1882
                    # TODO: if trans_id in self._observed_sha1s, we should
 
1883
                    #       re-stat the final target, since ctime will be
 
1884
                    #       updated by the change.
1675
1885
                if (trans_id in self._new_contents or
1676
1886
                    self.path_changed(trans_id)):
1677
1887
                    if trans_id in self._new_contents:
1678
1888
                        modified_paths.append(full_path)
1679
1889
                if trans_id in self._new_executability:
1680
1890
                    self._set_executability(path, trans_id)
 
1891
                if trans_id in self._observed_sha1s:
 
1892
                    o_sha1, o_st_val = self._observed_sha1s[trans_id]
 
1893
                    st = osutils.lstat(full_path)
 
1894
                    self._observed_sha1s[trans_id] = (o_sha1, st)
1681
1895
        finally:
1682
1896
            child_pb.finished()
 
1897
        for path, trans_id in new_paths:
 
1898
            # new_paths includes stuff like workingtree conflicts. Only the
 
1899
            # stuff in new_contents actually comes from limbo.
 
1900
            if trans_id in self._limbo_files:
 
1901
                del self._limbo_files[trans_id]
1683
1902
        self._new_contents.clear()
1684
1903
        return modified_paths
1685
1904
 
 
1905
    def _apply_observed_sha1s(self):
 
1906
        """After we have finished renaming everything, update observed sha1s
 
1907
 
 
1908
        This has to be done after self._tree.apply_inventory_delta, otherwise
 
1909
        it doesn't know anything about the files we are updating. Also, we want
 
1910
        to do this as late as possible, so that most entries end up cached.
 
1911
        """
 
1912
        # TODO: this doesn't update the stat information for directories. So
 
1913
        #       the first 'bzr status' will still need to rewrite
 
1914
        #       .bzr/checkout/dirstate. However, we at least don't need to
 
1915
        #       re-read all of the files.
 
1916
        # TODO: If the operation took a while, we could do a time.sleep(3) here
 
1917
        #       to allow the clock to tick over and ensure we won't have any
 
1918
        #       problems. (we could observe start time, and finish time, and if
 
1919
        #       it is less than eg 10% overhead, add a sleep call.)
 
1920
        paths = FinalPaths(self)
 
1921
        for trans_id, observed in self._observed_sha1s.iteritems():
 
1922
            path = paths.get_path(trans_id)
 
1923
            # We could get the file_id, but dirstate prefers to use the path
 
1924
            # anyway, and it is 'cheaper' to determine.
 
1925
            # file_id = self._new_id[trans_id]
 
1926
            self._tree._observed_sha1(None, path, observed)
 
1927
 
1686
1928
 
1687
1929
class TransformPreview(DiskTreeTransform):
1688
1930
    """A TreeTransform for generating preview trees.
1703
1945
    def tree_kind(self, trans_id):
1704
1946
        path = self._tree_id_paths.get(trans_id)
1705
1947
        if path is None:
1706
 
            raise NoSuchFile(None)
1707
 
        file_id = self._tree.path2id(path)
1708
 
        return self._tree.kind(file_id)
 
1948
            return None
 
1949
        kind = self._tree.path_content_summary(path)[0]
 
1950
        if kind == 'missing':
 
1951
            kind = None
 
1952
        return kind
1709
1953
 
1710
1954
    def _set_mode(self, trans_id, mode_id, typefunc):
1711
1955
        """Set the mode of new file contents.
1731
1975
            childpath = joinpath(path, child)
1732
1976
            yield self.trans_id_tree_path(childpath)
1733
1977
 
1734
 
 
1735
 
class _PreviewTree(tree.Tree):
 
1978
    def new_orphan(self, trans_id, parent_id):
 
1979
        raise NotImplementedError(self.new_orphan)
 
1980
 
 
1981
 
 
1982
class _PreviewTree(tree.InventoryTree):
1736
1983
    """Partial implementation of Tree to support show_diff_trees"""
1737
1984
 
1738
1985
    def __init__(self, transform):
1767
2014
                yield self._get_repository().revision_tree(revision_id)
1768
2015
 
1769
2016
    def _get_file_revision(self, file_id, vf, tree_revision):
1770
 
        parent_keys = [(file_id, self._file_revision(t, file_id)) for t in
 
2017
        parent_keys = [(file_id, t.get_file_revision(file_id)) for t in
1771
2018
                       self._iter_parent_trees()]
1772
2019
        vf.add_lines((file_id, tree_revision), parent_keys,
1773
 
                     self.get_file(file_id).readlines())
 
2020
                     self.get_file_lines(file_id))
1774
2021
        repo = self._get_repository()
1775
2022
        base_vf = repo.texts
1776
2023
        if base_vf not in vf.fallback_versionedfiles:
1777
2024
            vf.fallback_versionedfiles.append(base_vf)
1778
2025
        return tree_revision
1779
2026
 
1780
 
    def _stat_limbo_file(self, file_id):
1781
 
        trans_id = self._transform.trans_id_file_id(file_id)
 
2027
    def _stat_limbo_file(self, file_id=None, trans_id=None):
 
2028
        if trans_id is None:
 
2029
            trans_id = self._transform.trans_id_file_id(file_id)
1782
2030
        name = self._transform._limbo_name(trans_id)
1783
2031
        return os.lstat(name)
1784
2032
 
1798
2046
            executable = self.is_executable(file_id, path)
1799
2047
        return kind, executable, None
1800
2048
 
 
2049
    def is_locked(self):
 
2050
        return False
 
2051
 
1801
2052
    def lock_read(self):
1802
2053
        # Perhaps in theory, this should lock the TreeTransform?
1803
 
        pass
 
2054
        return self
1804
2055
 
1805
2056
    def unlock(self):
1806
2057
        pass
1807
2058
 
1808
2059
    @property
 
2060
    @deprecated_method(deprecated_in((2, 5, 0)))
1809
2061
    def inventory(self):
1810
2062
        """This Tree does not use inventory as its backing data."""
1811
2063
        raise NotImplementedError(_PreviewTree.inventory)
1812
2064
 
 
2065
    @property
 
2066
    def root_inventory(self):
 
2067
        """This Tree does not use inventory as its backing data."""
 
2068
        raise NotImplementedError(_PreviewTree.root_inventory)
 
2069
 
1813
2070
    def get_root_id(self):
1814
2071
        return self._transform.final_file_id(self._transform.root)
1815
2072
 
1904
2161
            if (specific_file_ids is not None
1905
2162
                and file_id not in specific_file_ids):
1906
2163
                continue
1907
 
            try:
1908
 
                kind = self._transform.final_kind(trans_id)
1909
 
            except NoSuchFile:
 
2164
            kind = self._transform.final_kind(trans_id)
 
2165
            if kind is None:
1910
2166
                kind = self._transform._tree.stored_kind(file_id)
1911
2167
            new_entry = inventory.make_entry(
1912
2168
                kind,
1997
2253
 
1998
2254
    def get_file_size(self, file_id):
1999
2255
        """See Tree.get_file_size"""
 
2256
        trans_id = self._transform.trans_id_file_id(file_id)
 
2257
        kind = self._transform.final_kind(trans_id)
 
2258
        if kind != 'file':
 
2259
            return None
 
2260
        if trans_id in self._transform._new_contents:
 
2261
            return self._stat_limbo_file(trans_id=trans_id).st_size
2000
2262
        if self.kind(file_id) == 'file':
2001
2263
            return self._transform._tree.get_file_size(file_id)
2002
2264
        else:
2003
2265
            return None
2004
2266
 
 
2267
    def get_file_verifier(self, file_id, path=None, stat_value=None):
 
2268
        trans_id = self._transform.trans_id_file_id(file_id)
 
2269
        kind = self._transform._new_contents.get(trans_id)
 
2270
        if kind is None:
 
2271
            return self._transform._tree.get_file_verifier(file_id)
 
2272
        if kind == 'file':
 
2273
            fileobj = self.get_file(file_id)
 
2274
            try:
 
2275
                return ("SHA1", sha_file(fileobj))
 
2276
            finally:
 
2277
                fileobj.close()
 
2278
 
2005
2279
    def get_file_sha1(self, file_id, path=None, stat_value=None):
2006
2280
        trans_id = self._transform.trans_id_file_id(file_id)
2007
2281
        kind = self._transform._new_contents.get(trans_id)
2030
2304
            except errors.NoSuchId:
2031
2305
                return False
2032
2306
 
 
2307
    def has_filename(self, path):
 
2308
        trans_id = self._path2trans_id(path)
 
2309
        if trans_id in self._transform._new_contents:
 
2310
            return True
 
2311
        elif trans_id in self._transform._removed_contents:
 
2312
            return False
 
2313
        else:
 
2314
            return self._transform._tree.has_filename(path)
 
2315
 
2033
2316
    def path_content_summary(self, path):
2034
2317
        trans_id = self._path2trans_id(path)
2035
2318
        tt = self._transform
2048
2331
            if kind == 'file':
2049
2332
                statval = os.lstat(limbo_name)
2050
2333
                size = statval.st_size
2051
 
                if not supports_executable():
 
2334
                if not tt._limbo_supports_executable():
2052
2335
                    executable = False
2053
2336
                else:
2054
2337
                    executable = statval.st_mode & S_IEXEC
2123
2406
                                   self.get_file(file_id).readlines(),
2124
2407
                                   default_revision)
2125
2408
 
2126
 
    def get_symlink_target(self, file_id):
 
2409
    def get_symlink_target(self, file_id, path=None):
2127
2410
        """See Tree.get_symlink_target"""
2128
2411
        if not self._content_change(file_id):
2129
2412
            return self._transform._tree.get_symlink_target(file_id)
2144
2427
                path_from_root = self._final_paths.get_path(child_id)
2145
2428
                basename = self._transform.final_name(child_id)
2146
2429
                file_id = self._transform.final_file_id(child_id)
2147
 
                try:
2148
 
                    kind = self._transform.final_kind(child_id)
 
2430
                kind  = self._transform.final_kind(child_id)
 
2431
                if kind is not None:
2149
2432
                    versioned_kind = kind
2150
 
                except NoSuchFile:
 
2433
                else:
2151
2434
                    kind = 'unknown'
2152
2435
                    versioned_kind = self._transform._tree.stored_kind(file_id)
2153
2436
                if versioned_kind == 'directory':
2266
2549
    for num, _unused in enumerate(wt.all_file_ids()):
2267
2550
        if num > 0:  # more than just a root
2268
2551
            raise errors.WorkingTreeAlreadyPopulated(base=wt.basedir)
2269
 
    existing_files = set()
2270
 
    for dir, files in wt.walkdirs():
2271
 
        existing_files.update(f[0] for f in files)
2272
2552
    file_trans_id = {}
2273
 
    top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
2553
    top_pb = ui.ui_factory.nested_progress_bar()
2274
2554
    pp = ProgressPhase("Build phase", 2, top_pb)
2275
 
    if tree.inventory.root is not None:
 
2555
    if tree.get_root_id() is not None:
2276
2556
        # This is kind of a hack: we should be altering the root
2277
2557
        # as part of the regular tree shape diff logic.
2278
2558
        # The conditional test here is to avoid doing an
2289
2569
        pp.next_phase()
2290
2570
        file_trans_id[wt.get_root_id()] = \
2291
2571
            tt.trans_id_tree_file_id(wt.get_root_id())
2292
 
        pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
2572
        pb = ui.ui_factory.nested_progress_bar()
2293
2573
        try:
2294
2574
            deferred_contents = []
2295
2575
            num = 0
2296
 
            total = len(tree.inventory)
 
2576
            total = len(tree.all_file_ids())
2297
2577
            if delta_from_tree:
2298
2578
                precomputed_delta = []
2299
2579
            else:
2300
2580
                precomputed_delta = None
 
2581
            # Check if tree inventory has content. If so, we populate
 
2582
            # existing_files with the directory content. If there are no
 
2583
            # entries we skip populating existing_files as its not used.
 
2584
            # This improves performance and unncessary work on large
 
2585
            # directory trees. (#501307)
 
2586
            if total > 0:
 
2587
                existing_files = set()
 
2588
                for dir, files in wt.walkdirs():
 
2589
                    existing_files.update(f[0] for f in files)
2301
2590
            for num, (tree_path, entry) in \
2302
 
                enumerate(tree.inventory.iter_entries_by_dir()):
2303
 
                pb.update("Building tree", num - len(deferred_contents), total)
 
2591
                enumerate(tree.iter_entries_by_dir()):
 
2592
                pb.update(gettext("Building tree"), num - len(deferred_contents), total)
2304
2593
                if entry.parent_id is None:
2305
2594
                    continue
2306
2595
                reparent = False
2312
2601
                    kind = file_kind(target_path)
2313
2602
                    if kind == "directory":
2314
2603
                        try:
2315
 
                            bzrdir.BzrDir.open(target_path)
 
2604
                            controldir.ControlDir.open(target_path)
2316
2605
                        except errors.NotBranchError:
2317
2606
                            pass
2318
2607
                        else:
2333
2622
                    executable = tree.is_executable(file_id, tree_path)
2334
2623
                    if executable:
2335
2624
                        tt.set_executability(executable, trans_id)
2336
 
                    trans_data = (trans_id, tree_path)
 
2625
                    trans_data = (trans_id, tree_path, entry.text_sha1)
2337
2626
                    deferred_contents.append((file_id, trans_data))
2338
2627
                else:
2339
2628
                    file_trans_id[file_id] = new_by_entry(tt, entry, parent_id,
2355
2644
            precomputed_delta = None
2356
2645
        conflicts = cook_conflicts(raw_conflicts, tt)
2357
2646
        for conflict in conflicts:
2358
 
            warning(conflict)
 
2647
            trace.warning(unicode(conflict))
2359
2648
        try:
2360
2649
            wt.add_conflicts(conflicts)
2361
2650
        except errors.UnsupportedOperation:
2384
2673
        unchanged = dict(unchanged)
2385
2674
        new_desired_files = []
2386
2675
        count = 0
2387
 
        for file_id, (trans_id, tree_path) in desired_files:
 
2676
        for file_id, (trans_id, tree_path, text_sha1) in desired_files:
2388
2677
            accelerator_path = unchanged.get(file_id)
2389
2678
            if accelerator_path is None:
2390
 
                new_desired_files.append((file_id, (trans_id, tree_path)))
 
2679
                new_desired_files.append((file_id,
 
2680
                    (trans_id, tree_path, text_sha1)))
2391
2681
                continue
2392
 
            pb.update('Adding file contents', count + offset, total)
 
2682
            pb.update(gettext('Adding file contents'), count + offset, total)
2393
2683
            if hardlink:
2394
2684
                tt.create_hardlink(accelerator_tree.abspath(accelerator_path),
2395
2685
                                   trans_id)
2400
2690
                    contents = filtered_output_bytes(contents, filters,
2401
2691
                        ContentFilterContext(tree_path, tree))
2402
2692
                try:
2403
 
                    tt.create_file(contents, trans_id)
 
2693
                    tt.create_file(contents, trans_id, sha1=text_sha1)
2404
2694
                finally:
2405
2695
                    try:
2406
2696
                        contents.close()
2409
2699
                        pass
2410
2700
            count += 1
2411
2701
        offset += count
2412
 
    for count, ((trans_id, tree_path), contents) in enumerate(
 
2702
    for count, ((trans_id, tree_path, text_sha1), contents) in enumerate(
2413
2703
            tree.iter_files_bytes(new_desired_files)):
2414
2704
        if wt.supports_content_filtering():
2415
2705
            filters = wt._content_filter_stack(tree_path)
2416
2706
            contents = filtered_output_bytes(contents, filters,
2417
2707
                ContentFilterContext(tree_path, tree))
2418
 
        tt.create_file(contents, trans_id)
2419
 
        pb.update('Adding file contents', count + offset, total)
 
2708
        tt.create_file(contents, trans_id, sha1=text_sha1)
 
2709
        pb.update(gettext('Adding file contents'), count + offset, total)
2420
2710
 
2421
2711
 
2422
2712
def _reparent_children(tt, old_parent, new_parent):
2423
2713
    for child in tt.iter_tree_children(old_parent):
2424
2714
        tt.adjust_path(tt.final_name(child), new_parent, child)
2425
2715
 
 
2716
 
2426
2717
def _reparent_transform_children(tt, old_parent, new_parent):
2427
2718
    by_parent = tt.by_parent()
2428
2719
    for child in by_parent[old_parent]:
2429
2720
        tt.adjust_path(tt.final_name(child), new_parent, child)
2430
2721
    return by_parent[old_parent]
2431
2722
 
 
2723
 
2432
2724
def _content_match(tree, entry, file_id, kind, target_path):
2433
2725
    if entry.kind != kind:
2434
2726
        return False
2435
2727
    if entry.kind == "directory":
2436
2728
        return True
2437
2729
    if entry.kind == "file":
2438
 
        if tree.get_file(file_id).read() == file(target_path, 'rb').read():
2439
 
            return True
 
2730
        f = file(target_path, 'rb')
 
2731
        try:
 
2732
            if tree.get_file_text(file_id) == f.read():
 
2733
                return True
 
2734
        finally:
 
2735
            f.close()
2440
2736
    elif entry.kind == "symlink":
2441
2737
        if tree.get_symlink_target(file_id) == os.readlink(target_path):
2442
2738
            return True
2494
2790
        raise errors.BadFileKindError(name, kind)
2495
2791
 
2496
2792
 
2497
 
@deprecated_function(deprecated_in((1, 9, 0)))
2498
 
def create_by_entry(tt, entry, tree, trans_id, lines=None, mode_id=None):
2499
 
    """Create new file contents according to an inventory entry.
2500
 
 
2501
 
    DEPRECATED.  Use create_from_tree instead.
2502
 
    """
2503
 
    if entry.kind == "file":
2504
 
        if lines is None:
2505
 
            lines = tree.get_file(entry.file_id).readlines()
2506
 
        tt.create_file(lines, trans_id, mode_id=mode_id)
2507
 
    elif entry.kind == "symlink":
2508
 
        tt.create_symlink(tree.get_symlink_target(entry.file_id), trans_id)
2509
 
    elif entry.kind == "directory":
2510
 
        tt.create_directory(trans_id)
2511
 
 
2512
 
 
2513
2793
def create_from_tree(tt, trans_id, tree, file_id, bytes=None,
2514
2794
    filter_tree_path=None):
2515
2795
    """Create new file contents according to tree contents.
2546
2826
        tt.set_executability(entry.executable, trans_id)
2547
2827
 
2548
2828
 
 
2829
@deprecated_function(deprecated_in((2, 3, 0)))
2549
2830
def get_backup_name(entry, by_parent, parent_trans_id, tt):
2550
2831
    return _get_backup_name(entry.name, by_parent, parent_trans_id, tt)
2551
2832
 
2552
2833
 
 
2834
@deprecated_function(deprecated_in((2, 3, 0)))
2553
2835
def _get_backup_name(name, by_parent, parent_trans_id, tt):
2554
2836
    """Produce a backup-style name that appears to be available"""
2555
2837
    def name_gen():
2562
2844
            return new_name
2563
2845
 
2564
2846
 
2565
 
def _entry_changes(file_id, entry, working_tree):
2566
 
    """Determine in which ways the inventory entry has changed.
2567
 
 
2568
 
    Returns booleans: has_contents, content_mod, meta_mod
2569
 
    has_contents means there are currently contents, but they differ
2570
 
    contents_mod means contents need to be modified
2571
 
    meta_mod means the metadata needs to be modified
2572
 
    """
2573
 
    cur_entry = working_tree.inventory[file_id]
2574
 
    try:
2575
 
        working_kind = working_tree.kind(file_id)
2576
 
        has_contents = True
2577
 
    except NoSuchFile:
2578
 
        has_contents = False
2579
 
        contents_mod = True
2580
 
        meta_mod = False
2581
 
    if has_contents is True:
2582
 
        if entry.kind != working_kind:
2583
 
            contents_mod, meta_mod = True, False
2584
 
        else:
2585
 
            cur_entry._read_tree_state(working_tree.id2path(file_id),
2586
 
                                       working_tree)
2587
 
            contents_mod, meta_mod = entry.detect_changes(cur_entry)
2588
 
            cur_entry._forget_tree_state()
2589
 
    return has_contents, contents_mod, meta_mod
2590
 
 
2591
 
 
2592
2847
def revert(working_tree, target_tree, filenames, backups=False,
2593
2848
           pb=None, change_reporter=None):
2594
2849
    """Revert a working tree's contents to those of a target tree."""
2604
2859
                unversioned_filter=working_tree.is_ignored)
2605
2860
            delta.report_changes(tt.iter_changes(), change_reporter)
2606
2861
        for conflict in conflicts:
2607
 
            warning(conflict)
 
2862
            trace.warning(unicode(conflict))
2608
2863
        pp.next_phase()
2609
2864
        tt.apply()
2610
2865
        working_tree.set_merge_modified(merge_modified)
2618
2873
def _prepare_revert_transform(working_tree, target_tree, tt, filenames,
2619
2874
                              backups, pp, basis_tree=None,
2620
2875
                              merge_modified=None):
2621
 
    child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
2876
    child_pb = ui.ui_factory.nested_progress_bar()
2622
2877
    try:
2623
2878
        if merge_modified is None:
2624
2879
            merge_modified = working_tree.merge_modified()
2627
2882
                                      merge_modified, basis_tree)
2628
2883
    finally:
2629
2884
        child_pb.finished()
2630
 
    child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
2885
    child_pb = ui.ui_factory.nested_progress_bar()
2631
2886
    try:
2632
2887
        raw_conflicts = resolve_conflicts(tt, child_pb,
2633
2888
            lambda t, c: conflict_pass(t, c, target_tree))
2641
2896
                 backups, merge_modified, basis_tree=None):
2642
2897
    if basis_tree is not None:
2643
2898
        basis_tree.lock_read()
2644
 
    change_list = target_tree.iter_changes(working_tree,
 
2899
    # We ask the working_tree for its changes relative to the target, rather
 
2900
    # than the target changes relative to the working tree. Because WT4 has an
 
2901
    # optimizer to compare itself to a target, but no optimizer for the
 
2902
    # reverse.
 
2903
    change_list = working_tree.iter_changes(target_tree,
2645
2904
        specific_files=specific_files, pb=pb)
2646
2905
    if target_tree.get_root_id() is None:
2647
2906
        skip_root = True
2651
2910
        deferred_files = []
2652
2911
        for id_num, (file_id, path, changed_content, versioned, parent, name,
2653
2912
                kind, executable) in enumerate(change_list):
2654
 
            if skip_root and file_id[0] is not None and parent[0] is None:
 
2913
            target_path, wt_path = path
 
2914
            target_versioned, wt_versioned = versioned
 
2915
            target_parent, wt_parent = parent
 
2916
            target_name, wt_name = name
 
2917
            target_kind, wt_kind = kind
 
2918
            target_executable, wt_executable = executable
 
2919
            if skip_root and wt_parent is None:
2655
2920
                continue
2656
2921
            trans_id = tt.trans_id_file_id(file_id)
2657
2922
            mode_id = None
2658
2923
            if changed_content:
2659
2924
                keep_content = False
2660
 
                if kind[0] == 'file' and (backups or kind[1] is None):
 
2925
                if wt_kind == 'file' and (backups or target_kind is None):
2661
2926
                    wt_sha1 = working_tree.get_file_sha1(file_id)
2662
2927
                    if merge_modified.get(file_id) != wt_sha1:
2663
2928
                        # acquire the basis tree lazily to prevent the
2666
2931
                        if basis_tree is None:
2667
2932
                            basis_tree = working_tree.basis_tree()
2668
2933
                            basis_tree.lock_read()
2669
 
                        if file_id in basis_tree:
 
2934
                        if basis_tree.has_id(file_id):
2670
2935
                            if wt_sha1 != basis_tree.get_file_sha1(file_id):
2671
2936
                                keep_content = True
2672
 
                        elif kind[1] is None and not versioned[1]:
 
2937
                        elif target_kind is None and not target_versioned:
2673
2938
                            keep_content = True
2674
 
                if kind[0] is not None:
 
2939
                if wt_kind is not None:
2675
2940
                    if not keep_content:
2676
2941
                        tt.delete_contents(trans_id)
2677
 
                    elif kind[1] is not None:
2678
 
                        parent_trans_id = tt.trans_id_file_id(parent[0])
2679
 
                        by_parent = tt.by_parent()
2680
 
                        backup_name = _get_backup_name(name[0], by_parent,
2681
 
                                                       parent_trans_id, tt)
 
2942
                    elif target_kind is not None:
 
2943
                        parent_trans_id = tt.trans_id_file_id(wt_parent)
 
2944
                        backup_name = tt._available_backup_name(
 
2945
                            wt_name, parent_trans_id)
2682
2946
                        tt.adjust_path(backup_name, parent_trans_id, trans_id)
2683
 
                        new_trans_id = tt.create_path(name[0], parent_trans_id)
2684
 
                        if versioned == (True, True):
 
2947
                        new_trans_id = tt.create_path(wt_name, parent_trans_id)
 
2948
                        if wt_versioned and target_versioned:
2685
2949
                            tt.unversion_file(trans_id)
2686
2950
                            tt.version_file(file_id, new_trans_id)
2687
2951
                        # New contents should have the same unix perms as old
2688
2952
                        # contents
2689
2953
                        mode_id = trans_id
2690
2954
                        trans_id = new_trans_id
2691
 
                if kind[1] in ('directory', 'tree-reference'):
 
2955
                if target_kind in ('directory', 'tree-reference'):
2692
2956
                    tt.create_directory(trans_id)
2693
 
                    if kind[1] == 'tree-reference':
 
2957
                    if target_kind == 'tree-reference':
2694
2958
                        revision = target_tree.get_reference_revision(file_id,
2695
 
                                                                      path[1])
 
2959
                                                                      target_path)
2696
2960
                        tt.set_tree_reference(revision, trans_id)
2697
 
                elif kind[1] == 'symlink':
 
2961
                elif target_kind == 'symlink':
2698
2962
                    tt.create_symlink(target_tree.get_symlink_target(file_id),
2699
2963
                                      trans_id)
2700
 
                elif kind[1] == 'file':
 
2964
                elif target_kind == 'file':
2701
2965
                    deferred_files.append((file_id, (trans_id, mode_id)))
2702
2966
                    if basis_tree is None:
2703
2967
                        basis_tree = working_tree.basis_tree()
2704
2968
                        basis_tree.lock_read()
2705
2969
                    new_sha1 = target_tree.get_file_sha1(file_id)
2706
 
                    if (file_id in basis_tree and new_sha1 ==
2707
 
                        basis_tree.get_file_sha1(file_id)):
 
2970
                    if (basis_tree.has_id(file_id) and
 
2971
                        new_sha1 == basis_tree.get_file_sha1(file_id)):
2708
2972
                        if file_id in merge_modified:
2709
2973
                            del merge_modified[file_id]
2710
2974
                    else:
2711
2975
                        merge_modified[file_id] = new_sha1
2712
2976
 
2713
2977
                    # preserve the execute bit when backing up
2714
 
                    if keep_content and executable[0] == executable[1]:
2715
 
                        tt.set_executability(executable[1], trans_id)
2716
 
                elif kind[1] is not None:
2717
 
                    raise AssertionError(kind[1])
2718
 
            if versioned == (False, True):
 
2978
                    if keep_content and wt_executable == target_executable:
 
2979
                        tt.set_executability(target_executable, trans_id)
 
2980
                elif target_kind is not None:
 
2981
                    raise AssertionError(target_kind)
 
2982
            if not wt_versioned and target_versioned:
2719
2983
                tt.version_file(file_id, trans_id)
2720
 
            if versioned == (True, False):
 
2984
            if wt_versioned and not target_versioned:
2721
2985
                tt.unversion_file(trans_id)
2722
 
            if (name[1] is not None and
2723
 
                (name[0] != name[1] or parent[0] != parent[1])):
2724
 
                if name[1] == '' and parent[1] is None:
 
2986
            if (target_name is not None and
 
2987
                (wt_name != target_name or wt_parent != target_parent)):
 
2988
                if target_name == '' and target_parent is None:
2725
2989
                    parent_trans = ROOT_PARENT
2726
2990
                else:
2727
 
                    parent_trans = tt.trans_id_file_id(parent[1])
2728
 
                if parent[0] is None and versioned[0]:
2729
 
                    tt.adjust_root_path(name[1], parent_trans)
 
2991
                    parent_trans = tt.trans_id_file_id(target_parent)
 
2992
                if wt_parent is None and wt_versioned:
 
2993
                    tt.adjust_root_path(target_name, parent_trans)
2730
2994
                else:
2731
 
                    tt.adjust_path(name[1], parent_trans, trans_id)
2732
 
            if executable[0] != executable[1] and kind[1] == "file":
2733
 
                tt.set_executability(executable[1], trans_id)
 
2995
                    tt.adjust_path(target_name, parent_trans, trans_id)
 
2996
            if wt_executable != target_executable and target_kind == "file":
 
2997
                tt.set_executability(target_executable, trans_id)
2734
2998
        if working_tree.supports_content_filtering():
2735
2999
            for index, ((trans_id, mode_id), bytes) in enumerate(
2736
3000
                target_tree.iter_files_bytes(deferred_files)):
2762
3026
    pb = ui.ui_factory.nested_progress_bar()
2763
3027
    try:
2764
3028
        for n in range(10):
2765
 
            pb.update('Resolution pass', n+1, 10)
 
3029
            pb.update(gettext('Resolution pass'), n+1, 10)
2766
3030
            conflicts = tt.find_conflicts()
2767
3031
            if len(conflicts) == 0:
2768
3032
                return new_conflicts
2792
3056
                existing_file, new_file = conflict[2], conflict[1]
2793
3057
            else:
2794
3058
                existing_file, new_file = conflict[1], conflict[2]
2795
 
            new_name = tt.final_name(existing_file)+'.moved'
 
3059
            new_name = tt.final_name(existing_file) + '.moved'
2796
3060
            tt.adjust_path(new_name, final_parent, existing_file)
2797
3061
            new_conflicts.add((c_type, 'Moved existing file to',
2798
3062
                               existing_file, new_file))
2807
3071
 
2808
3072
        elif c_type == 'missing parent':
2809
3073
            trans_id = conflict[1]
2810
 
            try:
2811
 
                tt.cancel_deletion(trans_id)
2812
 
                new_conflicts.add(('deleting parent', 'Not deleting',
2813
 
                                   trans_id))
2814
 
            except KeyError:
 
3074
            if trans_id in tt._removed_contents:
 
3075
                cancel_deletion = True
 
3076
                orphans = tt._get_potential_orphans(trans_id)
 
3077
                if orphans:
 
3078
                    cancel_deletion = False
 
3079
                    # All children are orphans
 
3080
                    for o in orphans:
 
3081
                        try:
 
3082
                            tt.new_orphan(o, trans_id)
 
3083
                        except OrphaningError:
 
3084
                            # Something bad happened so we cancel the directory
 
3085
                            # deletion which will leave it in place with a
 
3086
                            # conflict. The user can deal with it from there.
 
3087
                            # Note that this also catch the case where we don't
 
3088
                            # want to create orphans and leave the directory in
 
3089
                            # place.
 
3090
                            cancel_deletion = True
 
3091
                            break
 
3092
                if cancel_deletion:
 
3093
                    # Cancel the directory deletion
 
3094
                    tt.cancel_deletion(trans_id)
 
3095
                    new_conflicts.add(('deleting parent', 'Not deleting',
 
3096
                                       trans_id))
 
3097
            else:
2815
3098
                create = True
2816
3099
                try:
2817
3100
                    tt.final_name(trans_id)
2820
3103
                        file_id = tt.final_file_id(trans_id)
2821
3104
                        if file_id is None:
2822
3105
                            file_id = tt.inactive_file_id(trans_id)
2823
 
                        entry = path_tree.inventory[file_id]
 
3106
                        _, entry = path_tree.iter_entries_by_dir(
 
3107
                            [file_id]).next()
2824
3108
                        # special-case the other tree root (move its
2825
3109
                        # children to current root)
2826
3110
                        if entry.parent_id is None:
2841
3125
        elif c_type == 'unversioned parent':
2842
3126
            file_id = tt.inactive_file_id(conflict[1])
2843
3127
            # special-case the other tree root (move its children instead)
2844
 
            if path_tree and file_id in path_tree:
2845
 
                if path_tree.inventory[file_id].parent_id is None:
 
3128
            if path_tree and path_tree.has_id(file_id):
 
3129
                if path_tree.path2id('') == file_id:
 
3130
                    # This is the root entry, skip it
2846
3131
                    continue
2847
3132
            tt.version_file(file_id, conflict[1])
2848
3133
            new_conflicts.add((c_type, 'Versioned directory', conflict[1]))
2864
3149
 
2865
3150
def cook_conflicts(raw_conflicts, tt):
2866
3151
    """Generate a list of cooked conflicts, sorted by file path"""
2867
 
    from bzrlib.conflicts import Conflict
2868
3152
    conflict_iter = iter_cook_conflicts(raw_conflicts, tt)
2869
 
    return sorted(conflict_iter, key=Conflict.sort_key)
 
3153
    return sorted(conflict_iter, key=conflicts.Conflict.sort_key)
2870
3154
 
2871
3155
 
2872
3156
def iter_cook_conflicts(raw_conflicts, tt):
2873
 
    from bzrlib.conflicts import Conflict
2874
3157
    fp = FinalPaths(tt)
2875
3158
    for conflict in raw_conflicts:
2876
3159
        c_type = conflict[0]
2878
3161
        modified_path = fp.get_path(conflict[2])
2879
3162
        modified_id = tt.final_file_id(conflict[2])
2880
3163
        if len(conflict) == 3:
2881
 
            yield Conflict.factory(c_type, action=action, path=modified_path,
2882
 
                                     file_id=modified_id)
 
3164
            yield conflicts.Conflict.factory(
 
3165
                c_type, action=action, path=modified_path, file_id=modified_id)
2883
3166
 
2884
3167
        else:
2885
3168
            conflicting_path = fp.get_path(conflict[3])
2886
3169
            conflicting_id = tt.final_file_id(conflict[3])
2887
 
            yield Conflict.factory(c_type, action=action, path=modified_path,
2888
 
                                   file_id=modified_id,
2889
 
                                   conflict_path=conflicting_path,
2890
 
                                   conflict_file_id=conflicting_id)
 
3170
            yield conflicts.Conflict.factory(
 
3171
                c_type, action=action, path=modified_path,
 
3172
                file_id=modified_id,
 
3173
                conflict_path=conflicting_path,
 
3174
                conflict_file_id=conflicting_id)
2891
3175
 
2892
3176
 
2893
3177
class _FileMover(object):
2900
3184
    def rename(self, from_, to):
2901
3185
        """Rename a file from one path to another."""
2902
3186
        try:
2903
 
            osutils.rename(from_, to)
 
3187
            os.rename(from_, to)
2904
3188
        except OSError, e:
2905
3189
            if e.errno in (errno.EEXIST, errno.ENOTEMPTY):
2906
3190
                raise errors.FileExists(to, str(e))
2907
 
            raise
 
3191
            # normal OSError doesn't include filenames so it's hard to see where
 
3192
            # the problem is, see https://bugs.launchpad.net/bzr/+bug/491763
 
3193
            raise errors.TransformRenameFailed(from_, to, str(e), e.errno)
2908
3194
        self.past_renames.append((from_, to))
2909
3195
 
2910
3196
    def pre_delete(self, from_, to):
2920
3206
    def rollback(self):
2921
3207
        """Reverse all renames that have been performed"""
2922
3208
        for from_, to in reversed(self.past_renames):
2923
 
            osutils.rename(to, from_)
 
3209
            try:
 
3210
                os.rename(to, from_)
 
3211
            except OSError, e:
 
3212
                raise errors.TransformRenameFailed(to, from_, str(e), e.errno)
2924
3213
        # after rollback, don't reuse _FileMover
2925
3214
        past_renames = None
2926
3215
        pending_deletions = None