/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

merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
1
 
# Copyright (C) 2006, 2007 Canonical Ltd
 
1
# Copyright (C) 2006, 2007, 2008 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
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
import os
18
18
import errno
19
 
from stat import S_ISREG
 
19
from stat import S_ISREG, S_IEXEC
20
20
 
21
21
from bzrlib.lazy_import import lazy_import
22
22
lazy_import(globals(), """
23
23
from bzrlib import (
 
24
    annotate,
24
25
    bzrdir,
25
26
    delta,
26
27
    errors,
27
 
    inventory
 
28
    inventory,
 
29
    multiparent,
 
30
    osutils,
 
31
    revision as _mod_revision,
28
32
    )
 
33
from bzrlib.util import bencode
29
34
""")
30
35
from bzrlib.errors import (DuplicateKey, MalformedTransform, NoSuchFile,
31
36
                           ReusingTransform, NotVersionedError, CantMoveRoot,
32
 
                           ExistingLimbo, ImmortalLimbo, NoFinalPath)
 
37
                           ExistingLimbo, ImmortalLimbo, NoFinalPath,
 
38
                           UnableCreateSymlink)
 
39
from bzrlib.filters import filtered_output_bytes, ContentFilterContext
33
40
from bzrlib.inventory import InventoryEntry
34
 
from bzrlib.osutils import (file_kind, supports_executable, pathjoin, lexists,
35
 
                            delete_any)
 
41
from bzrlib.osutils import (
 
42
    delete_any,
 
43
    file_kind,
 
44
    has_symlinks,
 
45
    lexists,
 
46
    pathjoin,
 
47
    sha_file,
 
48
    splitpath,
 
49
    supports_executable,
 
50
)
36
51
from bzrlib.progress import DummyProgress, ProgressPhase
37
52
from bzrlib.symbol_versioning import (
38
53
        deprecated_function,
39
 
        zero_fifteen,
40
 
        zero_ninety,
 
54
        deprecated_in,
41
55
        )
42
56
from bzrlib.trace import mutter, warning
43
57
from bzrlib import tree
61
75
        self.rename_count = rename_count
62
76
 
63
77
 
64
 
class TreeTransform(object):
65
 
    """Represent a tree transformation.
66
 
    
67
 
    This object is designed to support incremental generation of the transform,
68
 
    in any order.
69
 
 
70
 
    However, it gives optimum performance when parent directories are created
71
 
    before their contents.  The transform is then able to put child files
72
 
    directly in their parent directory, avoiding later renames.
73
 
    
74
 
    It is easy to produce malformed transforms, but they are generally
75
 
    harmless.  Attempting to apply a malformed transform will cause an
76
 
    exception to be raised before any modifications are made to the tree.  
77
 
 
78
 
    Many kinds of malformed transforms can be corrected with the 
79
 
    resolve_conflicts function.  The remaining ones indicate programming error,
80
 
    such as trying to create a file with no path.
81
 
 
82
 
    Two sets of file creation methods are supplied.  Convenience methods are:
83
 
     * new_file
84
 
     * new_directory
85
 
     * new_symlink
86
 
 
87
 
    These are composed of the low-level methods:
88
 
     * create_path
89
 
     * create_file or create_directory or create_symlink
90
 
     * version_file
91
 
     * set_executability
92
 
    """
93
 
    def __init__(self, tree, pb=DummyProgress()):
94
 
        """Note: a tree_write lock is taken on the tree.
95
 
        
96
 
        Use TreeTransform.finalize() to release the lock (can be omitted if
97
 
        TreeTransform.apply() called).
 
78
class TreeTransformBase(object):
 
79
    """The base class for TreeTransform and TreeTransformBase"""
 
80
 
 
81
    def __init__(self, tree, limbodir, pb=DummyProgress(),
 
82
                 case_sensitive=True):
 
83
        """Constructor.
 
84
 
 
85
        :param tree: The tree that will be transformed, but not necessarily
 
86
            the output tree.
 
87
        :param limbodir: A directory where new files can be stored until
 
88
            they are installed in their proper places
 
89
        :param pb: A ProgressBar indicating how much progress is being made
 
90
        :param case_sensitive: If True, the target of the transform is
 
91
            case sensitive, not just case preserving.
98
92
        """
99
93
        object.__init__(self)
100
94
        self._tree = tree
101
 
        self._tree.lock_tree_write()
102
 
        try:
103
 
            control_files = self._tree._control_files
104
 
            self._limbodir = urlutils.local_path_from_url(
105
 
                control_files.controlfilename('limbo'))
106
 
            try:
107
 
                os.mkdir(self._limbodir)
108
 
            except OSError, e:
109
 
                if e.errno == errno.EEXIST:
110
 
                    raise ExistingLimbo(self._limbodir)
111
 
        except: 
112
 
            self._tree.unlock()
113
 
            raise
114
 
 
 
95
        self._limbodir = limbodir
 
96
        self._deletiondir = None
115
97
        self._id_number = 0
 
98
        # mapping of trans_id -> new basename
116
99
        self._new_name = {}
 
100
        # mapping of trans_id -> new parent trans_id
117
101
        self._new_parent = {}
 
102
        # mapping of trans_id with new contents -> new file_kind
118
103
        self._new_contents = {}
119
104
        # A mapping of transform ids to their limbo filename
120
105
        self._limbo_files = {}
125
110
        self._limbo_children_names = {}
126
111
        # List of transform ids that need to be renamed from limbo into place
127
112
        self._needs_rename = set()
 
113
        # Set of trans_ids whose contents will be removed
128
114
        self._removed_contents = set()
 
115
        # Mapping of trans_id -> new execute-bit value
129
116
        self._new_executability = {}
 
117
        # Mapping of trans_id -> new tree-reference value
130
118
        self._new_reference_revision = {}
 
119
        # Mapping of trans_id -> new file_id
131
120
        self._new_id = {}
 
121
        # Mapping of old file-id -> trans_id
132
122
        self._non_present_ids = {}
 
123
        # Mapping of new file_id -> trans_id
133
124
        self._r_new_id = {}
 
125
        # Set of trans_ids that will be removed
134
126
        self._removed_id = set()
 
127
        # Mapping of path in old tree -> trans_id
135
128
        self._tree_path_ids = {}
 
129
        # Mapping trans_id -> path in old tree
136
130
        self._tree_id_paths = {}
137
131
        # Cache of realpath results, to speed up canonical_path
138
132
        self._realpaths = {}
139
133
        # Cache of relpath results, to speed up canonical_path
140
134
        self._relpaths = {}
141
 
        self._new_root = self.trans_id_tree_file_id(tree.get_root_id())
142
 
        self.__done = False
 
135
        # The trans_id that will be used as the tree root
 
136
        root_id = tree.get_root_id()
 
137
        if root_id is not None:
 
138
            self._new_root = self.trans_id_tree_file_id(root_id)
 
139
        else:
 
140
            self._new_root = None
 
141
        # Indictor of whether the transform has been applied
 
142
        self._done = False
 
143
        # A progress bar
143
144
        self._pb = pb
 
145
        # Whether the target is case sensitive
 
146
        self._case_sensitive_target = case_sensitive
 
147
        # A counter of how many files have been renamed
144
148
        self.rename_count = 0
145
149
 
146
150
    def __get_root(self):
170
174
            except OSError:
171
175
                # We don't especially care *why* the dir is immortal.
172
176
                raise ImmortalLimbo(self._limbodir)
 
177
            try:
 
178
                if self._deletiondir is not None:
 
179
                    os.rmdir(self._deletiondir)
 
180
            except OSError:
 
181
                raise errors.ImmortalPendingDeletion(self._deletiondir)
173
182
        finally:
174
183
            self._tree.unlock()
175
184
            self._tree = None
195
204
        previous_name = self._new_name.get(trans_id)
196
205
        self._new_name[trans_id] = name
197
206
        self._new_parent[trans_id] = parent
 
207
        if parent == ROOT_PARENT:
 
208
            if self._new_root is not None:
 
209
                raise ValueError("Cannot have multiple roots.")
 
210
            self._new_root = trans_id
198
211
        if (trans_id in self._limbo_files and
199
212
            trans_id not in self._needs_rename):
200
213
            self._rename_in_limbo([trans_id])
221
234
 
222
235
    def adjust_root_path(self, name, parent):
223
236
        """Emulate moving the root by moving all children, instead.
224
 
        
 
237
 
225
238
        We do this by undoing the association of root's transaction id with the
226
239
        current tree.  This allows us to create a new directory with that
227
 
        transaction id.  We unversion the root directory and version the 
 
240
        transaction id.  We unversion the root directory and version the
228
241
        physically new directory, and hope someone versions the tree root
229
242
        later.
230
243
        """
233
246
        # force moving all children of root
234
247
        for child_id in self.iter_tree_children(old_root):
235
248
            if child_id != parent:
236
 
                self.adjust_path(self.final_name(child_id), 
 
249
                self.adjust_path(self.final_name(child_id),
237
250
                                 self.final_parent(child_id), child_id)
238
251
            file_id = self.final_file_id(child_id)
239
252
            if file_id is not None:
240
253
                self.unversion_file(child_id)
241
254
            self.version_file(file_id, child_id)
242
 
        
 
255
 
243
256
        # the physical root needs a new transaction id
244
257
        self._tree_path_ids.pop("")
245
258
        self._tree_id_paths.pop(old_root)
253
266
 
254
267
    def trans_id_tree_file_id(self, inventory_id):
255
268
        """Determine the transaction id of a working tree file.
256
 
        
 
269
 
257
270
        This reflects only files that already exist, not ones that will be
258
271
        added by transactions.
259
272
        """
260
 
        path = self._tree.inventory.id2path(inventory_id)
 
273
        if inventory_id is None:
 
274
            raise ValueError('None is not a valid file id')
 
275
        path = self._tree.id2path(inventory_id)
261
276
        return self.trans_id_tree_path(path)
262
277
 
263
278
    def trans_id_file_id(self, file_id):
266
281
        a transaction has been unversioned, it is deliberately still returned.
267
282
        (this will likely lead to an unversioned parent conflict.)
268
283
        """
 
284
        if file_id is None:
 
285
            raise ValueError('None is not a valid file id')
269
286
        if file_id in self._r_new_id and self._r_new_id[file_id] is not None:
270
287
            return self._r_new_id[file_id]
271
 
        elif file_id in self._tree.inventory:
272
 
            return self.trans_id_tree_file_id(file_id)
273
 
        elif file_id in self._non_present_ids:
274
 
            return self._non_present_ids[file_id]
275
288
        else:
276
 
            trans_id = self._assign_id()
277
 
            self._non_present_ids[file_id] = trans_id
278
 
            return trans_id
 
289
            try:
 
290
                self._tree.iter_entries_by_dir([file_id]).next()
 
291
            except StopIteration:
 
292
                if file_id in self._non_present_ids:
 
293
                    return self._non_present_ids[file_id]
 
294
                else:
 
295
                    trans_id = self._assign_id()
 
296
                    self._non_present_ids[file_id] = trans_id
 
297
                    return trans_id
 
298
            else:
 
299
                return self.trans_id_tree_file_id(file_id)
279
300
 
280
301
    def canonical_path(self, path):
281
302
        """Get the canonical tree-relative path"""
315
336
        """Schedule creation of a new file.
316
337
 
317
338
        See also new_file.
318
 
        
 
339
 
319
340
        Contents is an iterator of strings, all of which will be written
320
341
        to the target destination.
321
342
 
354
375
        try:
355
376
            mode = os.stat(self._tree.abspath(old_path)).st_mode
356
377
        except OSError, e:
357
 
            if e.errno == errno.ENOENT:
 
378
            if e.errno in (errno.ENOENT, errno.ENOTDIR):
 
379
                # Either old_path doesn't exist, or the parent of the
 
380
                # target is not a directory (but will be one eventually)
 
381
                # Either way, we know it doesn't exist *right now*
 
382
                # See also bug #248448
358
383
                return
359
384
            else:
360
385
                raise
361
386
        if typefunc(mode):
362
387
            os.chmod(self._limbo_name(trans_id), mode)
363
388
 
 
389
    def create_hardlink(self, path, trans_id):
 
390
        """Schedule creation of a hard link"""
 
391
        name = self._limbo_name(trans_id)
 
392
        try:
 
393
            os.link(path, name)
 
394
        except OSError, e:
 
395
            if e.errno != errno.EPERM:
 
396
                raise
 
397
            raise errors.HardLinkNotSupported(path)
 
398
        try:
 
399
            unique_add(self._new_contents, trans_id, 'file')
 
400
        except:
 
401
            # Clean up the file, it never got registered so
 
402
            # TreeTransform.finalize() won't clean it up.
 
403
            os.unlink(name)
 
404
            raise
 
405
 
364
406
    def create_directory(self, trans_id):
365
407
        """Schedule creation of a new directory.
366
 
        
 
408
 
367
409
        See also new_directory.
368
410
        """
369
411
        os.mkdir(self._limbo_name(trans_id))
375
417
        target is a bytestring.
376
418
        See also new_symlink.
377
419
        """
378
 
        os.symlink(target, self._limbo_name(trans_id))
379
 
        unique_add(self._new_contents, trans_id, 'symlink')
 
420
        if has_symlinks():
 
421
            os.symlink(target, self._limbo_name(trans_id))
 
422
            unique_add(self._new_contents, trans_id, 'symlink')
 
423
        else:
 
424
            try:
 
425
                path = FinalPaths(self).get_path(trans_id)
 
426
            except KeyError:
 
427
                path = None
 
428
            raise UnableCreateSymlink(path=path)
380
429
 
381
430
    def cancel_creation(self, trans_id):
382
431
        """Cancel the creation of new file contents."""
423
472
 
424
473
    def version_file(self, file_id, trans_id):
425
474
        """Schedule a file to become versioned."""
426
 
        assert file_id is not None
 
475
        if file_id is None:
 
476
            raise ValueError()
427
477
        unique_add(self._new_id, trans_id, file_id)
428
478
        unique_add(self._r_new_id, file_id, trans_id)
429
479
 
433
483
        del self._new_id[trans_id]
434
484
        del self._r_new_id[file_id]
435
485
 
436
 
    def new_paths(self):
437
 
        """Determine the paths of all new and changed files"""
438
 
        new_ids = set()
439
 
        fp = FinalPaths(self)
440
 
        for id_set in (self._new_name, self._new_parent, self._new_contents,
441
 
                       self._new_id, self._new_executability):
442
 
            new_ids.update(id_set)
443
 
        new_paths = [(fp.get_path(t), t) for t in new_ids]
444
 
        new_paths.sort()
445
 
        return new_paths
 
486
    def new_paths(self, filesystem_only=False):
 
487
        """Determine the paths of all new and changed files.
 
488
 
 
489
        :param filesystem_only: if True, only calculate values for files
 
490
            that require renames or execute bit changes.
 
491
        """
 
492
        new_ids = set()
 
493
        if filesystem_only:
 
494
            stale_ids = self._needs_rename.difference(self._new_name)
 
495
            stale_ids.difference_update(self._new_parent)
 
496
            stale_ids.difference_update(self._new_contents)
 
497
            stale_ids.difference_update(self._new_id)
 
498
            needs_rename = self._needs_rename.difference(stale_ids)
 
499
            id_sets = (needs_rename, self._new_executability)
 
500
        else:
 
501
            id_sets = (self._new_name, self._new_parent, self._new_contents,
 
502
                       self._new_id, self._new_executability)
 
503
        for id_set in id_sets:
 
504
            new_ids.update(id_set)
 
505
        return sorted(FinalPaths(self).get_paths(new_ids))
 
506
 
 
507
    def _inventory_altered(self):
 
508
        """Get the trans_ids and paths of files needing new inv entries."""
 
509
        new_ids = set()
 
510
        for id_set in [self._new_name, self._new_parent, self._new_id,
 
511
                       self._new_executability]:
 
512
            new_ids.update(id_set)
 
513
        changed_kind = set(self._removed_contents)
 
514
        changed_kind.intersection_update(self._new_contents)
 
515
        changed_kind.difference_update(new_ids)
 
516
        changed_kind = (t for t in changed_kind if self.tree_kind(t) !=
 
517
                        self.final_kind(t))
 
518
        new_ids.update(changed_kind)
 
519
        return sorted(FinalPaths(self).get_paths(new_ids))
446
520
 
447
521
    def tree_kind(self, trans_id):
448
522
        """Determine the file kind in the working tree.
462
536
 
463
537
    def final_kind(self, trans_id):
464
538
        """Determine the final file kind, after any changes applied.
465
 
        
 
539
 
466
540
        Raises NoSuchFile if the file does not exist/has no contents.
467
541
        (It is conceivable that a path would be created without the
468
542
        corresponding contents insertion command)
483
557
            return None
484
558
        # the file is old; the old id is still valid
485
559
        if self._new_root == trans_id:
486
 
            return self._tree.inventory.root.file_id
487
 
        return self._tree.inventory.path2id(path)
 
560
            return self._tree.get_root_id()
 
561
        return self._tree.path2id(path)
488
562
 
489
563
    def final_file_id(self, trans_id):
490
564
        """Determine the file id after any changes are applied, or None.
491
 
        
 
565
 
492
566
        None indicates that the file will not be versioned after changes are
493
567
        applied.
494
568
        """
495
569
        try:
496
 
            # there is a new id for this file
497
 
            assert self._new_id[trans_id] is not None
498
570
            return self._new_id[trans_id]
499
571
        except KeyError:
500
572
            if trans_id in self._removed_id:
535
607
 
536
608
    def by_parent(self):
537
609
        """Return a map of parent: children for known parents.
538
 
        
 
610
 
539
611
        Only new paths and parents of tree files with assigned ids are used.
540
612
        """
541
613
        by_parent = {}
542
614
        items = list(self._new_parent.iteritems())
543
 
        items.extend((t, self.final_parent(t)) for t in 
 
615
        items.extend((t, self.final_parent(t)) for t in
544
616
                      self._tree_id_paths.keys())
545
617
        for trans_id, parent_id in items:
546
618
            if parent_id not in by_parent:
557
629
 
558
630
    def find_conflicts(self):
559
631
        """Find any violations of inventory or filesystem invariants"""
560
 
        if self.__done is True:
 
632
        if self._done is True:
561
633
            raise ReusingTransform()
562
634
        conflicts = []
563
635
        # ensure all children of all existent parents are known
581
653
        removed.  This is a necessary first step in detecting conflicts.
582
654
        """
583
655
        parents = self.by_parent().keys()
584
 
        parents.extend([t for t in self._removed_contents if 
 
656
        parents.extend([t for t in self._removed_contents if
585
657
                        self.tree_kind(t) == 'directory'])
586
658
        for trans_id in self._removed_id:
587
659
            file_id = self.tree_file_id(trans_id)
588
 
            if self._tree.inventory[file_id].kind == 'directory':
 
660
            if file_id is not None:
 
661
                if self._tree.inventory[file_id].kind == 'directory':
 
662
                    parents.append(trans_id)
 
663
            elif self.tree_kind(trans_id) == 'directory':
589
664
                parents.append(trans_id)
590
665
 
591
666
        for parent_id in parents:
601
676
        try:
602
677
            children = os.listdir(self._tree.abspath(path))
603
678
        except OSError, e:
604
 
            if e.errno != errno.ENOENT and e.errno != errno.ESRCH:
 
679
            if not (osutils._is_error_enotdir(e)
 
680
                    or e.errno in (errno.ENOENT, errno.ESRCH)):
605
681
                raise
606
682
            return
607
 
            
 
683
 
608
684
        for child in children:
609
685
            childpath = joinpath(path, child)
610
686
            if self._tree.is_control_filename(childpath):
670
746
 
671
747
    def _improper_versioning(self):
672
748
        """Cannot version a file with no contents, or a bad type.
673
 
        
 
749
 
674
750
        However, existing entries with no contents are okay.
675
751
        """
676
752
        conflicts = []
686
762
 
687
763
    def _executability_conflicts(self):
688
764
        """Check for bad executability changes.
689
 
        
 
765
 
690
766
        Only versioned files may have their executability set, because
691
767
        1. only versioned entries can have executability under windows
692
768
        2. only files can be executable.  (The execute bit on a directory
725
801
            return conflicts
726
802
        for children in by_parent.itervalues():
727
803
            name_ids = [(self.final_name(t), t) for t in children]
 
804
            if not self._case_sensitive_target:
 
805
                name_ids = [(n.lower(), t) for n, t in name_ids]
728
806
            name_ids.sort()
729
807
            last_name = None
730
808
            last_trans_id = None
748
826
        conflicts = []
749
827
        removed_tree_ids = set((self.tree_file_id(trans_id) for trans_id in
750
828
                                self._removed_id))
751
 
        active_tree_ids = set((f for f in self._tree.inventory if
752
 
                               f not in removed_tree_ids))
 
829
        all_ids = self._tree.all_file_ids()
 
830
        active_tree_ids = all_ids.difference(removed_tree_ids)
753
831
        for trans_id, file_id in self._new_id.iteritems():
754
832
            if file_id in active_tree_ids:
755
833
                old_trans_id = self.trans_id_tree_file_id(file_id)
788
866
                continue
789
867
            return True
790
868
        return False
791
 
            
792
 
    def apply(self, no_conflicts=False):
793
 
        """Apply all changes to the inventory and filesystem.
794
 
        
795
 
        If filesystem or inventory conflicts are present, MalformedTransform
796
 
        will be thrown.
797
 
 
798
 
        If apply succeeds, finalize is not necessary.
799
 
 
800
 
        :param no_conflicts: if True, the caller guarantees there are no
801
 
            conflicts, so no check is made.
802
 
        """
803
 
        if not no_conflicts:
804
 
            conflicts = self.find_conflicts()
805
 
            if len(conflicts) != 0:
806
 
                raise MalformedTransform(conflicts=conflicts)
807
 
        inv = self._tree.inventory
808
 
        inventory_delta = []
809
 
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
810
 
        try:
811
 
            child_pb.update('Apply phase', 0, 2)
812
 
            self._apply_removals(inv, inventory_delta)
813
 
            child_pb.update('Apply phase', 1, 2)
814
 
            modified_paths = self._apply_insertions(inv, inventory_delta)
815
 
        finally:
816
 
            child_pb.finished()
817
 
        self._tree.apply_inventory_delta(inventory_delta)
818
 
        self.__done = True
819
 
        self.finalize()
820
 
        return _TransformResults(modified_paths, self.rename_count)
821
869
 
822
870
    def _limbo_name(self, trans_id):
823
871
        """Generate the limbo name of a file"""
839
887
                # the direct path can only be used if no other file has
840
888
                # already taken this pathname, i.e. if the name is unused, or
841
889
                # if it is already associated with this trans_id.
842
 
                elif (self._limbo_children_names[parent].get(filename)
843
 
                      in (trans_id, None)):
844
 
                    use_direct_path = True
 
890
                elif self._case_sensitive_target:
 
891
                    if (self._limbo_children_names[parent].get(filename)
 
892
                        in (trans_id, None)):
 
893
                        use_direct_path = True
 
894
                else:
 
895
                    for l_filename, l_trans_id in\
 
896
                        self._limbo_children_names[parent].iteritems():
 
897
                        if l_trans_id == trans_id:
 
898
                            continue
 
899
                        if l_filename.lower() == filename.lower():
 
900
                            break
 
901
                    else:
 
902
                        use_direct_path = True
 
903
 
845
904
        if use_direct_path:
846
905
            limbo_name = pathjoin(self._limbo_files[parent], filename)
847
906
            self._limbo_children[parent].add(trans_id)
852
911
        self._limbo_files[trans_id] = limbo_name
853
912
        return limbo_name
854
913
 
855
 
    def _apply_removals(self, inv, inventory_delta):
856
 
        """Perform tree operations that remove directory/inventory names.
857
 
        
858
 
        That is, delete files that are to be deleted, and put any files that
859
 
        need renaming into limbo.  This must be done in strict child-to-parent
860
 
        order.
861
 
        """
862
 
        tree_paths = list(self._tree_path_ids.iteritems())
863
 
        tree_paths.sort(reverse=True)
864
 
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
865
 
        try:
866
 
            for num, data in enumerate(tree_paths):
867
 
                path, trans_id = data
868
 
                child_pb.update('removing file', num, len(tree_paths))
869
 
                full_path = self._tree.abspath(path)
870
 
                if trans_id in self._removed_contents:
871
 
                    delete_any(full_path)
872
 
                elif trans_id in self._new_name or trans_id in \
873
 
                    self._new_parent:
874
 
                    try:
875
 
                        os.rename(full_path, self._limbo_name(trans_id))
876
 
                    except OSError, e:
877
 
                        if e.errno != errno.ENOENT:
878
 
                            raise
879
 
                    else:
880
 
                        self.rename_count += 1
881
 
                if trans_id in self._removed_id:
882
 
                    if trans_id == self._new_root:
883
 
                        file_id = self._tree.inventory.root.file_id
884
 
                    else:
885
 
                        file_id = self.tree_file_id(trans_id)
886
 
                    assert file_id is not None
887
 
                    inventory_delta.append((path, None, file_id, None))
888
 
        finally:
889
 
            child_pb.finished()
890
 
 
891
 
    def _apply_insertions(self, inv, inventory_delta):
892
 
        """Perform tree operations that insert directory/inventory names.
893
 
        
894
 
        That is, create any files that need to be created, and restore from
895
 
        limbo any files that needed renaming.  This must be done in strict
896
 
        parent-to-child order.
897
 
        """
898
 
        new_paths = self.new_paths()
899
 
        modified_paths = []
900
 
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
901
 
        try:
902
 
            for num, (path, trans_id) in enumerate(new_paths):
903
 
                new_entry = None
904
 
                child_pb.update('adding file', num, len(new_paths))
905
 
                try:
906
 
                    kind = self._new_contents[trans_id]
907
 
                except KeyError:
908
 
                    kind = contents = None
909
 
                if trans_id in self._new_contents or \
910
 
                    self.path_changed(trans_id):
911
 
                    full_path = self._tree.abspath(path)
912
 
                    if trans_id in self._needs_rename:
913
 
                        try:
914
 
                            os.rename(self._limbo_name(trans_id), full_path)
915
 
                        except OSError, e:
916
 
                            # We may be renaming a dangling inventory id
917
 
                            if e.errno != errno.ENOENT:
918
 
                                raise
919
 
                        else:
920
 
                            self.rename_count += 1
921
 
                    if trans_id in self._new_contents:
922
 
                        modified_paths.append(full_path)
923
 
                        del self._new_contents[trans_id]
924
 
 
925
 
                if trans_id in self._new_id:
926
 
                    if kind is None:
927
 
                        kind = file_kind(self._tree.abspath(path))
928
 
                    if trans_id in self._new_reference_revision:
929
 
                        new_entry = inventory.TreeReference(
930
 
                            self._new_id[trans_id],
931
 
                            self._new_name[trans_id], 
932
 
                            self.final_file_id(self._new_parent[trans_id]),
933
 
                            None, self._new_reference_revision[trans_id])
934
 
                    else:
935
 
                        new_entry = inventory.make_entry(kind,
936
 
                            self.final_name(trans_id),
937
 
                            self.final_file_id(self.final_parent(trans_id)),
938
 
                            self._new_id[trans_id])
939
 
                else:
940
 
                    if trans_id in self._new_name or trans_id in\
941
 
                        self._new_parent or\
942
 
                        trans_id in self._new_executability:
943
 
                        file_id = self.final_file_id(trans_id)
944
 
                        if file_id is not None:
945
 
                            entry = inv[file_id]
946
 
                            new_entry = entry.copy()
947
 
 
948
 
                    if trans_id in self._new_name or trans_id in\
949
 
                        self._new_parent:
950
 
                            if new_entry is not None:
951
 
                                new_entry.name = self.final_name(trans_id)
952
 
                                parent = self.final_parent(trans_id)
953
 
                                parent_id = self.final_file_id(parent)
954
 
                                new_entry.parent_id = parent_id
955
 
 
956
 
                if trans_id in self._new_executability:
957
 
                    self._set_executability(path, new_entry, trans_id)
958
 
                if new_entry is not None:
959
 
                    if new_entry.file_id in inv:
960
 
                        old_path = inv.id2path(new_entry.file_id)
961
 
                    else:
962
 
                        old_path = None
963
 
                    inventory_delta.append((old_path, path,
964
 
                                            new_entry.file_id,
965
 
                                            new_entry))
966
 
        finally:
967
 
            child_pb.finished()
968
 
        return modified_paths
969
 
 
970
 
    def _set_executability(self, path, entry, trans_id):
 
914
    def _set_executability(self, path, trans_id):
971
915
        """Set the executability of versioned files """
972
 
        new_executability = self._new_executability[trans_id]
973
 
        entry.executable = new_executability
974
916
        if supports_executable():
 
917
            new_executability = self._new_executability[trans_id]
975
918
            abspath = self._tree.abspath(path)
976
919
            current_mode = os.stat(abspath).st_mode
977
920
            if new_executability:
994
937
            self.version_file(file_id, trans_id)
995
938
        return trans_id
996
939
 
997
 
    def new_file(self, name, parent_id, contents, file_id=None, 
 
940
    def new_file(self, name, parent_id, contents, file_id=None,
998
941
                 executable=None):
999
942
        """Convenience method to create files.
1000
 
        
 
943
 
1001
944
        name is the name of the file to create.
1002
945
        parent_id is the transaction id of the parent directory of the file.
1003
946
        contents is an iterator of bytestrings, which will be used to produce
1023
966
        """
1024
967
        trans_id = self._new_entry(name, parent_id, file_id)
1025
968
        self.create_directory(trans_id)
1026
 
        return trans_id 
 
969
        return trans_id
1027
970
 
1028
971
    def new_symlink(self, name, parent_id, target, file_id=None):
1029
972
        """Convenience method to create symbolic link.
1030
 
        
 
973
 
1031
974
        name is the name of the symlink to create.
1032
975
        parent_id is the transaction id of the parent directory of the symlink.
1033
976
        target is a bytestring of the target of the symlink.
1072
1015
        from_path = self._tree_id_paths.get(from_trans_id)
1073
1016
        if from_versioned:
1074
1017
            # get data from working tree if versioned
1075
 
            from_entry = self._tree.inventory[file_id]
 
1018
            from_entry = self._tree.iter_entries_by_dir([file_id]).next()[1]
1076
1019
            from_name = from_entry.name
1077
1020
            from_parent = from_entry.parent_id
1078
1021
        else:
1114
1057
            to_executable = False
1115
1058
        return to_name, to_parent, to_kind, to_executable
1116
1059
 
1117
 
    def _iter_changes(self):
1118
 
        """Produce output in the same format as Tree._iter_changes.
 
1060
    def iter_changes(self):
 
1061
        """Produce output in the same format as Tree.iter_changes.
1119
1062
 
1120
1063
        Will produce nonsensical results if invoked while inventory/filesystem
1121
1064
        conflicts (as reported by TreeTransform.find_conflicts()) are present.
1176
1119
                   (from_executable, to_executable)))
1177
1120
        return iter(sorted(results, key=lambda x:x[1]))
1178
1121
 
 
1122
    def get_preview_tree(self):
 
1123
        """Return a tree representing the result of the transform.
 
1124
 
 
1125
        This tree only supports the subset of Tree functionality required
 
1126
        by show_diff_trees.  It must only be compared to tt._tree.
 
1127
        """
 
1128
        return _PreviewTree(self)
 
1129
 
 
1130
    def _text_parent(self, trans_id):
 
1131
        file_id = self.tree_file_id(trans_id)
 
1132
        try:
 
1133
            if file_id is None or self._tree.kind(file_id) != 'file':
 
1134
                return None
 
1135
        except errors.NoSuchFile:
 
1136
            return None
 
1137
        return file_id
 
1138
 
 
1139
    def _get_parents_texts(self, trans_id):
 
1140
        """Get texts for compression parents of this file."""
 
1141
        file_id = self._text_parent(trans_id)
 
1142
        if file_id is None:
 
1143
            return ()
 
1144
        return (self._tree.get_file_text(file_id),)
 
1145
 
 
1146
    def _get_parents_lines(self, trans_id):
 
1147
        """Get lines for compression parents of this file."""
 
1148
        file_id = self._text_parent(trans_id)
 
1149
        if file_id is None:
 
1150
            return ()
 
1151
        return (self._tree.get_file_lines(file_id),)
 
1152
 
 
1153
    def serialize(self, serializer):
 
1154
        """Serialize this TreeTransform.
 
1155
 
 
1156
        :param serializer: A Serialiser like pack.ContainerSerializer.
 
1157
        """
 
1158
        new_name = dict((k, v.encode('utf-8')) for k, v in
 
1159
                        self._new_name.items())
 
1160
        new_executability = dict((k, int(v)) for k, v in
 
1161
                                 self._new_executability.items())
 
1162
        tree_path_ids = dict((k.encode('utf-8'), v)
 
1163
                             for k, v in self._tree_path_ids.items())
 
1164
        attribs = {
 
1165
            '_id_number': self._id_number,
 
1166
            '_new_name': new_name,
 
1167
            '_new_parent': self._new_parent,
 
1168
            '_new_executability': new_executability,
 
1169
            '_new_id': self._new_id,
 
1170
            '_tree_path_ids': tree_path_ids,
 
1171
            '_removed_id': list(self._removed_id),
 
1172
            '_removed_contents': list(self._removed_contents),
 
1173
            '_non_present_ids': self._non_present_ids,
 
1174
            }
 
1175
        yield serializer.bytes_record(bencode.bencode(attribs),
 
1176
                                      (('attribs',),))
 
1177
        for trans_id, kind in self._new_contents.items():
 
1178
            if kind == 'file':
 
1179
                cur_file = open(self._limbo_name(trans_id), 'rb')
 
1180
                try:
 
1181
                    lines = osutils.chunks_to_lines(cur_file.readlines())
 
1182
                finally:
 
1183
                    cur_file.close()
 
1184
                parents = self._get_parents_lines(trans_id)
 
1185
                mpdiff = multiparent.MultiParent.from_lines(lines, parents)
 
1186
                content = ''.join(mpdiff.to_patch())
 
1187
            if kind == 'directory':
 
1188
                content = ''
 
1189
            if kind == 'symlink':
 
1190
                content = os.readlink(self._limbo_name(trans_id))
 
1191
            yield serializer.bytes_record(content, ((trans_id, kind),))
 
1192
 
 
1193
 
 
1194
    def deserialize(self, records):
 
1195
        """Deserialize a stored TreeTransform.
 
1196
 
 
1197
        :param records: An iterable of (names, content) tuples, as per
 
1198
            pack.ContainerPushParser.
 
1199
        """
 
1200
        names, content = records.next()
 
1201
        attribs = bencode.bdecode(content)
 
1202
        self._id_number = attribs['_id_number']
 
1203
        self._new_name = dict((k, v.decode('utf-8'))
 
1204
                            for k, v in attribs['_new_name'].items())
 
1205
        self._new_parent = attribs['_new_parent']
 
1206
        self._new_executability = dict((k, bool(v)) for k, v in
 
1207
            attribs['_new_executability'].items())
 
1208
        self._new_id = attribs['_new_id']
 
1209
        self._r_new_id = dict((v, k) for k, v in self._new_id.items())
 
1210
        self._tree_path_ids = {}
 
1211
        self._tree_id_paths = {}
 
1212
        for bytepath, trans_id in attribs['_tree_path_ids'].items():
 
1213
            path = bytepath.decode('utf-8')
 
1214
            self._tree_path_ids[path] = trans_id
 
1215
            self._tree_id_paths[trans_id] = path
 
1216
        self._removed_id = set(attribs['_removed_id'])
 
1217
        self._removed_contents = set(attribs['_removed_contents'])
 
1218
        self._non_present_ids = attribs['_non_present_ids']
 
1219
        for ((trans_id, kind),), content in records:
 
1220
            if kind == 'file':
 
1221
                mpdiff = multiparent.MultiParent.from_patch(content)
 
1222
                lines = mpdiff.to_lines(self._get_parents_texts(trans_id))
 
1223
                self.create_file(lines, trans_id)
 
1224
            if kind == 'directory':
 
1225
                self.create_directory(trans_id)
 
1226
            if kind == 'symlink':
 
1227
                self.create_symlink(content.decode('utf-8'), trans_id)
 
1228
 
 
1229
 
 
1230
class TreeTransform(TreeTransformBase):
 
1231
    """Represent a tree transformation.
 
1232
 
 
1233
    This object is designed to support incremental generation of the transform,
 
1234
    in any order.
 
1235
 
 
1236
    However, it gives optimum performance when parent directories are created
 
1237
    before their contents.  The transform is then able to put child files
 
1238
    directly in their parent directory, avoiding later renames.
 
1239
 
 
1240
    It is easy to produce malformed transforms, but they are generally
 
1241
    harmless.  Attempting to apply a malformed transform will cause an
 
1242
    exception to be raised before any modifications are made to the tree.
 
1243
 
 
1244
    Many kinds of malformed transforms can be corrected with the
 
1245
    resolve_conflicts function.  The remaining ones indicate programming error,
 
1246
    such as trying to create a file with no path.
 
1247
 
 
1248
    Two sets of file creation methods are supplied.  Convenience methods are:
 
1249
     * new_file
 
1250
     * new_directory
 
1251
     * new_symlink
 
1252
 
 
1253
    These are composed of the low-level methods:
 
1254
     * create_path
 
1255
     * create_file or create_directory or create_symlink
 
1256
     * version_file
 
1257
     * set_executability
 
1258
 
 
1259
    Transform/Transaction ids
 
1260
    -------------------------
 
1261
    trans_ids are temporary ids assigned to all files involved in a transform.
 
1262
    It's possible, even common, that not all files in the Tree have trans_ids.
 
1263
 
 
1264
    trans_ids are used because filenames and file_ids are not good enough
 
1265
    identifiers; filenames change, and not all files have file_ids.  File-ids
 
1266
    are also associated with trans-ids, so that moving a file moves its
 
1267
    file-id.
 
1268
 
 
1269
    trans_ids are only valid for the TreeTransform that generated them.
 
1270
 
 
1271
    Limbo
 
1272
    -----
 
1273
    Limbo is a temporary directory use to hold new versions of files.
 
1274
    Files are added to limbo by create_file, create_directory, create_symlink,
 
1275
    and their convenience variants (new_*).  Files may be removed from limbo
 
1276
    using cancel_creation.  Files are renamed from limbo into their final
 
1277
    location as part of TreeTransform.apply
 
1278
 
 
1279
    Limbo must be cleaned up, by either calling TreeTransform.apply or
 
1280
    calling TreeTransform.finalize.
 
1281
 
 
1282
    Files are placed into limbo inside their parent directories, where
 
1283
    possible.  This reduces subsequent renames, and makes operations involving
 
1284
    lots of files faster.  This optimization is only possible if the parent
 
1285
    directory is created *before* creating any of its children, so avoid
 
1286
    creating children before parents, where possible.
 
1287
 
 
1288
    Pending-deletion
 
1289
    ----------------
 
1290
    This temporary directory is used by _FileMover for storing files that are
 
1291
    about to be deleted.  In case of rollback, the files will be restored.
 
1292
    FileMover does not delete files until it is sure that a rollback will not
 
1293
    happen.
 
1294
    """
 
1295
    def __init__(self, tree, pb=DummyProgress()):
 
1296
        """Note: a tree_write lock is taken on the tree.
 
1297
 
 
1298
        Use TreeTransform.finalize() to release the lock (can be omitted if
 
1299
        TreeTransform.apply() called).
 
1300
        """
 
1301
        tree.lock_tree_write()
 
1302
 
 
1303
        try:
 
1304
            limbodir = urlutils.local_path_from_url(
 
1305
                tree._transport.abspath('limbo'))
 
1306
            try:
 
1307
                os.mkdir(limbodir)
 
1308
            except OSError, e:
 
1309
                if e.errno == errno.EEXIST:
 
1310
                    raise ExistingLimbo(limbodir)
 
1311
            deletiondir = urlutils.local_path_from_url(
 
1312
                tree._transport.abspath('pending-deletion'))
 
1313
            try:
 
1314
                os.mkdir(deletiondir)
 
1315
            except OSError, e:
 
1316
                if e.errno == errno.EEXIST:
 
1317
                    raise errors.ExistingPendingDeletion(deletiondir)
 
1318
        except:
 
1319
            tree.unlock()
 
1320
            raise
 
1321
 
 
1322
        TreeTransformBase.__init__(self, tree, limbodir, pb,
 
1323
                                   tree.case_sensitive)
 
1324
        self._deletiondir = deletiondir
 
1325
 
 
1326
    def apply(self, no_conflicts=False, precomputed_delta=None, _mover=None):
 
1327
        """Apply all changes to the inventory and filesystem.
 
1328
 
 
1329
        If filesystem or inventory conflicts are present, MalformedTransform
 
1330
        will be thrown.
 
1331
 
 
1332
        If apply succeeds, finalize is not necessary.
 
1333
 
 
1334
        :param no_conflicts: if True, the caller guarantees there are no
 
1335
            conflicts, so no check is made.
 
1336
        :param precomputed_delta: An inventory delta to use instead of
 
1337
            calculating one.
 
1338
        :param _mover: Supply an alternate FileMover, for testing
 
1339
        """
 
1340
        if not no_conflicts:
 
1341
            conflicts = self.find_conflicts()
 
1342
            if len(conflicts) != 0:
 
1343
                raise MalformedTransform(conflicts=conflicts)
 
1344
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
1345
        try:
 
1346
            if precomputed_delta is None:
 
1347
                child_pb.update('Apply phase', 0, 2)
 
1348
                inventory_delta = self._generate_inventory_delta()
 
1349
                offset = 1
 
1350
            else:
 
1351
                inventory_delta = precomputed_delta
 
1352
                offset = 0
 
1353
            if _mover is None:
 
1354
                mover = _FileMover()
 
1355
            else:
 
1356
                mover = _mover
 
1357
            try:
 
1358
                child_pb.update('Apply phase', 0 + offset, 2 + offset)
 
1359
                self._apply_removals(mover)
 
1360
                child_pb.update('Apply phase', 1 + offset, 2 + offset)
 
1361
                modified_paths = self._apply_insertions(mover)
 
1362
            except:
 
1363
                mover.rollback()
 
1364
                raise
 
1365
            else:
 
1366
                mover.apply_deletions()
 
1367
        finally:
 
1368
            child_pb.finished()
 
1369
        self._tree.apply_inventory_delta(inventory_delta)
 
1370
        self._done = True
 
1371
        self.finalize()
 
1372
        return _TransformResults(modified_paths, self.rename_count)
 
1373
 
 
1374
    def _generate_inventory_delta(self):
 
1375
        """Generate an inventory delta for the current transform."""
 
1376
        inventory_delta = []
 
1377
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
1378
        new_paths = self._inventory_altered()
 
1379
        total_entries = len(new_paths) + len(self._removed_id)
 
1380
        try:
 
1381
            for num, trans_id in enumerate(self._removed_id):
 
1382
                if (num % 10) == 0:
 
1383
                    child_pb.update('removing file', num, total_entries)
 
1384
                if trans_id == self._new_root:
 
1385
                    file_id = self._tree.get_root_id()
 
1386
                else:
 
1387
                    file_id = self.tree_file_id(trans_id)
 
1388
                # File-id isn't really being deleted, just moved
 
1389
                if file_id in self._r_new_id:
 
1390
                    continue
 
1391
                path = self._tree_id_paths[trans_id]
 
1392
                inventory_delta.append((path, None, file_id, None))
 
1393
            new_path_file_ids = dict((t, self.final_file_id(t)) for p, t in
 
1394
                                     new_paths)
 
1395
            entries = self._tree.iter_entries_by_dir(
 
1396
                new_path_file_ids.values())
 
1397
            old_paths = dict((e.file_id, p) for p, e in entries)
 
1398
            final_kinds = {}
 
1399
            for num, (path, trans_id) in enumerate(new_paths):
 
1400
                if (num % 10) == 0:
 
1401
                    child_pb.update('adding file',
 
1402
                                    num + len(self._removed_id), total_entries)
 
1403
                file_id = new_path_file_ids[trans_id]
 
1404
                if file_id is None:
 
1405
                    continue
 
1406
                needs_entry = False
 
1407
                try:
 
1408
                    kind = self.final_kind(trans_id)
 
1409
                except NoSuchFile:
 
1410
                    kind = self._tree.stored_kind(file_id)
 
1411
                parent_trans_id = self.final_parent(trans_id)
 
1412
                parent_file_id = new_path_file_ids.get(parent_trans_id)
 
1413
                if parent_file_id is None:
 
1414
                    parent_file_id = self.final_file_id(parent_trans_id)
 
1415
                if trans_id in self._new_reference_revision:
 
1416
                    new_entry = inventory.TreeReference(
 
1417
                        file_id,
 
1418
                        self._new_name[trans_id],
 
1419
                        self.final_file_id(self._new_parent[trans_id]),
 
1420
                        None, self._new_reference_revision[trans_id])
 
1421
                else:
 
1422
                    new_entry = inventory.make_entry(kind,
 
1423
                        self.final_name(trans_id),
 
1424
                        parent_file_id, file_id)
 
1425
                old_path = old_paths.get(new_entry.file_id)
 
1426
                new_executability = self._new_executability.get(trans_id)
 
1427
                if new_executability is not None:
 
1428
                    new_entry.executable = new_executability
 
1429
                inventory_delta.append(
 
1430
                    (old_path, path, new_entry.file_id, new_entry))
 
1431
        finally:
 
1432
            child_pb.finished()
 
1433
        return inventory_delta
 
1434
 
 
1435
    def _apply_removals(self, mover):
 
1436
        """Perform tree operations that remove directory/inventory names.
 
1437
 
 
1438
        That is, delete files that are to be deleted, and put any files that
 
1439
        need renaming into limbo.  This must be done in strict child-to-parent
 
1440
        order.
 
1441
 
 
1442
        If inventory_delta is None, no inventory delta generation is performed.
 
1443
        """
 
1444
        tree_paths = list(self._tree_path_ids.iteritems())
 
1445
        tree_paths.sort(reverse=True)
 
1446
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
1447
        try:
 
1448
            for num, data in enumerate(tree_paths):
 
1449
                path, trans_id = data
 
1450
                child_pb.update('removing file', num, len(tree_paths))
 
1451
                full_path = self._tree.abspath(path)
 
1452
                if trans_id in self._removed_contents:
 
1453
                    mover.pre_delete(full_path, os.path.join(self._deletiondir,
 
1454
                                     trans_id))
 
1455
                elif trans_id in self._new_name or trans_id in \
 
1456
                    self._new_parent:
 
1457
                    try:
 
1458
                        mover.rename(full_path, self._limbo_name(trans_id))
 
1459
                    except OSError, e:
 
1460
                        if e.errno != errno.ENOENT:
 
1461
                            raise
 
1462
                    else:
 
1463
                        self.rename_count += 1
 
1464
        finally:
 
1465
            child_pb.finished()
 
1466
 
 
1467
    def _apply_insertions(self, mover):
 
1468
        """Perform tree operations that insert directory/inventory names.
 
1469
 
 
1470
        That is, create any files that need to be created, and restore from
 
1471
        limbo any files that needed renaming.  This must be done in strict
 
1472
        parent-to-child order.
 
1473
 
 
1474
        If inventory_delta is None, no inventory delta is calculated, and
 
1475
        no list of modified paths is returned.
 
1476
        """
 
1477
        new_paths = self.new_paths(filesystem_only=True)
 
1478
        modified_paths = []
 
1479
        new_path_file_ids = dict((t, self.final_file_id(t)) for p, t in
 
1480
                                 new_paths)
 
1481
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
1482
        try:
 
1483
            for num, (path, trans_id) in enumerate(new_paths):
 
1484
                if (num % 10) == 0:
 
1485
                    child_pb.update('adding file', num, len(new_paths))
 
1486
                full_path = self._tree.abspath(path)
 
1487
                if trans_id in self._needs_rename:
 
1488
                    try:
 
1489
                        mover.rename(self._limbo_name(trans_id), full_path)
 
1490
                    except OSError, e:
 
1491
                        # We may be renaming a dangling inventory id
 
1492
                        if e.errno != errno.ENOENT:
 
1493
                            raise
 
1494
                    else:
 
1495
                        self.rename_count += 1
 
1496
                if (trans_id in self._new_contents or
 
1497
                    self.path_changed(trans_id)):
 
1498
                    if trans_id in self._new_contents:
 
1499
                        modified_paths.append(full_path)
 
1500
                if trans_id in self._new_executability:
 
1501
                    self._set_executability(path, trans_id)
 
1502
        finally:
 
1503
            child_pb.finished()
 
1504
        self._new_contents.clear()
 
1505
        return modified_paths
 
1506
 
 
1507
 
 
1508
class TransformPreview(TreeTransformBase):
 
1509
    """A TreeTransform for generating preview trees.
 
1510
 
 
1511
    Unlike TreeTransform, this version works when the input tree is a
 
1512
    RevisionTree, rather than a WorkingTree.  As a result, it tends to ignore
 
1513
    unversioned files in the input tree.
 
1514
    """
 
1515
 
 
1516
    def __init__(self, tree, pb=DummyProgress(), case_sensitive=True):
 
1517
        tree.lock_read()
 
1518
        limbodir = osutils.mkdtemp(prefix='bzr-limbo-')
 
1519
        TreeTransformBase.__init__(self, tree, limbodir, pb, case_sensitive)
 
1520
 
 
1521
    def canonical_path(self, path):
 
1522
        return path
 
1523
 
 
1524
    def tree_kind(self, trans_id):
 
1525
        path = self._tree_id_paths.get(trans_id)
 
1526
        if path is None:
 
1527
            raise NoSuchFile(None)
 
1528
        file_id = self._tree.path2id(path)
 
1529
        return self._tree.kind(file_id)
 
1530
 
 
1531
    def _set_mode(self, trans_id, mode_id, typefunc):
 
1532
        """Set the mode of new file contents.
 
1533
        The mode_id is the existing file to get the mode from (often the same
 
1534
        as trans_id).  The operation is only performed if there's a mode match
 
1535
        according to typefunc.
 
1536
        """
 
1537
        # is it ok to ignore this?  probably
 
1538
        pass
 
1539
 
 
1540
    def iter_tree_children(self, parent_id):
 
1541
        """Iterate through the entry's tree children, if any"""
 
1542
        try:
 
1543
            path = self._tree_id_paths[parent_id]
 
1544
        except KeyError:
 
1545
            return
 
1546
        file_id = self.tree_file_id(parent_id)
 
1547
        if file_id is None:
 
1548
            return
 
1549
        entry = self._tree.iter_entries_by_dir([file_id]).next()[1]
 
1550
        children = getattr(entry, 'children', {})
 
1551
        for child in children:
 
1552
            childpath = joinpath(path, child)
 
1553
            yield self.trans_id_tree_path(childpath)
 
1554
 
 
1555
 
 
1556
class _PreviewTree(tree.Tree):
 
1557
    """Partial implementation of Tree to support show_diff_trees"""
 
1558
 
 
1559
    def __init__(self, transform):
 
1560
        self._transform = transform
 
1561
        self._final_paths = FinalPaths(transform)
 
1562
        self.__by_parent = None
 
1563
        self._parent_ids = []
 
1564
        self._all_children_cache = {}
 
1565
        self._path2trans_id_cache = {}
 
1566
        self._final_name_cache = {}
 
1567
 
 
1568
    def _changes(self, file_id):
 
1569
        for changes in self._transform.iter_changes():
 
1570
            if changes[0] == file_id:
 
1571
                return changes
 
1572
 
 
1573
    def _content_change(self, file_id):
 
1574
        """Return True if the content of this file changed"""
 
1575
        changes = self._changes(file_id)
 
1576
        # changes[2] is true if the file content changed.  See
 
1577
        # InterTree.iter_changes.
 
1578
        return (changes is not None and changes[2])
 
1579
 
 
1580
    def _get_repository(self):
 
1581
        repo = getattr(self._transform._tree, '_repository', None)
 
1582
        if repo is None:
 
1583
            repo = self._transform._tree.branch.repository
 
1584
        return repo
 
1585
 
 
1586
    def _iter_parent_trees(self):
 
1587
        for revision_id in self.get_parent_ids():
 
1588
            try:
 
1589
                yield self.revision_tree(revision_id)
 
1590
            except errors.NoSuchRevisionInTree:
 
1591
                yield self._get_repository().revision_tree(revision_id)
 
1592
 
 
1593
    def _get_file_revision(self, file_id, vf, tree_revision):
 
1594
        parent_keys = [(file_id, self._file_revision(t, file_id)) for t in
 
1595
                       self._iter_parent_trees()]
 
1596
        vf.add_lines((file_id, tree_revision), parent_keys,
 
1597
                     self.get_file(file_id).readlines())
 
1598
        repo = self._get_repository()
 
1599
        base_vf = repo.texts
 
1600
        if base_vf not in vf.fallback_versionedfiles:
 
1601
            vf.fallback_versionedfiles.append(base_vf)
 
1602
        return tree_revision
 
1603
 
 
1604
    def _stat_limbo_file(self, file_id):
 
1605
        trans_id = self._transform.trans_id_file_id(file_id)
 
1606
        name = self._transform._limbo_name(trans_id)
 
1607
        return os.lstat(name)
 
1608
 
 
1609
    @property
 
1610
    def _by_parent(self):
 
1611
        if self.__by_parent is None:
 
1612
            self.__by_parent = self._transform.by_parent()
 
1613
        return self.__by_parent
 
1614
 
 
1615
    def _comparison_data(self, entry, path):
 
1616
        kind, size, executable, link_or_sha1 = self.path_content_summary(path)
 
1617
        if kind == 'missing':
 
1618
            kind = None
 
1619
            executable = False
 
1620
        else:
 
1621
            file_id = self._transform.final_file_id(self._path2trans_id(path))
 
1622
            executable = self.is_executable(file_id, path)
 
1623
        return kind, executable, None
 
1624
 
 
1625
    def lock_read(self):
 
1626
        # Perhaps in theory, this should lock the TreeTransform?
 
1627
        pass
 
1628
 
 
1629
    def unlock(self):
 
1630
        pass
 
1631
 
 
1632
    @property
 
1633
    def inventory(self):
 
1634
        """This Tree does not use inventory as its backing data."""
 
1635
        raise NotImplementedError(_PreviewTree.inventory)
 
1636
 
 
1637
    def get_root_id(self):
 
1638
        return self._transform.final_file_id(self._transform.root)
 
1639
 
 
1640
    def all_file_ids(self):
 
1641
        tree_ids = set(self._transform._tree.all_file_ids())
 
1642
        tree_ids.difference_update(self._transform.tree_file_id(t)
 
1643
                                   for t in self._transform._removed_id)
 
1644
        tree_ids.update(self._transform._new_id.values())
 
1645
        return tree_ids
 
1646
 
 
1647
    def __iter__(self):
 
1648
        return iter(self.all_file_ids())
 
1649
 
 
1650
    def has_id(self, file_id):
 
1651
        if file_id in self._transform._r_new_id:
 
1652
            return True
 
1653
        elif file_id in set([self._transform.tree_file_id(trans_id) for
 
1654
            trans_id in self._transform._removed_id]):
 
1655
            return False
 
1656
        else:
 
1657
            return self._transform._tree.has_id(file_id)
 
1658
 
 
1659
    def _path2trans_id(self, path):
 
1660
        # We must not use None here, because that is a valid value to store.
 
1661
        trans_id = self._path2trans_id_cache.get(path, object)
 
1662
        if trans_id is not object:
 
1663
            return trans_id
 
1664
        segments = splitpath(path)
 
1665
        cur_parent = self._transform.root
 
1666
        for cur_segment in segments:
 
1667
            for child in self._all_children(cur_parent):
 
1668
                final_name = self._final_name_cache.get(child)
 
1669
                if final_name is None:
 
1670
                    final_name = self._transform.final_name(child)
 
1671
                    self._final_name_cache[child] = final_name
 
1672
                if final_name == cur_segment:
 
1673
                    cur_parent = child
 
1674
                    break
 
1675
            else:
 
1676
                self._path2trans_id_cache[path] = None
 
1677
                return None
 
1678
        self._path2trans_id_cache[path] = cur_parent
 
1679
        return cur_parent
 
1680
 
 
1681
    def path2id(self, path):
 
1682
        return self._transform.final_file_id(self._path2trans_id(path))
 
1683
 
 
1684
    def id2path(self, file_id):
 
1685
        trans_id = self._transform.trans_id_file_id(file_id)
 
1686
        try:
 
1687
            return self._final_paths._determine_path(trans_id)
 
1688
        except NoFinalPath:
 
1689
            raise errors.NoSuchId(self, file_id)
 
1690
 
 
1691
    def _all_children(self, trans_id):
 
1692
        children = self._all_children_cache.get(trans_id)
 
1693
        if children is not None:
 
1694
            return children
 
1695
        children = set(self._transform.iter_tree_children(trans_id))
 
1696
        # children in the _new_parent set are provided by _by_parent.
 
1697
        children.difference_update(self._transform._new_parent.keys())
 
1698
        children.update(self._by_parent.get(trans_id, []))
 
1699
        self._all_children_cache[trans_id] = children
 
1700
        return children
 
1701
 
 
1702
    def iter_children(self, file_id):
 
1703
        trans_id = self._transform.trans_id_file_id(file_id)
 
1704
        for child_trans_id in self._all_children(trans_id):
 
1705
            yield self._transform.final_file_id(child_trans_id)
 
1706
 
 
1707
    def extras(self):
 
1708
        possible_extras = set(self._transform.trans_id_tree_path(p) for p
 
1709
                              in self._transform._tree.extras())
 
1710
        possible_extras.update(self._transform._new_contents)
 
1711
        possible_extras.update(self._transform._removed_id)
 
1712
        for trans_id in possible_extras:
 
1713
            if self._transform.final_file_id(trans_id) is None:
 
1714
                yield self._final_paths._determine_path(trans_id)
 
1715
 
 
1716
    def _make_inv_entries(self, ordered_entries, specific_file_ids):
 
1717
        for trans_id, parent_file_id in ordered_entries:
 
1718
            file_id = self._transform.final_file_id(trans_id)
 
1719
            if file_id is None:
 
1720
                continue
 
1721
            if (specific_file_ids is not None
 
1722
                and file_id not in specific_file_ids):
 
1723
                continue
 
1724
            try:
 
1725
                kind = self._transform.final_kind(trans_id)
 
1726
            except NoSuchFile:
 
1727
                kind = self._transform._tree.stored_kind(file_id)
 
1728
            new_entry = inventory.make_entry(
 
1729
                kind,
 
1730
                self._transform.final_name(trans_id),
 
1731
                parent_file_id, file_id)
 
1732
            yield new_entry, trans_id
 
1733
 
 
1734
    def _list_files_by_dir(self):
 
1735
        todo = [ROOT_PARENT]
 
1736
        ordered_ids = []
 
1737
        while len(todo) > 0:
 
1738
            parent = todo.pop()
 
1739
            parent_file_id = self._transform.final_file_id(parent)
 
1740
            children = list(self._all_children(parent))
 
1741
            paths = dict(zip(children, self._final_paths.get_paths(children)))
 
1742
            children.sort(key=paths.get)
 
1743
            todo.extend(reversed(children))
 
1744
            for trans_id in children:
 
1745
                ordered_ids.append((trans_id, parent_file_id))
 
1746
        return ordered_ids
 
1747
 
 
1748
    def iter_entries_by_dir(self, specific_file_ids=None):
 
1749
        # This may not be a maximally efficient implementation, but it is
 
1750
        # reasonably straightforward.  An implementation that grafts the
 
1751
        # TreeTransform changes onto the tree's iter_entries_by_dir results
 
1752
        # might be more efficient, but requires tricky inferences about stack
 
1753
        # position.
 
1754
        ordered_ids = self._list_files_by_dir()
 
1755
        for entry, trans_id in self._make_inv_entries(ordered_ids,
 
1756
                                                      specific_file_ids):
 
1757
            yield unicode(self._final_paths.get_path(trans_id)), entry
 
1758
 
 
1759
    def list_files(self, include_root=False):
 
1760
        """See Tree.list_files."""
 
1761
        # XXX This should behave like WorkingTree.list_files, but is really
 
1762
        # more like RevisionTree.list_files.
 
1763
        for path, entry in self.iter_entries_by_dir():
 
1764
            if entry.name == '' and not include_root:
 
1765
                continue
 
1766
            yield path, 'V', entry.kind, entry.file_id, entry
 
1767
 
 
1768
    def kind(self, file_id):
 
1769
        trans_id = self._transform.trans_id_file_id(file_id)
 
1770
        return self._transform.final_kind(trans_id)
 
1771
 
 
1772
    def stored_kind(self, file_id):
 
1773
        trans_id = self._transform.trans_id_file_id(file_id)
 
1774
        try:
 
1775
            return self._transform._new_contents[trans_id]
 
1776
        except KeyError:
 
1777
            return self._transform._tree.stored_kind(file_id)
 
1778
 
 
1779
    def get_file_mtime(self, file_id, path=None):
 
1780
        """See Tree.get_file_mtime"""
 
1781
        if not self._content_change(file_id):
 
1782
            return self._transform._tree.get_file_mtime(file_id, path)
 
1783
        return self._stat_limbo_file(file_id).st_mtime
 
1784
 
 
1785
    def _file_size(self, entry, stat_value):
 
1786
        return self.get_file_size(entry.file_id)
 
1787
 
 
1788
    def get_file_size(self, file_id):
 
1789
        """See Tree.get_file_size"""
 
1790
        if self.kind(file_id) == 'file':
 
1791
            return self._transform._tree.get_file_size(file_id)
 
1792
        else:
 
1793
            return None
 
1794
 
 
1795
    def get_file_sha1(self, file_id, path=None, stat_value=None):
 
1796
        trans_id = self._transform.trans_id_file_id(file_id)
 
1797
        kind = self._transform._new_contents.get(trans_id)
 
1798
        if kind is None:
 
1799
            return self._transform._tree.get_file_sha1(file_id)
 
1800
        if kind == 'file':
 
1801
            fileobj = self.get_file(file_id)
 
1802
            try:
 
1803
                return sha_file(fileobj)
 
1804
            finally:
 
1805
                fileobj.close()
 
1806
 
 
1807
    def is_executable(self, file_id, path=None):
 
1808
        if file_id is None:
 
1809
            return False
 
1810
        trans_id = self._transform.trans_id_file_id(file_id)
 
1811
        try:
 
1812
            return self._transform._new_executability[trans_id]
 
1813
        except KeyError:
 
1814
            try:
 
1815
                return self._transform._tree.is_executable(file_id, path)
 
1816
            except OSError, e:
 
1817
                if e.errno == errno.ENOENT:
 
1818
                    return False
 
1819
                raise
 
1820
            except errors.NoSuchId:
 
1821
                return False
 
1822
 
 
1823
    def path_content_summary(self, path):
 
1824
        trans_id = self._path2trans_id(path)
 
1825
        tt = self._transform
 
1826
        tree_path = tt._tree_id_paths.get(trans_id)
 
1827
        kind = tt._new_contents.get(trans_id)
 
1828
        if kind is None:
 
1829
            if tree_path is None or trans_id in tt._removed_contents:
 
1830
                return 'missing', None, None, None
 
1831
            summary = tt._tree.path_content_summary(tree_path)
 
1832
            kind, size, executable, link_or_sha1 = summary
 
1833
        else:
 
1834
            link_or_sha1 = None
 
1835
            limbo_name = tt._limbo_name(trans_id)
 
1836
            if trans_id in tt._new_reference_revision:
 
1837
                kind = 'tree-reference'
 
1838
            if kind == 'file':
 
1839
                statval = os.lstat(limbo_name)
 
1840
                size = statval.st_size
 
1841
                if not supports_executable():
 
1842
                    executable = None
 
1843
                else:
 
1844
                    executable = statval.st_mode & S_IEXEC
 
1845
            else:
 
1846
                size = None
 
1847
                executable = None
 
1848
            if kind == 'symlink':
 
1849
                link_or_sha1 = os.readlink(limbo_name).decode(osutils._fs_enc)
 
1850
        if supports_executable():
 
1851
            executable = tt._new_executability.get(trans_id, executable)
 
1852
        return kind, size, executable, link_or_sha1
 
1853
 
 
1854
    def iter_changes(self, from_tree, include_unchanged=False,
 
1855
                      specific_files=None, pb=None, extra_trees=None,
 
1856
                      require_versioned=True, want_unversioned=False):
 
1857
        """See InterTree.iter_changes.
 
1858
 
 
1859
        This has a fast path that is only used when the from_tree matches
 
1860
        the transform tree, and no fancy options are supplied.
 
1861
        """
 
1862
        if (from_tree is not self._transform._tree or include_unchanged or
 
1863
            specific_files or want_unversioned):
 
1864
            return tree.InterTree(from_tree, self).iter_changes(
 
1865
                include_unchanged=include_unchanged,
 
1866
                specific_files=specific_files,
 
1867
                pb=pb,
 
1868
                extra_trees=extra_trees,
 
1869
                require_versioned=require_versioned,
 
1870
                want_unversioned=want_unversioned)
 
1871
        if want_unversioned:
 
1872
            raise ValueError('want_unversioned is not supported')
 
1873
        return self._transform.iter_changes()
 
1874
 
 
1875
    def get_file(self, file_id, path=None):
 
1876
        """See Tree.get_file"""
 
1877
        if not self._content_change(file_id):
 
1878
            return self._transform._tree.get_file(file_id, path)
 
1879
        trans_id = self._transform.trans_id_file_id(file_id)
 
1880
        name = self._transform._limbo_name(trans_id)
 
1881
        return open(name, 'rb')
 
1882
 
 
1883
    def get_file_with_stat(self, file_id, path):
 
1884
        return self.get_file(file_id, path), None
 
1885
 
 
1886
    def annotate_iter(self, file_id,
 
1887
                      default_revision=_mod_revision.CURRENT_REVISION):
 
1888
        changes = self._changes(file_id)
 
1889
        if changes is None:
 
1890
            get_old = True
 
1891
        else:
 
1892
            changed_content, versioned, kind = (changes[2], changes[3],
 
1893
                                                changes[6])
 
1894
            if kind[1] is None:
 
1895
                return None
 
1896
            get_old = (kind[0] == 'file' and versioned[0])
 
1897
        if get_old:
 
1898
            old_annotation = self._transform._tree.annotate_iter(file_id,
 
1899
                default_revision=default_revision)
 
1900
        else:
 
1901
            old_annotation = []
 
1902
        if changes is None:
 
1903
            return old_annotation
 
1904
        if not changed_content:
 
1905
            return old_annotation
 
1906
        return annotate.reannotate([old_annotation],
 
1907
                                   self.get_file(file_id).readlines(),
 
1908
                                   default_revision)
 
1909
 
 
1910
    def get_symlink_target(self, file_id):
 
1911
        """See Tree.get_symlink_target"""
 
1912
        if not self._content_change(file_id):
 
1913
            return self._transform._tree.get_symlink_target(file_id)
 
1914
        trans_id = self._transform.trans_id_file_id(file_id)
 
1915
        name = self._transform._limbo_name(trans_id)
 
1916
        return osutils.readlink(name)
 
1917
 
 
1918
    def walkdirs(self, prefix=''):
 
1919
        pending = [self._transform.root]
 
1920
        while len(pending) > 0:
 
1921
            parent_id = pending.pop()
 
1922
            children = []
 
1923
            subdirs = []
 
1924
            prefix = prefix.rstrip('/')
 
1925
            parent_path = self._final_paths.get_path(parent_id)
 
1926
            parent_file_id = self._transform.final_file_id(parent_id)
 
1927
            for child_id in self._all_children(parent_id):
 
1928
                path_from_root = self._final_paths.get_path(child_id)
 
1929
                basename = self._transform.final_name(child_id)
 
1930
                file_id = self._transform.final_file_id(child_id)
 
1931
                try:
 
1932
                    kind = self._transform.final_kind(child_id)
 
1933
                    versioned_kind = kind
 
1934
                except NoSuchFile:
 
1935
                    kind = 'unknown'
 
1936
                    versioned_kind = self._transform._tree.stored_kind(file_id)
 
1937
                if versioned_kind == 'directory':
 
1938
                    subdirs.append(child_id)
 
1939
                children.append((path_from_root, basename, kind, None,
 
1940
                                 file_id, versioned_kind))
 
1941
            children.sort()
 
1942
            if parent_path.startswith(prefix):
 
1943
                yield (parent_path, parent_file_id), children
 
1944
            pending.extend(sorted(subdirs, key=self._final_paths.get_path,
 
1945
                                  reverse=True))
 
1946
 
 
1947
    def get_parent_ids(self):
 
1948
        return self._parent_ids
 
1949
 
 
1950
    def set_parent_ids(self, parent_ids):
 
1951
        self._parent_ids = parent_ids
 
1952
 
 
1953
    def get_revision_tree(self, revision_id):
 
1954
        return self._transform._tree.get_revision_tree(revision_id)
 
1955
 
1179
1956
 
1180
1957
def joinpath(parent, child):
1181
1958
    """Join tree-relative paths, handling the tree root specially"""
1212
1989
            self._known_paths[trans_id] = self._determine_path(trans_id)
1213
1990
        return self._known_paths[trans_id]
1214
1991
 
 
1992
    def get_paths(self, trans_ids):
 
1993
        return [(self.get_path(t), t) for t in trans_ids]
 
1994
 
 
1995
 
 
1996
 
1215
1997
def topology_sorted_ids(tree):
1216
1998
    """Determine the topological order of the ids in a tree"""
1217
1999
    file_ids = list(tree)
1219
2001
    return file_ids
1220
2002
 
1221
2003
 
1222
 
def build_tree(tree, wt):
 
2004
def build_tree(tree, wt, accelerator_tree=None, hardlink=False,
 
2005
               delta_from_tree=False):
1223
2006
    """Create working tree for a branch, using a TreeTransform.
1224
 
    
 
2007
 
1225
2008
    This function should be used on empty trees, having a tree root at most.
1226
2009
    (see merge and revert functionality for working with existing trees)
1227
2010
 
1228
2011
    Existing files are handled like so:
1229
 
    
 
2012
 
1230
2013
    - Existing bzrdirs take precedence over creating new items.  They are
1231
2014
      created as '%s.diverted' % name.
1232
2015
    - Otherwise, if the content on disk matches the content we are building,
1233
2016
      it is silently replaced.
1234
2017
    - Otherwise, conflict resolution will move the old file to 'oldname.moved'.
 
2018
 
 
2019
    :param tree: The tree to convert wt into a copy of
 
2020
    :param wt: The working tree that files will be placed into
 
2021
    :param accelerator_tree: A tree which can be used for retrieving file
 
2022
        contents more quickly than tree itself, i.e. a workingtree.  tree
 
2023
        will be used for cases where accelerator_tree's content is different.
 
2024
    :param hardlink: If true, hard-link files to accelerator_tree, where
 
2025
        possible.  accelerator_tree must implement abspath, i.e. be a
 
2026
        working tree.
 
2027
    :param delta_from_tree: If true, build_tree may use the input Tree to
 
2028
        generate the inventory delta.
1235
2029
    """
1236
2030
    wt.lock_tree_write()
1237
2031
    try:
1238
2032
        tree.lock_read()
1239
2033
        try:
1240
 
            return _build_tree(tree, wt)
 
2034
            if accelerator_tree is not None:
 
2035
                accelerator_tree.lock_read()
 
2036
            try:
 
2037
                return _build_tree(tree, wt, accelerator_tree, hardlink,
 
2038
                                   delta_from_tree)
 
2039
            finally:
 
2040
                if accelerator_tree is not None:
 
2041
                    accelerator_tree.unlock()
1241
2042
        finally:
1242
2043
            tree.unlock()
1243
2044
    finally:
1244
2045
        wt.unlock()
1245
2046
 
1246
 
def _build_tree(tree, wt):
 
2047
 
 
2048
def _build_tree(tree, wt, accelerator_tree, hardlink, delta_from_tree):
1247
2049
    """See build_tree."""
1248
 
    if len(wt.inventory) > 1:  # more than just a root
1249
 
        raise errors.WorkingTreeAlreadyPopulated(base=wt.basedir)
 
2050
    for num, _unused in enumerate(wt.all_file_ids()):
 
2051
        if num > 0:  # more than just a root
 
2052
            raise errors.WorkingTreeAlreadyPopulated(base=wt.basedir)
 
2053
    existing_files = set()
 
2054
    for dir, files in wt.walkdirs():
 
2055
        existing_files.update(f[0] for f in files)
1250
2056
    file_trans_id = {}
1251
2057
    top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1252
2058
    pp = ProgressPhase("Build phase", 2, top_pb)
1258
2064
        # is set within the tree, nor setting the root and thus
1259
2065
        # marking the tree as dirty, because we use two different
1260
2066
        # idioms here: tree interfaces and inventory interfaces.
1261
 
        if wt.path2id('') != tree.inventory.root.file_id:
1262
 
            wt.set_root_id(tree.inventory.root.file_id)
 
2067
        if wt.get_root_id() != tree.get_root_id():
 
2068
            wt.set_root_id(tree.get_root_id())
1263
2069
            wt.flush()
1264
2070
    tt = TreeTransform(wt)
1265
2071
    divert = set()
1269
2075
            tt.trans_id_tree_file_id(wt.get_root_id())
1270
2076
        pb = bzrlib.ui.ui_factory.nested_progress_bar()
1271
2077
        try:
 
2078
            deferred_contents = []
 
2079
            num = 0
 
2080
            total = len(tree.inventory)
 
2081
            if delta_from_tree:
 
2082
                precomputed_delta = []
 
2083
            else:
 
2084
                precomputed_delta = None
1272
2085
            for num, (tree_path, entry) in \
1273
2086
                enumerate(tree.inventory.iter_entries_by_dir()):
1274
 
                pb.update("Building tree", num, len(tree.inventory))
 
2087
                pb.update("Building tree", num - len(deferred_contents), total)
1275
2088
                if entry.parent_id is None:
1276
2089
                    continue
1277
2090
                reparent = False
1278
2091
                file_id = entry.file_id
1279
 
                target_path = wt.abspath(tree_path)
1280
 
                try:
 
2092
                if delta_from_tree:
 
2093
                    precomputed_delta.append((None, tree_path, file_id, entry))
 
2094
                if tree_path in existing_files:
 
2095
                    target_path = wt.abspath(tree_path)
1281
2096
                    kind = file_kind(target_path)
1282
 
                except NoSuchFile:
1283
 
                    pass
1284
 
                else:
1285
2097
                    if kind == "directory":
1286
2098
                        try:
1287
2099
                            bzrdir.BzrDir.open(target_path)
1295
2107
                        tt.delete_contents(tt.trans_id_tree_path(tree_path))
1296
2108
                        if kind == 'directory':
1297
2109
                            reparent = True
1298
 
                if entry.parent_id not in file_trans_id:
1299
 
                    raise AssertionError(
1300
 
                        'entry %s parent id %r is not in file_trans_id %r'
1301
 
                        % (entry, entry.parent_id, file_trans_id))
1302
2110
                parent_id = file_trans_id[entry.parent_id]
1303
 
                file_trans_id[file_id] = new_by_entry(tt, entry, parent_id,
1304
 
                                                      tree)
 
2111
                if entry.kind == 'file':
 
2112
                    # We *almost* replicate new_by_entry, so that we can defer
 
2113
                    # getting the file text, and get them all at once.
 
2114
                    trans_id = tt.create_path(entry.name, parent_id)
 
2115
                    file_trans_id[file_id] = trans_id
 
2116
                    tt.version_file(file_id, trans_id)
 
2117
                    executable = tree.is_executable(file_id, tree_path)
 
2118
                    if executable:
 
2119
                        tt.set_executability(executable, trans_id)
 
2120
                    trans_data = (trans_id, tree_path)
 
2121
                    deferred_contents.append((file_id, trans_data))
 
2122
                else:
 
2123
                    file_trans_id[file_id] = new_by_entry(tt, entry, parent_id,
 
2124
                                                          tree)
1305
2125
                if reparent:
1306
2126
                    new_trans_id = file_trans_id[file_id]
1307
2127
                    old_parent = tt.trans_id_tree_path(tree_path)
1308
2128
                    _reparent_children(tt, old_parent, new_trans_id)
 
2129
            offset = num + 1 - len(deferred_contents)
 
2130
            _create_files(tt, tree, deferred_contents, pb, offset,
 
2131
                          accelerator_tree, hardlink)
1309
2132
        finally:
1310
2133
            pb.finished()
1311
2134
        pp.next_phase()
1312
2135
        divert_trans = set(file_trans_id[f] for f in divert)
1313
2136
        resolver = lambda t, c: resolve_checkout(t, c, divert_trans)
1314
2137
        raw_conflicts = resolve_conflicts(tt, pass_func=resolver)
 
2138
        if len(raw_conflicts) > 0:
 
2139
            precomputed_delta = None
1315
2140
        conflicts = cook_conflicts(raw_conflicts, tt)
1316
2141
        for conflict in conflicts:
1317
2142
            warning(conflict)
1319
2144
            wt.add_conflicts(conflicts)
1320
2145
        except errors.UnsupportedOperation:
1321
2146
            pass
1322
 
        result = tt.apply()
 
2147
        result = tt.apply(no_conflicts=True,
 
2148
                          precomputed_delta=precomputed_delta)
1323
2149
    finally:
1324
2150
        tt.finalize()
1325
2151
        top_pb.finished()
1326
2152
    return result
1327
2153
 
1328
2154
 
 
2155
def _create_files(tt, tree, desired_files, pb, offset, accelerator_tree,
 
2156
                  hardlink):
 
2157
    total = len(desired_files) + offset
 
2158
    wt = tt._tree
 
2159
    if accelerator_tree is None:
 
2160
        new_desired_files = desired_files
 
2161
    else:
 
2162
        iter = accelerator_tree.iter_changes(tree, include_unchanged=True)
 
2163
        unchanged = dict((f, p[1]) for (f, p, c, v, d, n, k, e)
 
2164
                         in iter if not (c or e[0] != e[1]))
 
2165
        new_desired_files = []
 
2166
        count = 0
 
2167
        for file_id, (trans_id, tree_path) in desired_files:
 
2168
            accelerator_path = unchanged.get(file_id)
 
2169
            if accelerator_path is None:
 
2170
                new_desired_files.append((file_id, (trans_id, tree_path)))
 
2171
                continue
 
2172
            pb.update('Adding file contents', count + offset, total)
 
2173
            if hardlink:
 
2174
                tt.create_hardlink(accelerator_tree.abspath(accelerator_path),
 
2175
                                   trans_id)
 
2176
            else:
 
2177
                contents = accelerator_tree.get_file(file_id, accelerator_path)
 
2178
                if wt.supports_content_filtering():
 
2179
                    filters = wt._content_filter_stack(tree_path)
 
2180
                    contents = filtered_output_bytes(contents, filters,
 
2181
                        ContentFilterContext(tree_path, tree))
 
2182
                try:
 
2183
                    tt.create_file(contents, trans_id)
 
2184
                finally:
 
2185
                    try:
 
2186
                        contents.close()
 
2187
                    except AttributeError:
 
2188
                        # after filtering, contents may no longer be file-like
 
2189
                        pass
 
2190
            count += 1
 
2191
        offset += count
 
2192
    for count, ((trans_id, tree_path), contents) in enumerate(
 
2193
            tree.iter_files_bytes(new_desired_files)):
 
2194
        if wt.supports_content_filtering():
 
2195
            filters = wt._content_filter_stack(tree_path)
 
2196
            contents = filtered_output_bytes(contents, filters,
 
2197
                ContentFilterContext(tree_path, tree))
 
2198
        tt.create_file(contents, trans_id)
 
2199
        pb.update('Adding file contents', count + offset, total)
 
2200
 
 
2201
 
1329
2202
def _reparent_children(tt, old_parent, new_parent):
1330
2203
    for child in tt.iter_tree_children(old_parent):
1331
2204
        tt.adjust_path(tt.final_name(child), new_parent, child)
1332
2205
 
 
2206
def _reparent_transform_children(tt, old_parent, new_parent):
 
2207
    by_parent = tt.by_parent()
 
2208
    for child in by_parent[old_parent]:
 
2209
        tt.adjust_path(tt.final_name(child), new_parent, child)
 
2210
    return by_parent[old_parent]
1333
2211
 
1334
2212
def _content_match(tree, entry, file_id, kind, target_path):
1335
2213
    if entry.kind != kind:
1349
2227
    new_conflicts = set()
1350
2228
    for c_type, conflict in ((c[0], c) for c in conflicts):
1351
2229
        # Anything but a 'duplicate' would indicate programmer error
1352
 
        assert c_type == 'duplicate', c_type
 
2230
        if c_type != 'duplicate':
 
2231
            raise AssertionError(c_type)
1353
2232
        # Now figure out which is new and which is old
1354
2233
        if tt.new_contents(conflict[1]):
1355
2234
            new_file = conflict[1]
1381
2260
    if kind == 'file':
1382
2261
        contents = tree.get_file(entry.file_id).readlines()
1383
2262
        executable = tree.is_executable(entry.file_id)
1384
 
        return tt.new_file(name, parent_id, contents, entry.file_id, 
 
2263
        return tt.new_file(name, parent_id, contents, entry.file_id,
1385
2264
                           executable)
1386
2265
    elif kind in ('directory', 'tree-reference'):
1387
2266
        trans_id = tt.new_directory(name, parent_id, entry.file_id)
1388
2267
        if kind == 'tree-reference':
1389
2268
            tt.set_tree_reference(entry.reference_revision, trans_id)
1390
 
        return trans_id 
 
2269
        return trans_id
1391
2270
    elif kind == 'symlink':
1392
2271
        target = tree.get_symlink_target(entry.file_id)
1393
2272
        return tt.new_symlink(name, parent_id, target, entry.file_id)
1394
2273
    else:
1395
2274
        raise errors.BadFileKindError(name, kind)
1396
2275
 
 
2276
 
 
2277
@deprecated_function(deprecated_in((1, 9, 0)))
1397
2278
def create_by_entry(tt, entry, tree, trans_id, lines=None, mode_id=None):
1398
 
    """Create new file contents according to an inventory entry."""
 
2279
    """Create new file contents according to an inventory entry.
 
2280
 
 
2281
    DEPRECATED.  Use create_from_tree instead.
 
2282
    """
1399
2283
    if entry.kind == "file":
1400
2284
        if lines is None:
1401
2285
            lines = tree.get_file(entry.file_id).readlines()
1405
2289
    elif entry.kind == "directory":
1406
2290
        tt.create_directory(trans_id)
1407
2291
 
 
2292
 
 
2293
def create_from_tree(tt, trans_id, tree, file_id, bytes=None):
 
2294
    """Create new file contents according to tree contents."""
 
2295
    kind = tree.kind(file_id)
 
2296
    if kind == 'directory':
 
2297
        tt.create_directory(trans_id)
 
2298
    elif kind == "file":
 
2299
        if bytes is None:
 
2300
            tree_file = tree.get_file(file_id)
 
2301
            try:
 
2302
                bytes = tree_file.readlines()
 
2303
            finally:
 
2304
                tree_file.close()
 
2305
        tt.create_file(bytes, trans_id)
 
2306
    elif kind == "symlink":
 
2307
        tt.create_symlink(tree.get_symlink_target(file_id), trans_id)
 
2308
    else:
 
2309
        raise AssertionError('Unknown kind %r' % kind)
 
2310
 
 
2311
 
1408
2312
def create_entry_executability(tt, entry, trans_id):
1409
2313
    """Set the executability of a trans_id according to an inventory entry"""
1410
2314
    if entry.kind == "file":
1411
2315
        tt.set_executability(entry.executable, trans_id)
1412
2316
 
1413
2317
 
1414
 
@deprecated_function(zero_fifteen)
1415
 
def find_interesting(working_tree, target_tree, filenames):
1416
 
    """Find the ids corresponding to specified filenames.
1417
 
    
1418
 
    Deprecated: Please use tree1.paths2ids(filenames, [tree2]).
1419
 
    """
1420
 
    working_tree.lock_read()
1421
 
    try:
1422
 
        target_tree.lock_read()
1423
 
        try:
1424
 
            return working_tree.paths2ids(filenames, [target_tree])
1425
 
        finally:
1426
 
            target_tree.unlock()
1427
 
    finally:
1428
 
        working_tree.unlock()
1429
 
 
1430
 
 
1431
 
@deprecated_function(zero_ninety)
1432
 
def change_entry(tt, file_id, working_tree, target_tree, 
1433
 
                 trans_id_file_id, backups, trans_id, by_parent):
1434
 
    """Replace a file_id's contents with those from a target tree."""
1435
 
    if file_id is None and target_tree is None:
1436
 
        # skip the logic altogether in the deprecation test
1437
 
        return
1438
 
    e_trans_id = trans_id_file_id(file_id)
1439
 
    entry = target_tree.inventory[file_id]
1440
 
    has_contents, contents_mod, meta_mod, = _entry_changes(file_id, entry, 
1441
 
                                                           working_tree)
1442
 
    if contents_mod:
1443
 
        mode_id = e_trans_id
1444
 
        if has_contents:
1445
 
            if not backups:
1446
 
                tt.delete_contents(e_trans_id)
1447
 
            else:
1448
 
                parent_trans_id = trans_id_file_id(entry.parent_id)
1449
 
                backup_name = get_backup_name(entry, by_parent,
1450
 
                                              parent_trans_id, tt)
1451
 
                tt.adjust_path(backup_name, parent_trans_id, e_trans_id)
1452
 
                tt.unversion_file(e_trans_id)
1453
 
                e_trans_id = tt.create_path(entry.name, parent_trans_id)
1454
 
                tt.version_file(file_id, e_trans_id)
1455
 
                trans_id[file_id] = e_trans_id
1456
 
        create_by_entry(tt, entry, target_tree, e_trans_id, mode_id=mode_id)
1457
 
        create_entry_executability(tt, entry, e_trans_id)
1458
 
 
1459
 
    elif meta_mod:
1460
 
        tt.set_executability(entry.executable, e_trans_id)
1461
 
    if tt.final_name(e_trans_id) != entry.name:
1462
 
        adjust_path  = True
1463
 
    else:
1464
 
        parent_id = tt.final_parent(e_trans_id)
1465
 
        parent_file_id = tt.final_file_id(parent_id)
1466
 
        if parent_file_id != entry.parent_id:
1467
 
            adjust_path = True
1468
 
        else:
1469
 
            adjust_path = False
1470
 
    if adjust_path:
1471
 
        parent_trans_id = trans_id_file_id(entry.parent_id)
1472
 
        tt.adjust_path(entry.name, parent_trans_id, e_trans_id)
1473
 
 
1474
 
 
1475
2318
def get_backup_name(entry, by_parent, parent_trans_id, tt):
1476
2319
    return _get_backup_name(entry.name, by_parent, parent_trans_id, tt)
1477
2320
 
1508
2351
        if entry.kind != working_kind:
1509
2352
            contents_mod, meta_mod = True, False
1510
2353
        else:
1511
 
            cur_entry._read_tree_state(working_tree.id2path(file_id), 
 
2354
            cur_entry._read_tree_state(working_tree.id2path(file_id),
1512
2355
                                       working_tree)
1513
2356
            contents_mod, meta_mod = entry.detect_changes(cur_entry)
1514
2357
            cur_entry._forget_tree_state()
1522
2365
    tt = TreeTransform(working_tree, pb)
1523
2366
    try:
1524
2367
        pp = ProgressPhase("Revert phase", 3, pb)
1525
 
        pp.next_phase()
1526
 
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1527
 
        try:
1528
 
            merge_modified = _alter_files(working_tree, target_tree, tt,
1529
 
                                          child_pb, filenames, backups)
1530
 
        finally:
1531
 
            child_pb.finished()
1532
 
        pp.next_phase()
1533
 
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1534
 
        try:
1535
 
            raw_conflicts = resolve_conflicts(tt, child_pb)
1536
 
        finally:
1537
 
            child_pb.finished()
1538
 
        conflicts = cook_conflicts(raw_conflicts, tt)
 
2368
        conflicts, merge_modified = _prepare_revert_transform(
 
2369
            working_tree, target_tree, tt, filenames, backups, pp)
1539
2370
        if change_reporter:
1540
2371
            change_reporter = delta._ChangeReporter(
1541
2372
                unversioned_filter=working_tree.is_ignored)
1542
 
            delta.report_changes(tt._iter_changes(), change_reporter)
 
2373
            delta.report_changes(tt.iter_changes(), change_reporter)
1543
2374
        for conflict in conflicts:
1544
2375
            warning(conflict)
1545
2376
        pp.next_phase()
1552
2383
    return conflicts
1553
2384
 
1554
2385
 
 
2386
def _prepare_revert_transform(working_tree, target_tree, tt, filenames,
 
2387
                              backups, pp, basis_tree=None,
 
2388
                              merge_modified=None):
 
2389
    pp.next_phase()
 
2390
    child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
2391
    try:
 
2392
        if merge_modified is None:
 
2393
            merge_modified = working_tree.merge_modified()
 
2394
        merge_modified = _alter_files(working_tree, target_tree, tt,
 
2395
                                      child_pb, filenames, backups,
 
2396
                                      merge_modified, basis_tree)
 
2397
    finally:
 
2398
        child_pb.finished()
 
2399
    pp.next_phase()
 
2400
    child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
2401
    try:
 
2402
        raw_conflicts = resolve_conflicts(tt, child_pb,
 
2403
            lambda t, c: conflict_pass(t, c, target_tree))
 
2404
    finally:
 
2405
        child_pb.finished()
 
2406
    conflicts = cook_conflicts(raw_conflicts, tt)
 
2407
    return conflicts, merge_modified
 
2408
 
 
2409
 
1555
2410
def _alter_files(working_tree, target_tree, tt, pb, specific_files,
1556
 
                 backups):
1557
 
    merge_modified = working_tree.merge_modified()
1558
 
    change_list = target_tree._iter_changes(working_tree,
 
2411
                 backups, merge_modified, basis_tree=None):
 
2412
    if basis_tree is not None:
 
2413
        basis_tree.lock_read()
 
2414
    change_list = target_tree.iter_changes(working_tree,
1559
2415
        specific_files=specific_files, pb=pb)
1560
 
    if target_tree.inventory.root is None:
 
2416
    if target_tree.get_root_id() is None:
1561
2417
        skip_root = True
1562
2418
    else:
1563
2419
        skip_root = False
1564
 
    basis_tree = None
1565
2420
    try:
 
2421
        deferred_files = []
1566
2422
        for id_num, (file_id, path, changed_content, versioned, parent, name,
1567
2423
                kind, executable) in enumerate(change_list):
1568
2424
            if skip_root and file_id[0] is not None and parent[0] is None:
1602
2458
                        # contents
1603
2459
                        mode_id = trans_id
1604
2460
                        trans_id = new_trans_id
1605
 
                if kind[1] == 'directory':
 
2461
                if kind[1] in ('directory', 'tree-reference'):
1606
2462
                    tt.create_directory(trans_id)
 
2463
                    if kind[1] == 'tree-reference':
 
2464
                        revision = target_tree.get_reference_revision(file_id,
 
2465
                                                                      path[1])
 
2466
                        tt.set_tree_reference(revision, trans_id)
1607
2467
                elif kind[1] == 'symlink':
1608
2468
                    tt.create_symlink(target_tree.get_symlink_target(file_id),
1609
2469
                                      trans_id)
1610
2470
                elif kind[1] == 'file':
1611
 
                    tt.create_file(target_tree.get_file_lines(file_id),
1612
 
                                   trans_id, mode_id)
 
2471
                    deferred_files.append((file_id, (trans_id, mode_id)))
1613
2472
                    if basis_tree is None:
1614
2473
                        basis_tree = working_tree.basis_tree()
1615
2474
                        basis_tree.lock_read()
1624
2483
                    # preserve the execute bit when backing up
1625
2484
                    if keep_content and executable[0] == executable[1]:
1626
2485
                        tt.set_executability(executable[1], trans_id)
1627
 
                else:
1628
 
                    assert kind[1] is None
 
2486
                elif kind[1] is not None:
 
2487
                    raise AssertionError(kind[1])
1629
2488
            if versioned == (False, True):
1630
2489
                tt.version_file(file_id, trans_id)
1631
2490
            if versioned == (True, False):
1632
2491
                tt.unversion_file(trans_id)
1633
 
            if (name[1] is not None and 
 
2492
            if (name[1] is not None and
1634
2493
                (name[0] != name[1] or parent[0] != parent[1])):
1635
 
                tt.adjust_path(
1636
 
                    name[1], tt.trans_id_file_id(parent[1]), trans_id)
 
2494
                if name[1] == '' and parent[1] is None:
 
2495
                    parent_trans = ROOT_PARENT
 
2496
                else:
 
2497
                    parent_trans = tt.trans_id_file_id(parent[1])
 
2498
                tt.adjust_path(name[1], parent_trans, trans_id)
1637
2499
            if executable[0] != executable[1] and kind[1] == "file":
1638
2500
                tt.set_executability(executable[1], trans_id)
 
2501
        for (trans_id, mode_id), bytes in target_tree.iter_files_bytes(
 
2502
            deferred_files):
 
2503
            tt.create_file(bytes, trans_id, mode_id)
1639
2504
    finally:
1640
2505
        if basis_tree is not None:
1641
2506
            basis_tree.unlock()
1674
2539
                               conflict[1], conflict[2], ))
1675
2540
        elif c_type == 'duplicate':
1676
2541
            # files that were renamed take precedence
1677
 
            new_name = tt.final_name(conflict[1])+'.moved'
1678
2542
            final_parent = tt.final_parent(conflict[1])
1679
2543
            if tt.path_changed(conflict[1]):
1680
 
                tt.adjust_path(new_name, final_parent, conflict[2])
1681
 
                new_conflicts.add((c_type, 'Moved existing file to', 
1682
 
                                   conflict[2], conflict[1]))
 
2544
                existing_file, new_file = conflict[2], conflict[1]
1683
2545
            else:
1684
 
                tt.adjust_path(new_name, final_parent, conflict[1])
1685
 
                new_conflicts.add((c_type, 'Moved existing file to', 
1686
 
                                  conflict[1], conflict[2]))
 
2546
                existing_file, new_file = conflict[1], conflict[2]
 
2547
            new_name = tt.final_name(existing_file)+'.moved'
 
2548
            tt.adjust_path(new_name, final_parent, existing_file)
 
2549
            new_conflicts.add((c_type, 'Moved existing file to',
 
2550
                               existing_file, new_file))
1687
2551
        elif c_type == 'parent loop':
1688
2552
            # break the loop by undoing one of the ops that caused the loop
1689
2553
            cur = conflict[1]
1692
2556
            new_conflicts.add((c_type, 'Cancelled move', cur,
1693
2557
                               tt.final_parent(cur),))
1694
2558
            tt.adjust_path(tt.final_name(cur), tt.get_tree_parent(cur), cur)
1695
 
            
 
2559
 
1696
2560
        elif c_type == 'missing parent':
1697
2561
            trans_id = conflict[1]
1698
2562
            try:
1699
2563
                tt.cancel_deletion(trans_id)
1700
 
                new_conflicts.add(('deleting parent', 'Not deleting', 
 
2564
                new_conflicts.add(('deleting parent', 'Not deleting',
1701
2565
                                   trans_id))
1702
2566
            except KeyError:
1703
 
                tt.create_directory(trans_id)
1704
 
                new_conflicts.add((c_type, 'Created directory', trans_id))
 
2567
                create = True
1705
2568
                try:
1706
2569
                    tt.final_name(trans_id)
1707
2570
                except NoFinalPath:
1708
 
                    file_id = tt.final_file_id(trans_id)
1709
 
                    entry = path_tree.inventory[file_id]
1710
 
                    parent_trans_id = tt.trans_id_file_id(entry.parent_id)
1711
 
                    tt.adjust_path(entry.name, parent_trans_id, trans_id)
 
2571
                    if path_tree is not None:
 
2572
                        file_id = tt.final_file_id(trans_id)
 
2573
                        if file_id is None:
 
2574
                            file_id = tt.inactive_file_id(trans_id)
 
2575
                        entry = path_tree.inventory[file_id]
 
2576
                        # special-case the other tree root (move its
 
2577
                        # children to current root)
 
2578
                        if entry.parent_id is None:
 
2579
                            create=False
 
2580
                            moved = _reparent_transform_children(
 
2581
                                tt, trans_id, tt.root)
 
2582
                            for child in moved:
 
2583
                                new_conflicts.add((c_type, 'Moved to root',
 
2584
                                                   child))
 
2585
                        else:
 
2586
                            parent_trans_id = tt.trans_id_file_id(
 
2587
                                entry.parent_id)
 
2588
                            tt.adjust_path(entry.name, parent_trans_id,
 
2589
                                           trans_id)
 
2590
                if create:
 
2591
                    tt.create_directory(trans_id)
 
2592
                    new_conflicts.add((c_type, 'Created directory', trans_id))
1712
2593
        elif c_type == 'unversioned parent':
1713
 
            tt.version_file(tt.inactive_file_id(conflict[1]), conflict[1])
 
2594
            file_id = tt.inactive_file_id(conflict[1])
 
2595
            # special-case the other tree root (move its children instead)
 
2596
            if path_tree and file_id in path_tree:
 
2597
                if path_tree.inventory[file_id].parent_id is None:
 
2598
                    continue
 
2599
            tt.version_file(file_id, conflict[1])
1714
2600
            new_conflicts.add((c_type, 'Versioned directory', conflict[1]))
 
2601
        elif c_type == 'non-directory parent':
 
2602
            parent_id = conflict[1]
 
2603
            parent_parent = tt.final_parent(parent_id)
 
2604
            parent_name = tt.final_name(parent_id)
 
2605
            parent_file_id = tt.final_file_id(parent_id)
 
2606
            new_parent_id = tt.new_directory(parent_name + '.new',
 
2607
                parent_parent, parent_file_id)
 
2608
            _reparent_transform_children(tt, parent_id, new_parent_id)
 
2609
            if parent_file_id is not None:
 
2610
                tt.unversion_file(parent_id)
 
2611
            new_conflicts.add((c_type, 'Created directory', new_parent_id))
 
2612
        elif c_type == 'versioning no contents':
 
2613
            tt.cancel_versioning(conflict[1])
1715
2614
    return new_conflicts
1716
2615
 
1717
2616
 
1733
2632
        if len(conflict) == 3:
1734
2633
            yield Conflict.factory(c_type, action=action, path=modified_path,
1735
2634
                                     file_id=modified_id)
1736
 
             
 
2635
 
1737
2636
        else:
1738
2637
            conflicting_path = fp.get_path(conflict[3])
1739
2638
            conflicting_id = tt.final_file_id(conflict[3])
1740
2639
            yield Conflict.factory(c_type, action=action, path=modified_path,
1741
 
                                   file_id=modified_id, 
 
2640
                                   file_id=modified_id,
1742
2641
                                   conflict_path=conflicting_path,
1743
2642
                                   conflict_file_id=conflicting_id)
 
2643
 
 
2644
 
 
2645
class _FileMover(object):
 
2646
    """Moves and deletes files for TreeTransform, tracking operations"""
 
2647
 
 
2648
    def __init__(self):
 
2649
        self.past_renames = []
 
2650
        self.pending_deletions = []
 
2651
 
 
2652
    def rename(self, from_, to):
 
2653
        """Rename a file from one path to another.  Functions like os.rename"""
 
2654
        try:
 
2655
            os.rename(from_, to)
 
2656
        except OSError, e:
 
2657
            if e.errno in (errno.EEXIST, errno.ENOTEMPTY):
 
2658
                raise errors.FileExists(to, str(e))
 
2659
            raise
 
2660
        self.past_renames.append((from_, to))
 
2661
 
 
2662
    def pre_delete(self, from_, to):
 
2663
        """Rename a file out of the way and mark it for deletion.
 
2664
 
 
2665
        Unlike os.unlink, this works equally well for files and directories.
 
2666
        :param from_: The current file path
 
2667
        :param to: A temporary path for the file
 
2668
        """
 
2669
        self.rename(from_, to)
 
2670
        self.pending_deletions.append(to)
 
2671
 
 
2672
    def rollback(self):
 
2673
        """Reverse all renames that have been performed"""
 
2674
        for from_, to in reversed(self.past_renames):
 
2675
            os.rename(to, from_)
 
2676
        # after rollback, don't reuse _FileMover
 
2677
        past_renames = None
 
2678
        pending_deletions = None
 
2679
 
 
2680
    def apply_deletions(self):
 
2681
        """Apply all marked deletions"""
 
2682
        for path in self.pending_deletions:
 
2683
            delete_any(path)
 
2684
        # after apply_deletions, don't reuse _FileMover
 
2685
        past_renames = None
 
2686
        pending_deletions = None