← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

  • Committer: Robert Collins
  • Date: 2007-07-19 06:34:09 UTC
  • mto: (2592.3.46 repository)
  • mto: This revision was merged to the branch mainline in revision 2651.
  • Revision ID: robertc@robertcollins.net-20070719063409-stu9sckrxp8wp3mo
LIBRARY API BREAKS:

  * KnitIndex.get_parents now returns tuples. (Robert Collins)

INTERNALS:

  * Unused functions on the private interface KnitIndex have been removed.
    (Robert Collins)

  * New ``knit.KnitGraphIndex`` which provides a ``KnitIndex`` layered on top
    of a ``index.GraphIndex``. (Robert Collins)

  * New ``knit.KnitVersionedFile.iter_parents`` method that allows querying
    the parents of many knit nodes at once, reducing round trips to the 
    underlying index. (Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
1
 
# Copyright (C) 2006, 2007, 2008 Canonical Ltd
 
1
# Copyright (C) 2006, 2007 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
import os
18
18
import errno
19
 
from stat import S_ISREG, S_IEXEC
 
19
from stat import S_ISREG
20
20
 
21
21
from bzrlib.lazy_import import lazy_import
22
22
lazy_import(globals(), """
23
23
from bzrlib import (
24
 
    annotate,
25
24
    bzrdir,
26
25
    delta,
27
26
    errors,
28
 
    inventory,
29
 
    multiparent,
30
 
    osutils,
31
 
    revision as _mod_revision,
 
27
    inventory
32
28
    )
33
 
from bzrlib.util import bencode
34
29
""")
35
30
from bzrlib.errors import (DuplicateKey, MalformedTransform, NoSuchFile,
36
31
                           ReusingTransform, NotVersionedError, CantMoveRoot,
37
 
                           ExistingLimbo, ImmortalLimbo, NoFinalPath,
38
 
                           UnableCreateSymlink)
39
 
from bzrlib.filters import filtered_output_bytes, ContentFilterContext
 
32
                           ExistingLimbo, ImmortalLimbo, NoFinalPath)
40
33
from bzrlib.inventory import InventoryEntry
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
 
)
 
34
from bzrlib.osutils import (file_kind, supports_executable, pathjoin, lexists,
 
35
                            delete_any)
51
36
from bzrlib.progress import DummyProgress, ProgressPhase
52
 
from bzrlib.symbol_versioning import (
53
 
        deprecated_function,
54
 
        deprecated_in,
55
 
        )
 
37
from bzrlib.symbol_versioning import deprecated_function, zero_fifteen
56
38
from bzrlib.trace import mutter, warning
57
39
from bzrlib import tree
58
40
import bzrlib.ui
75
57
        self.rename_count = rename_count
76
58
 
77
59
 
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.
 
60
class TreeTransform(object):
 
61
    """Represent a tree transformation.
 
62
    
 
63
    This object is designed to support incremental generation of the transform,
 
64
    in any order.
 
65
 
 
66
    However, it gives optimum performance when parent directories are created
 
67
    before their contents.  The transform is then able to put child files
 
68
    directly in their parent directory, avoiding later renames.
 
69
    
 
70
    It is easy to produce malformed transforms, but they are generally
 
71
    harmless.  Attempting to apply a malformed transform will cause an
 
72
    exception to be raised before any modifications are made to the tree.  
 
73
 
 
74
    Many kinds of malformed transforms can be corrected with the 
 
75
    resolve_conflicts function.  The remaining ones indicate programming error,
 
76
    such as trying to create a file with no path.
 
77
 
 
78
    Two sets of file creation methods are supplied.  Convenience methods are:
 
79
     * new_file
 
80
     * new_directory
 
81
     * new_symlink
 
82
 
 
83
    These are composed of the low-level methods:
 
84
     * create_path
 
85
     * create_file or create_directory or create_symlink
 
86
     * version_file
 
87
     * set_executability
 
88
    """
 
89
    def __init__(self, tree, pb=DummyProgress()):
 
90
        """Note: a tree_write lock is taken on the tree.
 
91
        
 
92
        Use TreeTransform.finalize() to release the lock (can be omitted if
 
93
        TreeTransform.apply() called).
92
94
        """
93
95
        object.__init__(self)
94
96
        self._tree = tree
95
 
        self._limbodir = limbodir
96
 
        self._deletiondir = None
 
97
        self._tree.lock_tree_write()
 
98
        try:
 
99
            control_files = self._tree._control_files
 
100
            self._limbodir = urlutils.local_path_from_url(
 
101
                control_files.controlfilename('limbo'))
 
102
            try:
 
103
                os.mkdir(self._limbodir)
 
104
            except OSError, e:
 
105
                if e.errno == errno.EEXIST:
 
106
                    raise ExistingLimbo(self._limbodir)
 
107
        except: 
 
108
            self._tree.unlock()
 
109
            raise
 
110
 
97
111
        self._id_number = 0
98
 
        # mapping of trans_id -> new basename
99
112
        self._new_name = {}
100
 
        # mapping of trans_id -> new parent trans_id
101
113
        self._new_parent = {}
102
 
        # mapping of trans_id with new contents -> new file_kind
103
114
        self._new_contents = {}
104
115
        # A mapping of transform ids to their limbo filename
105
116
        self._limbo_files = {}
110
121
        self._limbo_children_names = {}
111
122
        # List of transform ids that need to be renamed from limbo into place
112
123
        self._needs_rename = set()
113
 
        # Set of trans_ids whose contents will be removed
114
124
        self._removed_contents = set()
115
 
        # Mapping of trans_id -> new execute-bit value
116
125
        self._new_executability = {}
117
 
        # Mapping of trans_id -> new tree-reference value
118
126
        self._new_reference_revision = {}
119
 
        # Mapping of trans_id -> new file_id
120
127
        self._new_id = {}
121
 
        # Mapping of old file-id -> trans_id
122
128
        self._non_present_ids = {}
123
 
        # Mapping of new file_id -> trans_id
124
129
        self._r_new_id = {}
125
 
        # Set of trans_ids that will be removed
126
130
        self._removed_id = set()
127
 
        # Mapping of path in old tree -> trans_id
128
131
        self._tree_path_ids = {}
129
 
        # Mapping trans_id -> path in old tree
130
132
        self._tree_id_paths = {}
131
133
        # Cache of realpath results, to speed up canonical_path
132
134
        self._realpaths = {}
133
135
        # Cache of relpath results, to speed up canonical_path
134
136
        self._relpaths = {}
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
 
137
        self._new_root = self.trans_id_tree_file_id(tree.get_root_id())
 
138
        self.__done = False
144
139
        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
148
140
        self.rename_count = 0
149
141
 
150
142
    def __get_root(self):
174
166
            except OSError:
175
167
                # We don't especially care *why* the dir is immortal.
176
168
                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)
182
169
        finally:
183
170
            self._tree.unlock()
184
171
            self._tree = None
204
191
        previous_name = self._new_name.get(trans_id)
205
192
        self._new_name[trans_id] = name
206
193
        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
211
194
        if (trans_id in self._limbo_files and
212
195
            trans_id not in self._needs_rename):
213
196
            self._rename_in_limbo([trans_id])
234
217
 
235
218
    def adjust_root_path(self, name, parent):
236
219
        """Emulate moving the root by moving all children, instead.
237
 
 
 
220
        
238
221
        We do this by undoing the association of root's transaction id with the
239
222
        current tree.  This allows us to create a new directory with that
240
 
        transaction id.  We unversion the root directory and version the
 
223
        transaction id.  We unversion the root directory and version the 
241
224
        physically new directory, and hope someone versions the tree root
242
225
        later.
243
226
        """
246
229
        # force moving all children of root
247
230
        for child_id in self.iter_tree_children(old_root):
248
231
            if child_id != parent:
249
 
                self.adjust_path(self.final_name(child_id),
 
232
                self.adjust_path(self.final_name(child_id), 
250
233
                                 self.final_parent(child_id), child_id)
251
234
            file_id = self.final_file_id(child_id)
252
235
            if file_id is not None:
253
236
                self.unversion_file(child_id)
254
237
            self.version_file(file_id, child_id)
255
 
 
 
238
        
256
239
        # the physical root needs a new transaction id
257
240
        self._tree_path_ids.pop("")
258
241
        self._tree_id_paths.pop(old_root)
266
249
 
267
250
    def trans_id_tree_file_id(self, inventory_id):
268
251
        """Determine the transaction id of a working tree file.
269
 
 
 
252
        
270
253
        This reflects only files that already exist, not ones that will be
271
254
        added by transactions.
272
255
        """
273
 
        if inventory_id is None:
274
 
            raise ValueError('None is not a valid file id')
275
 
        path = self._tree.id2path(inventory_id)
 
256
        path = self._tree.inventory.id2path(inventory_id)
276
257
        return self.trans_id_tree_path(path)
277
258
 
278
259
    def trans_id_file_id(self, file_id):
281
262
        a transaction has been unversioned, it is deliberately still returned.
282
263
        (this will likely lead to an unversioned parent conflict.)
283
264
        """
284
 
        if file_id is None:
285
 
            raise ValueError('None is not a valid file id')
286
265
        if file_id in self._r_new_id and self._r_new_id[file_id] is not None:
287
266
            return self._r_new_id[file_id]
 
267
        elif file_id in self._tree.inventory:
 
268
            return self.trans_id_tree_file_id(file_id)
 
269
        elif file_id in self._non_present_ids:
 
270
            return self._non_present_ids[file_id]
288
271
        else:
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)
 
272
            trans_id = self._assign_id()
 
273
            self._non_present_ids[file_id] = trans_id
 
274
            return trans_id
300
275
 
301
276
    def canonical_path(self, path):
302
277
        """Get the canonical tree-relative path"""
336
311
        """Schedule creation of a new file.
337
312
 
338
313
        See also new_file.
339
 
 
 
314
        
340
315
        Contents is an iterator of strings, all of which will be written
341
316
        to the target destination.
342
317
 
375
350
        try:
376
351
            mode = os.stat(self._tree.abspath(old_path)).st_mode
377
352
        except OSError, e:
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
 
353
            if e.errno == errno.ENOENT:
383
354
                return
384
355
            else:
385
356
                raise
386
357
        if typefunc(mode):
387
358
            os.chmod(self._limbo_name(trans_id), mode)
388
359
 
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
 
 
406
360
    def create_directory(self, trans_id):
407
361
        """Schedule creation of a new directory.
408
 
 
 
362
        
409
363
        See also new_directory.
410
364
        """
411
365
        os.mkdir(self._limbo_name(trans_id))
417
371
        target is a bytestring.
418
372
        See also new_symlink.
419
373
        """
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)
 
374
        os.symlink(target, self._limbo_name(trans_id))
 
375
        unique_add(self._new_contents, trans_id, 'symlink')
429
376
 
430
377
    def cancel_creation(self, trans_id):
431
378
        """Cancel the creation of new file contents."""
472
419
 
473
420
    def version_file(self, file_id, trans_id):
474
421
        """Schedule a file to become versioned."""
475
 
        if file_id is None:
476
 
            raise ValueError()
 
422
        assert file_id is not None
477
423
        unique_add(self._new_id, trans_id, file_id)
478
424
        unique_add(self._r_new_id, file_id, trans_id)
479
425
 
483
429
        del self._new_id[trans_id]
484
430
        del self._r_new_id[file_id]
485
431
 
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))
 
432
    def new_paths(self):
 
433
        """Determine the paths of all new and changed files"""
 
434
        new_ids = set()
 
435
        fp = FinalPaths(self)
 
436
        for id_set in (self._new_name, self._new_parent, self._new_contents,
 
437
                       self._new_id, self._new_executability):
 
438
            new_ids.update(id_set)
 
439
        new_paths = [(fp.get_path(t), t) for t in new_ids]
 
440
        new_paths.sort()
 
441
        return new_paths
520
442
 
521
443
    def tree_kind(self, trans_id):
522
444
        """Determine the file kind in the working tree.
536
458
 
537
459
    def final_kind(self, trans_id):
538
460
        """Determine the final file kind, after any changes applied.
539
 
 
 
461
        
540
462
        Raises NoSuchFile if the file does not exist/has no contents.
541
463
        (It is conceivable that a path would be created without the
542
464
        corresponding contents insertion command)
557
479
            return None
558
480
        # the file is old; the old id is still valid
559
481
        if self._new_root == trans_id:
560
 
            return self._tree.get_root_id()
561
 
        return self._tree.path2id(path)
 
482
            return self._tree.inventory.root.file_id
 
483
        return self._tree.inventory.path2id(path)
562
484
 
563
485
    def final_file_id(self, trans_id):
564
486
        """Determine the file id after any changes are applied, or None.
565
 
 
 
487
        
566
488
        None indicates that the file will not be versioned after changes are
567
489
        applied.
568
490
        """
569
491
        try:
 
492
            # there is a new id for this file
 
493
            assert self._new_id[trans_id] is not None
570
494
            return self._new_id[trans_id]
571
495
        except KeyError:
572
496
            if trans_id in self._removed_id:
607
531
 
608
532
    def by_parent(self):
609
533
        """Return a map of parent: children for known parents.
610
 
 
 
534
        
611
535
        Only new paths and parents of tree files with assigned ids are used.
612
536
        """
613
537
        by_parent = {}
614
538
        items = list(self._new_parent.iteritems())
615
 
        items.extend((t, self.final_parent(t)) for t in
 
539
        items.extend((t, self.final_parent(t)) for t in 
616
540
                      self._tree_id_paths.keys())
617
541
        for trans_id, parent_id in items:
618
542
            if parent_id not in by_parent:
629
553
 
630
554
    def find_conflicts(self):
631
555
        """Find any violations of inventory or filesystem invariants"""
632
 
        if self._done is True:
 
556
        if self.__done is True:
633
557
            raise ReusingTransform()
634
558
        conflicts = []
635
559
        # ensure all children of all existent parents are known
653
577
        removed.  This is a necessary first step in detecting conflicts.
654
578
        """
655
579
        parents = self.by_parent().keys()
656
 
        parents.extend([t for t in self._removed_contents if
 
580
        parents.extend([t for t in self._removed_contents if 
657
581
                        self.tree_kind(t) == 'directory'])
658
582
        for trans_id in self._removed_id:
659
583
            file_id = self.tree_file_id(trans_id)
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':
 
584
            if self._tree.inventory[file_id].kind == 'directory':
664
585
                parents.append(trans_id)
665
586
 
666
587
        for parent_id in parents:
676
597
        try:
677
598
            children = os.listdir(self._tree.abspath(path))
678
599
        except OSError, e:
679
 
            if not (osutils._is_error_enotdir(e)
680
 
                    or e.errno in (errno.ENOENT, errno.ESRCH)):
 
600
            if e.errno != errno.ENOENT and e.errno != errno.ESRCH:
681
601
                raise
682
602
            return
683
 
 
 
603
            
684
604
        for child in children:
685
605
            childpath = joinpath(path, child)
686
606
            if self._tree.is_control_filename(childpath):
746
666
 
747
667
    def _improper_versioning(self):
748
668
        """Cannot version a file with no contents, or a bad type.
749
 
 
 
669
        
750
670
        However, existing entries with no contents are okay.
751
671
        """
752
672
        conflicts = []
762
682
 
763
683
    def _executability_conflicts(self):
764
684
        """Check for bad executability changes.
765
 
 
 
685
        
766
686
        Only versioned files may have their executability set, because
767
687
        1. only versioned entries can have executability under windows
768
688
        2. only files can be executable.  (The execute bit on a directory
801
721
            return conflicts
802
722
        for children in by_parent.itervalues():
803
723
            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]
806
724
            name_ids.sort()
807
725
            last_name = None
808
726
            last_trans_id = None
826
744
        conflicts = []
827
745
        removed_tree_ids = set((self.tree_file_id(trans_id) for trans_id in
828
746
                                self._removed_id))
829
 
        all_ids = self._tree.all_file_ids()
830
 
        active_tree_ids = all_ids.difference(removed_tree_ids)
 
747
        active_tree_ids = set((f for f in self._tree.inventory if
 
748
                               f not in removed_tree_ids))
831
749
        for trans_id, file_id in self._new_id.iteritems():
832
750
            if file_id in active_tree_ids:
833
751
                old_trans_id = self.trans_id_tree_file_id(file_id)
866
784
                continue
867
785
            return True
868
786
        return False
 
787
            
 
788
    def apply(self, no_conflicts=False):
 
789
        """Apply all changes to the inventory and filesystem.
 
790
        
 
791
        If filesystem or inventory conflicts are present, MalformedTransform
 
792
        will be thrown.
 
793
 
 
794
        If apply succeeds, finalize is not necessary.
 
795
 
 
796
        :param no_conflicts: if True, the caller guarantees there are no
 
797
            conflicts, so no check is made.
 
798
        """
 
799
        if not no_conflicts:
 
800
            conflicts = self.find_conflicts()
 
801
            if len(conflicts) != 0:
 
802
                raise MalformedTransform(conflicts=conflicts)
 
803
        inv = self._tree.inventory
 
804
        inventory_delta = []
 
805
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
806
        try:
 
807
            child_pb.update('Apply phase', 0, 2)
 
808
            self._apply_removals(inv, inventory_delta)
 
809
            child_pb.update('Apply phase', 1, 2)
 
810
            modified_paths = self._apply_insertions(inv, inventory_delta)
 
811
        finally:
 
812
            child_pb.finished()
 
813
        self._tree.apply_inventory_delta(inventory_delta)
 
814
        self.__done = True
 
815
        self.finalize()
 
816
        return _TransformResults(modified_paths, self.rename_count)
869
817
 
870
818
    def _limbo_name(self, trans_id):
871
819
        """Generate the limbo name of a file"""
887
835
                # the direct path can only be used if no other file has
888
836
                # already taken this pathname, i.e. if the name is unused, or
889
837
                # if it is already associated with this trans_id.
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
 
 
 
838
                elif (self._limbo_children_names[parent].get(filename)
 
839
                      in (trans_id, None)):
 
840
                    use_direct_path = True
904
841
        if use_direct_path:
905
842
            limbo_name = pathjoin(self._limbo_files[parent], filename)
906
843
            self._limbo_children[parent].add(trans_id)
911
848
        self._limbo_files[trans_id] = limbo_name
912
849
        return limbo_name
913
850
 
914
 
    def _set_executability(self, path, trans_id):
 
851
    def _apply_removals(self, inv, inventory_delta):
 
852
        """Perform tree operations that remove directory/inventory names.
 
853
        
 
854
        That is, delete files that are to be deleted, and put any files that
 
855
        need renaming into limbo.  This must be done in strict child-to-parent
 
856
        order.
 
857
        """
 
858
        tree_paths = list(self._tree_path_ids.iteritems())
 
859
        tree_paths.sort(reverse=True)
 
860
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
861
        try:
 
862
            for num, data in enumerate(tree_paths):
 
863
                path, trans_id = data
 
864
                child_pb.update('removing file', num, len(tree_paths))
 
865
                full_path = self._tree.abspath(path)
 
866
                if trans_id in self._removed_contents:
 
867
                    delete_any(full_path)
 
868
                elif trans_id in self._new_name or trans_id in \
 
869
                    self._new_parent:
 
870
                    try:
 
871
                        os.rename(full_path, self._limbo_name(trans_id))
 
872
                    except OSError, e:
 
873
                        if e.errno != errno.ENOENT:
 
874
                            raise
 
875
                    else:
 
876
                        self.rename_count += 1
 
877
                if trans_id in self._removed_id:
 
878
                    if trans_id == self._new_root:
 
879
                        file_id = self._tree.inventory.root.file_id
 
880
                    else:
 
881
                        file_id = self.tree_file_id(trans_id)
 
882
                    assert file_id is not None
 
883
                    inventory_delta.append((path, None, file_id, None))
 
884
        finally:
 
885
            child_pb.finished()
 
886
 
 
887
    def _apply_insertions(self, inv, inventory_delta):
 
888
        """Perform tree operations that insert directory/inventory names.
 
889
        
 
890
        That is, create any files that need to be created, and restore from
 
891
        limbo any files that needed renaming.  This must be done in strict
 
892
        parent-to-child order.
 
893
        """
 
894
        new_paths = self.new_paths()
 
895
        modified_paths = []
 
896
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
897
        try:
 
898
            for num, (path, trans_id) in enumerate(new_paths):
 
899
                new_entry = None
 
900
                child_pb.update('adding file', num, len(new_paths))
 
901
                try:
 
902
                    kind = self._new_contents[trans_id]
 
903
                except KeyError:
 
904
                    kind = contents = None
 
905
                if trans_id in self._new_contents or \
 
906
                    self.path_changed(trans_id):
 
907
                    full_path = self._tree.abspath(path)
 
908
                    if trans_id in self._needs_rename:
 
909
                        try:
 
910
                            os.rename(self._limbo_name(trans_id), full_path)
 
911
                        except OSError, e:
 
912
                            # We may be renaming a dangling inventory id
 
913
                            if e.errno != errno.ENOENT:
 
914
                                raise
 
915
                        else:
 
916
                            self.rename_count += 1
 
917
                    if trans_id in self._new_contents:
 
918
                        modified_paths.append(full_path)
 
919
                        del self._new_contents[trans_id]
 
920
 
 
921
                if trans_id in self._new_id:
 
922
                    if kind is None:
 
923
                        kind = file_kind(self._tree.abspath(path))
 
924
                    if trans_id in self._new_reference_revision:
 
925
                        new_entry = inventory.TreeReference(
 
926
                            self._new_id[trans_id],
 
927
                            self._new_name[trans_id], 
 
928
                            self.final_file_id(self._new_parent[trans_id]),
 
929
                            None, self._new_reference_revision[trans_id])
 
930
                    else:
 
931
                        new_entry = inventory.make_entry(kind,
 
932
                            self.final_name(trans_id),
 
933
                            self.final_file_id(self.final_parent(trans_id)),
 
934
                            self._new_id[trans_id])
 
935
                else:
 
936
                    if trans_id in self._new_name or trans_id in\
 
937
                        self._new_parent or\
 
938
                        trans_id in self._new_executability:
 
939
                        file_id = self.final_file_id(trans_id)
 
940
                        if file_id is not None:
 
941
                            entry = inv[file_id]
 
942
                            new_entry = entry.copy()
 
943
 
 
944
                    if trans_id in self._new_name or trans_id in\
 
945
                        self._new_parent:
 
946
                            if new_entry is not None:
 
947
                                new_entry.name = self.final_name(trans_id)
 
948
                                parent = self.final_parent(trans_id)
 
949
                                parent_id = self.final_file_id(parent)
 
950
                                new_entry.parent_id = parent_id
 
951
 
 
952
                if trans_id in self._new_executability:
 
953
                    self._set_executability(path, new_entry, trans_id)
 
954
                if new_entry is not None:
 
955
                    if new_entry.file_id in inv:
 
956
                        old_path = inv.id2path(new_entry.file_id)
 
957
                    else:
 
958
                        old_path = None
 
959
                    inventory_delta.append((old_path, path,
 
960
                                            new_entry.file_id,
 
961
                                            new_entry))
 
962
        finally:
 
963
            child_pb.finished()
 
964
        return modified_paths
 
965
 
 
966
    def _set_executability(self, path, entry, trans_id):
915
967
        """Set the executability of versioned files """
 
968
        new_executability = self._new_executability[trans_id]
 
969
        entry.executable = new_executability
916
970
        if supports_executable():
917
 
            new_executability = self._new_executability[trans_id]
918
971
            abspath = self._tree.abspath(path)
919
972
            current_mode = os.stat(abspath).st_mode
920
973
            if new_executability:
937
990
            self.version_file(file_id, trans_id)
938
991
        return trans_id
939
992
 
940
 
    def new_file(self, name, parent_id, contents, file_id=None,
 
993
    def new_file(self, name, parent_id, contents, file_id=None, 
941
994
                 executable=None):
942
995
        """Convenience method to create files.
943
 
 
 
996
        
944
997
        name is the name of the file to create.
945
998
        parent_id is the transaction id of the parent directory of the file.
946
999
        contents is an iterator of bytestrings, which will be used to produce
966
1019
        """
967
1020
        trans_id = self._new_entry(name, parent_id, file_id)
968
1021
        self.create_directory(trans_id)
969
 
        return trans_id
 
1022
        return trans_id 
970
1023
 
971
1024
    def new_symlink(self, name, parent_id, target, file_id=None):
972
1025
        """Convenience method to create symbolic link.
973
 
 
 
1026
        
974
1027
        name is the name of the symlink to create.
975
1028
        parent_id is the transaction id of the parent directory of the symlink.
976
1029
        target is a bytestring of the target of the symlink.
1015
1068
        from_path = self._tree_id_paths.get(from_trans_id)
1016
1069
        if from_versioned:
1017
1070
            # get data from working tree if versioned
1018
 
            from_entry = self._tree.iter_entries_by_dir([file_id]).next()[1]
 
1071
            from_entry = self._tree.inventory[file_id]
1019
1072
            from_name = from_entry.name
1020
1073
            from_parent = from_entry.parent_id
1021
1074
        else:
1057
1110
            to_executable = False
1058
1111
        return to_name, to_parent, to_kind, to_executable
1059
1112
 
1060
 
    def iter_changes(self):
1061
 
        """Produce output in the same format as Tree.iter_changes.
 
1113
    def _iter_changes(self):
 
1114
        """Produce output in the same format as Tree._iter_changes.
1062
1115
 
1063
1116
        Will produce nonsensical results if invoked while inventory/filesystem
1064
1117
        conflicts (as reported by TreeTransform.find_conflicts()) are present.
1119
1172
                   (from_executable, to_executable)))
1120
1173
        return iter(sorted(results, key=lambda x:x[1]))
1121
1174
 
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 annotate_iter(self, file_id,
1884
 
                      default_revision=_mod_revision.CURRENT_REVISION):
1885
 
        changes = self._changes(file_id)
1886
 
        if changes is None:
1887
 
            get_old = True
1888
 
        else:
1889
 
            changed_content, versioned, kind = (changes[2], changes[3],
1890
 
                                                changes[6])
1891
 
            if kind[1] is None:
1892
 
                return None
1893
 
            get_old = (kind[0] == 'file' and versioned[0])
1894
 
        if get_old:
1895
 
            old_annotation = self._transform._tree.annotate_iter(file_id,
1896
 
                default_revision=default_revision)
1897
 
        else:
1898
 
            old_annotation = []
1899
 
        if changes is None:
1900
 
            return old_annotation
1901
 
        if not changed_content:
1902
 
            return old_annotation
1903
 
        return annotate.reannotate([old_annotation],
1904
 
                                   self.get_file(file_id).readlines(),
1905
 
                                   default_revision)
1906
 
 
1907
 
    def get_symlink_target(self, file_id):
1908
 
        """See Tree.get_symlink_target"""
1909
 
        if not self._content_change(file_id):
1910
 
            return self._transform._tree.get_symlink_target(file_id)
1911
 
        trans_id = self._transform.trans_id_file_id(file_id)
1912
 
        name = self._transform._limbo_name(trans_id)
1913
 
        return os.readlink(name)
1914
 
 
1915
 
    def walkdirs(self, prefix=''):
1916
 
        pending = [self._transform.root]
1917
 
        while len(pending) > 0:
1918
 
            parent_id = pending.pop()
1919
 
            children = []
1920
 
            subdirs = []
1921
 
            prefix = prefix.rstrip('/')
1922
 
            parent_path = self._final_paths.get_path(parent_id)
1923
 
            parent_file_id = self._transform.final_file_id(parent_id)
1924
 
            for child_id in self._all_children(parent_id):
1925
 
                path_from_root = self._final_paths.get_path(child_id)
1926
 
                basename = self._transform.final_name(child_id)
1927
 
                file_id = self._transform.final_file_id(child_id)
1928
 
                try:
1929
 
                    kind = self._transform.final_kind(child_id)
1930
 
                    versioned_kind = kind
1931
 
                except NoSuchFile:
1932
 
                    kind = 'unknown'
1933
 
                    versioned_kind = self._transform._tree.stored_kind(file_id)
1934
 
                if versioned_kind == 'directory':
1935
 
                    subdirs.append(child_id)
1936
 
                children.append((path_from_root, basename, kind, None,
1937
 
                                 file_id, versioned_kind))
1938
 
            children.sort()
1939
 
            if parent_path.startswith(prefix):
1940
 
                yield (parent_path, parent_file_id), children
1941
 
            pending.extend(sorted(subdirs, key=self._final_paths.get_path,
1942
 
                                  reverse=True))
1943
 
 
1944
 
    def get_parent_ids(self):
1945
 
        return self._parent_ids
1946
 
 
1947
 
    def set_parent_ids(self, parent_ids):
1948
 
        self._parent_ids = parent_ids
1949
 
 
1950
 
    def get_revision_tree(self, revision_id):
1951
 
        return self._transform._tree.get_revision_tree(revision_id)
1952
 
 
1953
1175
 
1954
1176
def joinpath(parent, child):
1955
1177
    """Join tree-relative paths, handling the tree root specially"""
1986
1208
            self._known_paths[trans_id] = self._determine_path(trans_id)
1987
1209
        return self._known_paths[trans_id]
1988
1210
 
1989
 
    def get_paths(self, trans_ids):
1990
 
        return [(self.get_path(t), t) for t in trans_ids]
1991
 
 
1992
 
 
1993
 
 
1994
1211
def topology_sorted_ids(tree):
1995
1212
    """Determine the topological order of the ids in a tree"""
1996
1213
    file_ids = list(tree)
1998
1215
    return file_ids
1999
1216
 
2000
1217
 
2001
 
def build_tree(tree, wt, accelerator_tree=None, hardlink=False,
2002
 
               delta_from_tree=False):
 
1218
def build_tree(tree, wt):
2003
1219
    """Create working tree for a branch, using a TreeTransform.
2004
 
 
 
1220
    
2005
1221
    This function should be used on empty trees, having a tree root at most.
2006
1222
    (see merge and revert functionality for working with existing trees)
2007
1223
 
2008
1224
    Existing files are handled like so:
2009
 
 
 
1225
    
2010
1226
    - Existing bzrdirs take precedence over creating new items.  They are
2011
1227
      created as '%s.diverted' % name.
2012
1228
    - Otherwise, if the content on disk matches the content we are building,
2013
1229
      it is silently replaced.
2014
1230
    - Otherwise, conflict resolution will move the old file to 'oldname.moved'.
2015
 
 
2016
 
    :param tree: The tree to convert wt into a copy of
2017
 
    :param wt: The working tree that files will be placed into
2018
 
    :param accelerator_tree: A tree which can be used for retrieving file
2019
 
        contents more quickly than tree itself, i.e. a workingtree.  tree
2020
 
        will be used for cases where accelerator_tree's content is different.
2021
 
    :param hardlink: If true, hard-link files to accelerator_tree, where
2022
 
        possible.  accelerator_tree must implement abspath, i.e. be a
2023
 
        working tree.
2024
 
    :param delta_from_tree: If true, build_tree may use the input Tree to
2025
 
        generate the inventory delta.
2026
1231
    """
2027
1232
    wt.lock_tree_write()
2028
1233
    try:
2029
1234
        tree.lock_read()
2030
1235
        try:
2031
 
            if accelerator_tree is not None:
2032
 
                accelerator_tree.lock_read()
2033
 
            try:
2034
 
                return _build_tree(tree, wt, accelerator_tree, hardlink,
2035
 
                                   delta_from_tree)
2036
 
            finally:
2037
 
                if accelerator_tree is not None:
2038
 
                    accelerator_tree.unlock()
 
1236
            return _build_tree(tree, wt)
2039
1237
        finally:
2040
1238
            tree.unlock()
2041
1239
    finally:
2042
1240
        wt.unlock()
2043
1241
 
2044
 
 
2045
 
def _build_tree(tree, wt, accelerator_tree, hardlink, delta_from_tree):
 
1242
def _build_tree(tree, wt):
2046
1243
    """See build_tree."""
2047
 
    for num, _unused in enumerate(wt.all_file_ids()):
2048
 
        if num > 0:  # more than just a root
2049
 
            raise errors.WorkingTreeAlreadyPopulated(base=wt.basedir)
2050
 
    existing_files = set()
2051
 
    for dir, files in wt.walkdirs():
2052
 
        existing_files.update(f[0] for f in files)
 
1244
    if len(wt.inventory) > 1:  # more than just a root
 
1245
        raise errors.WorkingTreeAlreadyPopulated(base=wt.basedir)
2053
1246
    file_trans_id = {}
2054
1247
    top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2055
1248
    pp = ProgressPhase("Build phase", 2, top_pb)
2061
1254
        # is set within the tree, nor setting the root and thus
2062
1255
        # marking the tree as dirty, because we use two different
2063
1256
        # idioms here: tree interfaces and inventory interfaces.
2064
 
        if wt.get_root_id() != tree.get_root_id():
2065
 
            wt.set_root_id(tree.get_root_id())
 
1257
        if wt.path2id('') != tree.inventory.root.file_id:
 
1258
            wt.set_root_id(tree.inventory.root.file_id)
2066
1259
            wt.flush()
2067
1260
    tt = TreeTransform(wt)
2068
1261
    divert = set()
2072
1265
            tt.trans_id_tree_file_id(wt.get_root_id())
2073
1266
        pb = bzrlib.ui.ui_factory.nested_progress_bar()
2074
1267
        try:
2075
 
            deferred_contents = []
2076
 
            num = 0
2077
 
            total = len(tree.inventory)
2078
 
            if delta_from_tree:
2079
 
                precomputed_delta = []
2080
 
            else:
2081
 
                precomputed_delta = None
2082
1268
            for num, (tree_path, entry) in \
2083
1269
                enumerate(tree.inventory.iter_entries_by_dir()):
2084
 
                pb.update("Building tree", num - len(deferred_contents), total)
 
1270
                pb.update("Building tree", num, len(tree.inventory))
2085
1271
                if entry.parent_id is None:
2086
1272
                    continue
2087
1273
                reparent = False
2088
1274
                file_id = entry.file_id
2089
 
                if delta_from_tree:
2090
 
                    precomputed_delta.append((None, tree_path, file_id, entry))
2091
 
                if tree_path in existing_files:
2092
 
                    target_path = wt.abspath(tree_path)
 
1275
                target_path = wt.abspath(tree_path)
 
1276
                try:
2093
1277
                    kind = file_kind(target_path)
 
1278
                except NoSuchFile:
 
1279
                    pass
 
1280
                else:
2094
1281
                    if kind == "directory":
2095
1282
                        try:
2096
1283
                            bzrdir.BzrDir.open(target_path)
2104
1291
                        tt.delete_contents(tt.trans_id_tree_path(tree_path))
2105
1292
                        if kind == 'directory':
2106
1293
                            reparent = True
 
1294
                if entry.parent_id not in file_trans_id:
 
1295
                    raise AssertionError(
 
1296
                        'entry %s parent id %r is not in file_trans_id %r'
 
1297
                        % (entry, entry.parent_id, file_trans_id))
2107
1298
                parent_id = file_trans_id[entry.parent_id]
2108
 
                if entry.kind == 'file':
2109
 
                    # We *almost* replicate new_by_entry, so that we can defer
2110
 
                    # getting the file text, and get them all at once.
2111
 
                    trans_id = tt.create_path(entry.name, parent_id)
2112
 
                    file_trans_id[file_id] = trans_id
2113
 
                    tt.version_file(file_id, trans_id)
2114
 
                    executable = tree.is_executable(file_id, tree_path)
2115
 
                    if executable:
2116
 
                        tt.set_executability(executable, trans_id)
2117
 
                    trans_data = (trans_id, tree_path)
2118
 
                    deferred_contents.append((file_id, trans_data))
2119
 
                else:
2120
 
                    file_trans_id[file_id] = new_by_entry(tt, entry, parent_id,
2121
 
                                                          tree)
 
1299
                file_trans_id[file_id] = new_by_entry(tt, entry, parent_id,
 
1300
                                                      tree)
2122
1301
                if reparent:
2123
1302
                    new_trans_id = file_trans_id[file_id]
2124
1303
                    old_parent = tt.trans_id_tree_path(tree_path)
2125
1304
                    _reparent_children(tt, old_parent, new_trans_id)
2126
 
            offset = num + 1 - len(deferred_contents)
2127
 
            _create_files(tt, tree, deferred_contents, pb, offset,
2128
 
                          accelerator_tree, hardlink)
2129
1305
        finally:
2130
1306
            pb.finished()
2131
1307
        pp.next_phase()
2132
1308
        divert_trans = set(file_trans_id[f] for f in divert)
2133
1309
        resolver = lambda t, c: resolve_checkout(t, c, divert_trans)
2134
1310
        raw_conflicts = resolve_conflicts(tt, pass_func=resolver)
2135
 
        if len(raw_conflicts) > 0:
2136
 
            precomputed_delta = None
2137
1311
        conflicts = cook_conflicts(raw_conflicts, tt)
2138
1312
        for conflict in conflicts:
2139
1313
            warning(conflict)
2141
1315
            wt.add_conflicts(conflicts)
2142
1316
        except errors.UnsupportedOperation:
2143
1317
            pass
2144
 
        result = tt.apply(no_conflicts=True,
2145
 
                          precomputed_delta=precomputed_delta)
 
1318
        result = tt.apply()
2146
1319
    finally:
2147
1320
        tt.finalize()
2148
1321
        top_pb.finished()
2149
1322
    return result
2150
1323
 
2151
1324
 
2152
 
def _create_files(tt, tree, desired_files, pb, offset, accelerator_tree,
2153
 
                  hardlink):
2154
 
    total = len(desired_files) + offset
2155
 
    wt = tt._tree
2156
 
    if accelerator_tree is None:
2157
 
        new_desired_files = desired_files
2158
 
    else:
2159
 
        iter = accelerator_tree.iter_changes(tree, include_unchanged=True)
2160
 
        unchanged = dict((f, p[1]) for (f, p, c, v, d, n, k, e)
2161
 
                         in iter if not (c or e[0] != e[1]))
2162
 
        new_desired_files = []
2163
 
        count = 0
2164
 
        for file_id, (trans_id, tree_path) in desired_files:
2165
 
            accelerator_path = unchanged.get(file_id)
2166
 
            if accelerator_path is None:
2167
 
                new_desired_files.append((file_id, (trans_id, tree_path)))
2168
 
                continue
2169
 
            pb.update('Adding file contents', count + offset, total)
2170
 
            if hardlink:
2171
 
                tt.create_hardlink(accelerator_tree.abspath(accelerator_path),
2172
 
                                   trans_id)
2173
 
            else:
2174
 
                contents = accelerator_tree.get_file(file_id, accelerator_path)
2175
 
                if wt.supports_content_filtering():
2176
 
                    filters = wt._content_filter_stack(tree_path)
2177
 
                    contents = filtered_output_bytes(contents, filters,
2178
 
                        ContentFilterContext(tree_path, tree))
2179
 
                try:
2180
 
                    tt.create_file(contents, trans_id)
2181
 
                finally:
2182
 
                    try:
2183
 
                        contents.close()
2184
 
                    except AttributeError:
2185
 
                        # after filtering, contents may no longer be file-like
2186
 
                        pass
2187
 
            count += 1
2188
 
        offset += count
2189
 
    for count, ((trans_id, tree_path), contents) in enumerate(
2190
 
            tree.iter_files_bytes(new_desired_files)):
2191
 
        if wt.supports_content_filtering():
2192
 
            filters = wt._content_filter_stack(tree_path)
2193
 
            contents = filtered_output_bytes(contents, filters,
2194
 
                ContentFilterContext(tree_path, tree))
2195
 
        tt.create_file(contents, trans_id)
2196
 
        pb.update('Adding file contents', count + offset, total)
2197
 
 
2198
 
 
2199
1325
def _reparent_children(tt, old_parent, new_parent):
2200
1326
    for child in tt.iter_tree_children(old_parent):
2201
1327
        tt.adjust_path(tt.final_name(child), new_parent, child)
2202
1328
 
2203
 
def _reparent_transform_children(tt, old_parent, new_parent):
2204
 
    by_parent = tt.by_parent()
2205
 
    for child in by_parent[old_parent]:
2206
 
        tt.adjust_path(tt.final_name(child), new_parent, child)
2207
 
    return by_parent[old_parent]
2208
1329
 
2209
1330
def _content_match(tree, entry, file_id, kind, target_path):
2210
1331
    if entry.kind != kind:
2224
1345
    new_conflicts = set()
2225
1346
    for c_type, conflict in ((c[0], c) for c in conflicts):
2226
1347
        # Anything but a 'duplicate' would indicate programmer error
2227
 
        if c_type != 'duplicate':
2228
 
            raise AssertionError(c_type)
 
1348
        assert c_type == 'duplicate', c_type
2229
1349
        # Now figure out which is new and which is old
2230
1350
        if tt.new_contents(conflict[1]):
2231
1351
            new_file = conflict[1]
2257
1377
    if kind == 'file':
2258
1378
        contents = tree.get_file(entry.file_id).readlines()
2259
1379
        executable = tree.is_executable(entry.file_id)
2260
 
        return tt.new_file(name, parent_id, contents, entry.file_id,
 
1380
        return tt.new_file(name, parent_id, contents, entry.file_id, 
2261
1381
                           executable)
2262
1382
    elif kind in ('directory', 'tree-reference'):
2263
1383
        trans_id = tt.new_directory(name, parent_id, entry.file_id)
2264
1384
        if kind == 'tree-reference':
2265
1385
            tt.set_tree_reference(entry.reference_revision, trans_id)
2266
 
        return trans_id
 
1386
        return trans_id 
2267
1387
    elif kind == 'symlink':
2268
1388
        target = tree.get_symlink_target(entry.file_id)
2269
1389
        return tt.new_symlink(name, parent_id, target, entry.file_id)
2270
1390
    else:
2271
1391
        raise errors.BadFileKindError(name, kind)
2272
1392
 
2273
 
 
2274
 
@deprecated_function(deprecated_in((1, 9, 0)))
2275
1393
def create_by_entry(tt, entry, tree, trans_id, lines=None, mode_id=None):
2276
 
    """Create new file contents according to an inventory entry.
2277
 
 
2278
 
    DEPRECATED.  Use create_from_tree instead.
2279
 
    """
 
1394
    """Create new file contents according to an inventory entry."""
2280
1395
    if entry.kind == "file":
2281
1396
        if lines is None:
2282
1397
            lines = tree.get_file(entry.file_id).readlines()
2286
1401
    elif entry.kind == "directory":
2287
1402
        tt.create_directory(trans_id)
2288
1403
 
2289
 
 
2290
 
def create_from_tree(tt, trans_id, tree, file_id, bytes=None):
2291
 
    """Create new file contents according to tree contents."""
2292
 
    kind = tree.kind(file_id)
2293
 
    if kind == 'directory':
2294
 
        tt.create_directory(trans_id)
2295
 
    elif kind == "file":
2296
 
        if bytes is None:
2297
 
            tree_file = tree.get_file(file_id)
2298
 
            try:
2299
 
                bytes = tree_file.readlines()
2300
 
            finally:
2301
 
                tree_file.close()
2302
 
        tt.create_file(bytes, trans_id)
2303
 
    elif kind == "symlink":
2304
 
        tt.create_symlink(tree.get_symlink_target(file_id), trans_id)
2305
 
    else:
2306
 
        raise AssertionError('Unknown kind %r' % kind)
2307
 
 
2308
 
 
2309
1404
def create_entry_executability(tt, entry, trans_id):
2310
1405
    """Set the executability of a trans_id according to an inventory entry"""
2311
1406
    if entry.kind == "file":
2312
1407
        tt.set_executability(entry.executable, trans_id)
2313
1408
 
2314
1409
 
 
1410
@deprecated_function(zero_fifteen)
 
1411
def find_interesting(working_tree, target_tree, filenames):
 
1412
    """Find the ids corresponding to specified filenames.
 
1413
    
 
1414
    Deprecated: Please use tree1.paths2ids(filenames, [tree2]).
 
1415
    """
 
1416
    working_tree.lock_read()
 
1417
    try:
 
1418
        target_tree.lock_read()
 
1419
        try:
 
1420
            return working_tree.paths2ids(filenames, [target_tree])
 
1421
        finally:
 
1422
            target_tree.unlock()
 
1423
    finally:
 
1424
        working_tree.unlock()
 
1425
 
 
1426
 
 
1427
def change_entry(tt, file_id, working_tree, target_tree, 
 
1428
                 trans_id_file_id, backups, trans_id, by_parent):
 
1429
    """Replace a file_id's contents with those from a target tree."""
 
1430
    e_trans_id = trans_id_file_id(file_id)
 
1431
    entry = target_tree.inventory[file_id]
 
1432
    has_contents, contents_mod, meta_mod, = _entry_changes(file_id, entry, 
 
1433
                                                           working_tree)
 
1434
    if contents_mod:
 
1435
        mode_id = e_trans_id
 
1436
        if has_contents:
 
1437
            if not backups:
 
1438
                tt.delete_contents(e_trans_id)
 
1439
            else:
 
1440
                parent_trans_id = trans_id_file_id(entry.parent_id)
 
1441
                backup_name = get_backup_name(entry, by_parent,
 
1442
                                              parent_trans_id, tt)
 
1443
                tt.adjust_path(backup_name, parent_trans_id, e_trans_id)
 
1444
                tt.unversion_file(e_trans_id)
 
1445
                e_trans_id = tt.create_path(entry.name, parent_trans_id)
 
1446
                tt.version_file(file_id, e_trans_id)
 
1447
                trans_id[file_id] = e_trans_id
 
1448
        create_by_entry(tt, entry, target_tree, e_trans_id, mode_id=mode_id)
 
1449
        create_entry_executability(tt, entry, e_trans_id)
 
1450
 
 
1451
    elif meta_mod:
 
1452
        tt.set_executability(entry.executable, e_trans_id)
 
1453
    if tt.final_name(e_trans_id) != entry.name:
 
1454
        adjust_path  = True
 
1455
    else:
 
1456
        parent_id = tt.final_parent(e_trans_id)
 
1457
        parent_file_id = tt.final_file_id(parent_id)
 
1458
        if parent_file_id != entry.parent_id:
 
1459
            adjust_path = True
 
1460
        else:
 
1461
            adjust_path = False
 
1462
    if adjust_path:
 
1463
        parent_trans_id = trans_id_file_id(entry.parent_id)
 
1464
        tt.adjust_path(entry.name, parent_trans_id, e_trans_id)
 
1465
 
 
1466
 
2315
1467
def get_backup_name(entry, by_parent, parent_trans_id, tt):
2316
1468
    return _get_backup_name(entry.name, by_parent, parent_trans_id, tt)
2317
1469
 
2348
1500
        if entry.kind != working_kind:
2349
1501
            contents_mod, meta_mod = True, False
2350
1502
        else:
2351
 
            cur_entry._read_tree_state(working_tree.id2path(file_id),
 
1503
            cur_entry._read_tree_state(working_tree.id2path(file_id), 
2352
1504
                                       working_tree)
2353
1505
            contents_mod, meta_mod = entry.detect_changes(cur_entry)
2354
1506
            cur_entry._forget_tree_state()
2362
1514
    tt = TreeTransform(working_tree, pb)
2363
1515
    try:
2364
1516
        pp = ProgressPhase("Revert phase", 3, pb)
2365
 
        conflicts, merge_modified = _prepare_revert_transform(
2366
 
            working_tree, target_tree, tt, filenames, backups, pp)
 
1517
        pp.next_phase()
 
1518
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
1519
        try:
 
1520
            merge_modified = _alter_files(working_tree, target_tree, tt,
 
1521
                                          child_pb, filenames, backups)
 
1522
        finally:
 
1523
            child_pb.finished()
 
1524
        pp.next_phase()
 
1525
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
1526
        try:
 
1527
            raw_conflicts = resolve_conflicts(tt, child_pb)
 
1528
        finally:
 
1529
            child_pb.finished()
 
1530
        conflicts = cook_conflicts(raw_conflicts, tt)
2367
1531
        if change_reporter:
2368
1532
            change_reporter = delta._ChangeReporter(
2369
1533
                unversioned_filter=working_tree.is_ignored)
2370
 
            delta.report_changes(tt.iter_changes(), change_reporter)
 
1534
            delta.report_changes(tt._iter_changes(), change_reporter)
2371
1535
        for conflict in conflicts:
2372
1536
            warning(conflict)
2373
1537
        pp.next_phase()
2380
1544
    return conflicts
2381
1545
 
2382
1546
 
2383
 
def _prepare_revert_transform(working_tree, target_tree, tt, filenames,
2384
 
                              backups, pp, basis_tree=None,
2385
 
                              merge_modified=None):
2386
 
    pp.next_phase()
2387
 
    child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2388
 
    try:
2389
 
        if merge_modified is None:
2390
 
            merge_modified = working_tree.merge_modified()
2391
 
        merge_modified = _alter_files(working_tree, target_tree, tt,
2392
 
                                      child_pb, filenames, backups,
2393
 
                                      merge_modified, basis_tree)
2394
 
    finally:
2395
 
        child_pb.finished()
2396
 
    pp.next_phase()
2397
 
    child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2398
 
    try:
2399
 
        raw_conflicts = resolve_conflicts(tt, child_pb,
2400
 
            lambda t, c: conflict_pass(t, c, target_tree))
2401
 
    finally:
2402
 
        child_pb.finished()
2403
 
    conflicts = cook_conflicts(raw_conflicts, tt)
2404
 
    return conflicts, merge_modified
2405
 
 
2406
 
 
2407
1547
def _alter_files(working_tree, target_tree, tt, pb, specific_files,
2408
 
                 backups, merge_modified, basis_tree=None):
2409
 
    if basis_tree is not None:
2410
 
        basis_tree.lock_read()
2411
 
    change_list = target_tree.iter_changes(working_tree,
 
1548
                 backups):
 
1549
    merge_modified = working_tree.merge_modified()
 
1550
    change_list = target_tree._iter_changes(working_tree,
2412
1551
        specific_files=specific_files, pb=pb)
2413
 
    if target_tree.get_root_id() is None:
 
1552
    if target_tree.inventory.root is None:
2414
1553
        skip_root = True
2415
1554
    else:
2416
1555
        skip_root = False
 
1556
    basis_tree = None
2417
1557
    try:
2418
 
        deferred_files = []
2419
1558
        for id_num, (file_id, path, changed_content, versioned, parent, name,
2420
1559
                kind, executable) in enumerate(change_list):
2421
1560
            if skip_root and file_id[0] is not None and parent[0] is None:
2455
1594
                        # contents
2456
1595
                        mode_id = trans_id
2457
1596
                        trans_id = new_trans_id
2458
 
                if kind[1] in ('directory', 'tree-reference'):
 
1597
                if kind[1] == 'directory':
2459
1598
                    tt.create_directory(trans_id)
2460
 
                    if kind[1] == 'tree-reference':
2461
 
                        revision = target_tree.get_reference_revision(file_id,
2462
 
                                                                      path[1])
2463
 
                        tt.set_tree_reference(revision, trans_id)
2464
1599
                elif kind[1] == 'symlink':
2465
1600
                    tt.create_symlink(target_tree.get_symlink_target(file_id),
2466
1601
                                      trans_id)
2467
1602
                elif kind[1] == 'file':
2468
 
                    deferred_files.append((file_id, (trans_id, mode_id)))
 
1603
                    tt.create_file(target_tree.get_file_lines(file_id),
 
1604
                                   trans_id, mode_id)
2469
1605
                    if basis_tree is None:
2470
1606
                        basis_tree = working_tree.basis_tree()
2471
1607
                        basis_tree.lock_read()
2480
1616
                    # preserve the execute bit when backing up
2481
1617
                    if keep_content and executable[0] == executable[1]:
2482
1618
                        tt.set_executability(executable[1], trans_id)
2483
 
                elif kind[1] is not None:
2484
 
                    raise AssertionError(kind[1])
 
1619
                else:
 
1620
                    assert kind[1] is None
2485
1621
            if versioned == (False, True):
2486
1622
                tt.version_file(file_id, trans_id)
2487
1623
            if versioned == (True, False):
2488
1624
                tt.unversion_file(trans_id)
2489
 
            if (name[1] is not None and
 
1625
            if (name[1] is not None and 
2490
1626
                (name[0] != name[1] or parent[0] != parent[1])):
2491
 
                if name[1] == '' and parent[1] is None:
2492
 
                    parent_trans = ROOT_PARENT
2493
 
                else:
2494
 
                    parent_trans = tt.trans_id_file_id(parent[1])
2495
 
                tt.adjust_path(name[1], parent_trans, trans_id)
 
1627
                tt.adjust_path(
 
1628
                    name[1], tt.trans_id_file_id(parent[1]), trans_id)
2496
1629
            if executable[0] != executable[1] and kind[1] == "file":
2497
1630
                tt.set_executability(executable[1], trans_id)
2498
 
        for (trans_id, mode_id), bytes in target_tree.iter_files_bytes(
2499
 
            deferred_files):
2500
 
            tt.create_file(bytes, trans_id, mode_id)
2501
1631
    finally:
2502
1632
        if basis_tree is not None:
2503
1633
            basis_tree.unlock()
2536
1666
                               conflict[1], conflict[2], ))
2537
1667
        elif c_type == 'duplicate':
2538
1668
            # files that were renamed take precedence
 
1669
            new_name = tt.final_name(conflict[1])+'.moved'
2539
1670
            final_parent = tt.final_parent(conflict[1])
2540
1671
            if tt.path_changed(conflict[1]):
2541
 
                existing_file, new_file = conflict[2], conflict[1]
 
1672
                tt.adjust_path(new_name, final_parent, conflict[2])
 
1673
                new_conflicts.add((c_type, 'Moved existing file to', 
 
1674
                                   conflict[2], conflict[1]))
2542
1675
            else:
2543
 
                existing_file, new_file = conflict[1], conflict[2]
2544
 
            new_name = tt.final_name(existing_file)+'.moved'
2545
 
            tt.adjust_path(new_name, final_parent, existing_file)
2546
 
            new_conflicts.add((c_type, 'Moved existing file to',
2547
 
                               existing_file, new_file))
 
1676
                tt.adjust_path(new_name, final_parent, conflict[1])
 
1677
                new_conflicts.add((c_type, 'Moved existing file to', 
 
1678
                                  conflict[1], conflict[2]))
2548
1679
        elif c_type == 'parent loop':
2549
1680
            # break the loop by undoing one of the ops that caused the loop
2550
1681
            cur = conflict[1]
2553
1684
            new_conflicts.add((c_type, 'Cancelled move', cur,
2554
1685
                               tt.final_parent(cur),))
2555
1686
            tt.adjust_path(tt.final_name(cur), tt.get_tree_parent(cur), cur)
2556
 
 
 
1687
            
2557
1688
        elif c_type == 'missing parent':
2558
1689
            trans_id = conflict[1]
2559
1690
            try:
2560
1691
                tt.cancel_deletion(trans_id)
2561
 
                new_conflicts.add(('deleting parent', 'Not deleting',
 
1692
                new_conflicts.add(('deleting parent', 'Not deleting', 
2562
1693
                                   trans_id))
2563
1694
            except KeyError:
2564
 
                create = True
 
1695
                tt.create_directory(trans_id)
 
1696
                new_conflicts.add((c_type, 'Created directory', trans_id))
2565
1697
                try:
2566
1698
                    tt.final_name(trans_id)
2567
1699
                except NoFinalPath:
2568
 
                    if path_tree is not None:
2569
 
                        file_id = tt.final_file_id(trans_id)
2570
 
                        if file_id is None:
2571
 
                            file_id = tt.inactive_file_id(trans_id)
2572
 
                        entry = path_tree.inventory[file_id]
2573
 
                        # special-case the other tree root (move its
2574
 
                        # children to current root)
2575
 
                        if entry.parent_id is None:
2576
 
                            create=False
2577
 
                            moved = _reparent_transform_children(
2578
 
                                tt, trans_id, tt.root)
2579
 
                            for child in moved:
2580
 
                                new_conflicts.add((c_type, 'Moved to root',
2581
 
                                                   child))
2582
 
                        else:
2583
 
                            parent_trans_id = tt.trans_id_file_id(
2584
 
                                entry.parent_id)
2585
 
                            tt.adjust_path(entry.name, parent_trans_id,
2586
 
                                           trans_id)
2587
 
                if create:
2588
 
                    tt.create_directory(trans_id)
2589
 
                    new_conflicts.add((c_type, 'Created directory', trans_id))
 
1700
                    file_id = tt.final_file_id(trans_id)
 
1701
                    entry = path_tree.inventory[file_id]
 
1702
                    parent_trans_id = tt.trans_id_file_id(entry.parent_id)
 
1703
                    tt.adjust_path(entry.name, parent_trans_id, trans_id)
2590
1704
        elif c_type == 'unversioned parent':
2591
 
            file_id = tt.inactive_file_id(conflict[1])
2592
 
            # special-case the other tree root (move its children instead)
2593
 
            if path_tree and file_id in path_tree:
2594
 
                if path_tree.inventory[file_id].parent_id is None:
2595
 
                    continue
2596
 
            tt.version_file(file_id, conflict[1])
 
1705
            tt.version_file(tt.inactive_file_id(conflict[1]), conflict[1])
2597
1706
            new_conflicts.add((c_type, 'Versioned directory', conflict[1]))
2598
 
        elif c_type == 'non-directory parent':
2599
 
            parent_id = conflict[1]
2600
 
            parent_parent = tt.final_parent(parent_id)
2601
 
            parent_name = tt.final_name(parent_id)
2602
 
            parent_file_id = tt.final_file_id(parent_id)
2603
 
            new_parent_id = tt.new_directory(parent_name + '.new',
2604
 
                parent_parent, parent_file_id)
2605
 
            _reparent_transform_children(tt, parent_id, new_parent_id)
2606
 
            if parent_file_id is not None:
2607
 
                tt.unversion_file(parent_id)
2608
 
            new_conflicts.add((c_type, 'Created directory', new_parent_id))
2609
 
        elif c_type == 'versioning no contents':
2610
 
            tt.cancel_versioning(conflict[1])
2611
1707
    return new_conflicts
2612
1708
 
2613
1709
 
2629
1725
        if len(conflict) == 3:
2630
1726
            yield Conflict.factory(c_type, action=action, path=modified_path,
2631
1727
                                     file_id=modified_id)
2632
 
 
 
1728
             
2633
1729
        else:
2634
1730
            conflicting_path = fp.get_path(conflict[3])
2635
1731
            conflicting_id = tt.final_file_id(conflict[3])
2636
1732
            yield Conflict.factory(c_type, action=action, path=modified_path,
2637
 
                                   file_id=modified_id,
 
1733
                                   file_id=modified_id, 
2638
1734
                                   conflict_path=conflicting_path,
2639
1735
                                   conflict_file_id=conflicting_id)
2640
 
 
2641
 
 
2642
 
class _FileMover(object):
2643
 
    """Moves and deletes files for TreeTransform, tracking operations"""
2644
 
 
2645
 
    def __init__(self):
2646
 
        self.past_renames = []
2647
 
        self.pending_deletions = []
2648
 
 
2649
 
    def rename(self, from_, to):
2650
 
        """Rename a file from one path to another.  Functions like os.rename"""
2651
 
        try:
2652
 
            os.rename(from_, to)
2653
 
        except OSError, e:
2654
 
            if e.errno in (errno.EEXIST, errno.ENOTEMPTY):
2655
 
                raise errors.FileExists(to, str(e))
2656
 
            raise
2657
 
        self.past_renames.append((from_, to))
2658
 
 
2659
 
    def pre_delete(self, from_, to):
2660
 
        """Rename a file out of the way and mark it for deletion.
2661
 
 
2662
 
        Unlike os.unlink, this works equally well for files and directories.
2663
 
        :param from_: The current file path
2664
 
        :param to: A temporary path for the file
2665
 
        """
2666
 
        self.rename(from_, to)
2667
 
        self.pending_deletions.append(to)
2668
 
 
2669
 
    def rollback(self):
2670
 
        """Reverse all renames that have been performed"""
2671
 
        for from_, to in reversed(self.past_renames):
2672
 
            os.rename(to, from_)
2673
 
        # after rollback, don't reuse _FileMover
2674
 
        past_renames = None
2675
 
        pending_deletions = None
2676
 
 
2677
 
    def apply_deletions(self):
2678
 
        """Apply all marked deletions"""
2679
 
        for path in self.pending_deletions:
2680
 
            delete_any(path)
2681
 
        # after apply_deletions, don't reuse _FileMover
2682
 
        past_renames = None
2683
 
        pending_deletions = None