← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

  • Committer: Sabin Iacob
  • Date: 2009-03-23 14:59:43 UTC
  • mto: (4189.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4193.
  • Revision ID: iacobs@m0n5t3r.info-20090323145943-3s3p1px5q1rkh2e5
update FSF mailing address

Show diffs side-by-side

added added

removed removed

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