/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-07-17 01:01:14 UTC
  • mfrom: (3544.1.1 ianc-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20080717010114-xbxqlwo42vqi0rif
fix how cog.py is invoked on Windows (Mark Hammond)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
1
 
# Copyright (C) 2006 Canonical Ltd
2
 
 
 
1
# Copyright (C) 2006, 2007, 2008 Canonical Ltd
 
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
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
7
 
 
 
7
#
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
11
# GNU General Public License for more details.
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
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
import os
18
18
import errno
19
 
from stat import S_ISREG
 
19
from stat import S_ISREG, S_IEXEC
 
20
import tempfile
20
21
 
 
22
from bzrlib.lazy_import import lazy_import
 
23
lazy_import(globals(), """
 
24
from bzrlib import (
 
25
    annotate,
 
26
    bzrdir,
 
27
    delta,
 
28
    errors,
 
29
    inventory,
 
30
    revision as _mod_revision,
 
31
    )
 
32
""")
21
33
from bzrlib.errors import (DuplicateKey, MalformedTransform, NoSuchFile,
22
34
                           ReusingTransform, NotVersionedError, CantMoveRoot,
23
 
                           ExistingLimbo, ImmortalLimbo)
 
35
                           ExistingLimbo, ImmortalLimbo, NoFinalPath,
 
36
                           UnableCreateSymlink)
24
37
from bzrlib.inventory import InventoryEntry
25
 
from bzrlib.osutils import (file_kind, supports_executable, pathjoin, lexists,
26
 
                            delete_any)
 
38
from bzrlib.osutils import (
 
39
    delete_any,
 
40
    file_kind,
 
41
    has_symlinks,
 
42
    lexists,
 
43
    pathjoin,
 
44
    splitpath,
 
45
    supports_executable,
 
46
)
27
47
from bzrlib.progress import DummyProgress, ProgressPhase
 
48
from bzrlib.symbol_versioning import (
 
49
        deprecated_function,
 
50
        )
28
51
from bzrlib.trace import mutter, warning
29
 
import bzrlib.ui 
 
52
from bzrlib import tree
 
53
import bzrlib.ui
 
54
import bzrlib.urlutils as urlutils
30
55
 
31
56
 
32
57
ROOT_PARENT = "root-parent"
39
64
 
40
65
 
41
66
class _TransformResults(object):
42
 
    def __init__(self, modified_paths):
 
67
    def __init__(self, modified_paths, rename_count):
43
68
        object.__init__(self)
44
69
        self.modified_paths = modified_paths
45
 
 
46
 
 
47
 
class TreeTransform(object):
48
 
    """Represent a tree transformation.
49
 
    
50
 
    This object is designed to support incremental generation of the transform,
51
 
    in any order.  
52
 
    
53
 
    It is easy to produce malformed transforms, but they are generally
54
 
    harmless.  Attempting to apply a malformed transform will cause an
55
 
    exception to be raised before any modifications are made to the tree.  
56
 
 
57
 
    Many kinds of malformed transforms can be corrected with the 
58
 
    resolve_conflicts function.  The remaining ones indicate programming error,
59
 
    such as trying to create a file with no path.
60
 
 
61
 
    Two sets of file creation methods are supplied.  Convenience methods are:
62
 
     * new_file
63
 
     * new_directory
64
 
     * new_symlink
65
 
 
66
 
    These are composed of the low-level methods:
67
 
     * create_path
68
 
     * create_file or create_directory or create_symlink
69
 
     * version_file
70
 
     * set_executability
71
 
    """
72
 
    def __init__(self, tree, pb=DummyProgress()):
73
 
        """Note: a write lock is taken on the tree.
74
 
        
75
 
        Use TreeTransform.finalize() to release the lock
 
70
        self.rename_count = rename_count
 
71
 
 
72
 
 
73
class TreeTransformBase(object):
 
74
    """The base class for TreeTransform and TreeTransformBase"""
 
75
 
 
76
    def __init__(self, tree, limbodir, pb=DummyProgress(),
 
77
                 case_sensitive=True):
 
78
        """Constructor.
 
79
 
 
80
        :param tree: The tree that will be transformed, but not necessarily
 
81
            the output tree.
 
82
        :param limbodir: A directory where new files can be stored until
 
83
            they are installed in their proper places
 
84
        :param pb: A ProgressBar indicating how much progress is being made
 
85
        :param case_sensitive: If True, the target of the transform is
 
86
            case sensitive, not just case preserving.
76
87
        """
77
88
        object.__init__(self)
78
89
        self._tree = tree
79
 
        self._tree.lock_write()
80
 
        try:
81
 
            control_files = self._tree._control_files
82
 
            self._limbodir = control_files.controlfilename('limbo')
83
 
            try:
84
 
                os.mkdir(self._limbodir)
85
 
            except OSError, e:
86
 
                if e.errno == errno.EEXIST:
87
 
                    raise ExistingLimbo(self._limbodir)
88
 
        except: 
89
 
            self._tree.unlock()
90
 
            raise
91
 
 
 
90
        self._limbodir = limbodir
 
91
        self._deletiondir = None
92
92
        self._id_number = 0
 
93
        # mapping of trans_id -> new basename
93
94
        self._new_name = {}
 
95
        # mapping of trans_id -> new parent trans_id
94
96
        self._new_parent = {}
 
97
        # mapping of trans_id with new contents -> new file_kind
95
98
        self._new_contents = {}
 
99
        # A mapping of transform ids to their limbo filename
 
100
        self._limbo_files = {}
 
101
        # A mapping of transform ids to a set of the transform ids of children
 
102
        # that their limbo directory has
 
103
        self._limbo_children = {}
 
104
        # Map transform ids to maps of child filename to child transform id
 
105
        self._limbo_children_names = {}
 
106
        # List of transform ids that need to be renamed from limbo into place
 
107
        self._needs_rename = set()
 
108
        # Set of trans_ids whose contents will be removed
96
109
        self._removed_contents = set()
 
110
        # Mapping of trans_id -> new execute-bit value
97
111
        self._new_executability = {}
 
112
        # Mapping of trans_id -> new tree-reference value
 
113
        self._new_reference_revision = {}
 
114
        # Mapping of trans_id -> new file_id
98
115
        self._new_id = {}
 
116
        # Mapping of old file-id -> trans_id
99
117
        self._non_present_ids = {}
 
118
        # Mapping of new file_id -> trans_id
100
119
        self._r_new_id = {}
 
120
        # Set of file_ids that will be removed
101
121
        self._removed_id = set()
 
122
        # Mapping of path in old tree -> trans_id
102
123
        self._tree_path_ids = {}
 
124
        # Mapping trans_id -> path in old tree
103
125
        self._tree_id_paths = {}
 
126
        # Cache of realpath results, to speed up canonical_path
 
127
        self._realpaths = {}
 
128
        # Cache of relpath results, to speed up canonical_path
 
129
        self._relpaths = {}
 
130
        # The trans_id that will be used as the tree root
104
131
        self._new_root = self.trans_id_tree_file_id(tree.get_root_id())
105
 
        self.__done = False
 
132
        # Indictor of whether the transform has been applied
 
133
        self._done = False
 
134
        # A progress bar
106
135
        self._pb = pb
 
136
        # Whether the target is case sensitive
 
137
        self._case_sensitive_target = case_sensitive
 
138
        # A counter of how many files have been renamed
 
139
        self.rename_count = 0
107
140
 
108
141
    def __get_root(self):
109
142
        return self._new_root
111
144
    root = property(__get_root)
112
145
 
113
146
    def finalize(self):
114
 
        """Release the working tree lock, if held, clean up limbo dir."""
 
147
        """Release the working tree lock, if held, clean up limbo dir.
 
148
 
 
149
        This is required if apply has not been invoked, but can be invoked
 
150
        even after apply.
 
151
        """
115
152
        if self._tree is None:
116
153
            return
117
154
        try:
118
 
            for trans_id, kind in self._new_contents.iteritems():
119
 
                path = self._limbo_name(trans_id)
 
155
            entries = [(self._limbo_name(t), t, k) for t, k in
 
156
                       self._new_contents.iteritems()]
 
157
            entries.sort(reverse=True)
 
158
            for path, trans_id, kind in entries:
120
159
                if kind == "directory":
121
160
                    os.rmdir(path)
122
161
                else:
126
165
            except OSError:
127
166
                # We don't especially care *why* the dir is immortal.
128
167
                raise ImmortalLimbo(self._limbodir)
 
168
            try:
 
169
                if self._deletiondir is not None:
 
170
                    os.rmdir(self._deletiondir)
 
171
            except OSError:
 
172
                raise errors.ImmortalPendingDeletion(self._deletiondir)
129
173
        finally:
130
174
            self._tree.unlock()
131
175
            self._tree = None
147
191
        """Change the path that is assigned to a transaction id."""
148
192
        if trans_id == self._new_root:
149
193
            raise CantMoveRoot
 
194
        previous_parent = self._new_parent.get(trans_id)
 
195
        previous_name = self._new_name.get(trans_id)
150
196
        self._new_name[trans_id] = name
151
197
        self._new_parent[trans_id] = parent
 
198
        if (trans_id in self._limbo_files and
 
199
            trans_id not in self._needs_rename):
 
200
            self._rename_in_limbo([trans_id])
 
201
            self._limbo_children[previous_parent].remove(trans_id)
 
202
            del self._limbo_children_names[previous_parent][previous_name]
 
203
 
 
204
    def _rename_in_limbo(self, trans_ids):
 
205
        """Fix limbo names so that the right final path is produced.
 
206
 
 
207
        This means we outsmarted ourselves-- we tried to avoid renaming
 
208
        these files later by creating them with their final names in their
 
209
        final parents.  But now the previous name or parent is no longer
 
210
        suitable, so we have to rename them.
 
211
 
 
212
        Even for trans_ids that have no new contents, we must remove their
 
213
        entries from _limbo_files, because they are now stale.
 
214
        """
 
215
        for trans_id in trans_ids:
 
216
            old_path = self._limbo_files.pop(trans_id)
 
217
            if trans_id not in self._new_contents:
 
218
                continue
 
219
            new_path = self._limbo_name(trans_id)
 
220
            os.rename(old_path, new_path)
152
221
 
153
222
    def adjust_root_path(self, name, parent):
154
223
        """Emulate moving the root by moving all children, instead.
188
257
        This reflects only files that already exist, not ones that will be
189
258
        added by transactions.
190
259
        """
191
 
        path = self._tree.inventory.id2path(inventory_id)
 
260
        path = self._tree.id2path(inventory_id)
192
261
        return self.trans_id_tree_path(path)
193
262
 
194
263
    def trans_id_file_id(self, file_id):
211
280
    def canonical_path(self, path):
212
281
        """Get the canonical tree-relative path"""
213
282
        # don't follow final symlinks
214
 
        dirname, basename = os.path.split(self._tree.abspath(path))
215
 
        dirname = os.path.realpath(dirname)
216
 
        return self._tree.relpath(pathjoin(dirname, basename))
 
283
        abs = self._tree.abspath(path)
 
284
        if abs in self._relpaths:
 
285
            return self._relpaths[abs]
 
286
        dirname, basename = os.path.split(abs)
 
287
        if dirname not in self._realpaths:
 
288
            self._realpaths[dirname] = os.path.realpath(dirname)
 
289
        dirname = self._realpaths[dirname]
 
290
        abs = pathjoin(dirname, basename)
 
291
        if dirname in self._relpaths:
 
292
            relpath = pathjoin(self._relpaths[dirname], basename)
 
293
            relpath = relpath.rstrip('/\\')
 
294
        else:
 
295
            relpath = self._tree.relpath(abs)
 
296
        self._relpaths[abs] = relpath
 
297
        return relpath
217
298
 
218
299
    def trans_id_tree_path(self, path):
219
300
        """Determine (and maybe set) the transaction ID for a tree path."""
241
322
        New file takes the permissions of any existing file with that id,
242
323
        unless mode_id is specified.
243
324
        """
244
 
        f = file(self._limbo_name(trans_id), 'wb')
245
 
        unique_add(self._new_contents, trans_id, 'file')
246
 
        for segment in contents:
247
 
            f.write(segment)
248
 
        f.close()
 
325
        name = self._limbo_name(trans_id)
 
326
        f = open(name, 'wb')
 
327
        try:
 
328
            try:
 
329
                unique_add(self._new_contents, trans_id, 'file')
 
330
            except:
 
331
                # Clean up the file, it never got registered so
 
332
                # TreeTransform.finalize() won't clean it up.
 
333
                f.close()
 
334
                os.unlink(name)
 
335
                raise
 
336
 
 
337
            f.writelines(contents)
 
338
        finally:
 
339
            f.close()
249
340
        self._set_mode(trans_id, mode_id, S_ISREG)
250
341
 
251
342
    def _set_mode(self, trans_id, mode_id, typefunc):
261
352
        except KeyError:
262
353
            return
263
354
        try:
264
 
            mode = os.stat(old_path).st_mode
 
355
            mode = os.stat(self._tree.abspath(old_path)).st_mode
265
356
        except OSError, e:
266
357
            if e.errno == errno.ENOENT:
267
358
                return
270
361
        if typefunc(mode):
271
362
            os.chmod(self._limbo_name(trans_id), mode)
272
363
 
 
364
    def create_hardlink(self, path, trans_id):
 
365
        """Schedule creation of a hard link"""
 
366
        name = self._limbo_name(trans_id)
 
367
        try:
 
368
            os.link(path, name)
 
369
        except OSError, e:
 
370
            if e.errno != errno.EPERM:
 
371
                raise
 
372
            raise errors.HardLinkNotSupported(path)
 
373
        try:
 
374
            unique_add(self._new_contents, trans_id, 'file')
 
375
        except:
 
376
            # Clean up the file, it never got registered so
 
377
            # TreeTransform.finalize() won't clean it up.
 
378
            os.unlink(name)
 
379
            raise
 
380
 
273
381
    def create_directory(self, trans_id):
274
382
        """Schedule creation of a new directory.
275
383
        
284
392
        target is a bytestring.
285
393
        See also new_symlink.
286
394
        """
287
 
        os.symlink(target, self._limbo_name(trans_id))
288
 
        unique_add(self._new_contents, trans_id, 'symlink')
 
395
        if has_symlinks():
 
396
            os.symlink(target, self._limbo_name(trans_id))
 
397
            unique_add(self._new_contents, trans_id, 'symlink')
 
398
        else:
 
399
            try:
 
400
                path = FinalPaths(self).get_path(trans_id)
 
401
            except KeyError:
 
402
                path = None
 
403
            raise UnableCreateSymlink(path=path)
289
404
 
290
405
    def cancel_creation(self, trans_id):
291
406
        """Cancel the creation of new file contents."""
292
407
        del self._new_contents[trans_id]
 
408
        children = self._limbo_children.get(trans_id)
 
409
        # if this is a limbo directory with children, move them before removing
 
410
        # the directory
 
411
        if children is not None:
 
412
            self._rename_in_limbo(children)
 
413
            del self._limbo_children[trans_id]
 
414
            del self._limbo_children_names[trans_id]
293
415
        delete_any(self._limbo_name(trans_id))
294
416
 
295
417
    def delete_contents(self, trans_id):
319
441
        else:
320
442
            unique_add(self._new_executability, trans_id, executability)
321
443
 
 
444
    def set_tree_reference(self, revision_id, trans_id):
 
445
        """Set the reference associated with a directory"""
 
446
        unique_add(self._new_reference_revision, trans_id, revision_id)
 
447
 
322
448
    def version_file(self, file_id, trans_id):
323
449
        """Schedule a file to become versioned."""
324
 
        assert file_id is not None
 
450
        if file_id is None:
 
451
            raise ValueError()
325
452
        unique_add(self._new_id, trans_id, file_id)
326
453
        unique_add(self._r_new_id, file_id, trans_id)
327
454
 
331
458
        del self._new_id[trans_id]
332
459
        del self._r_new_id[file_id]
333
460
 
334
 
    def new_paths(self):
335
 
        """Determine the paths of all new and changed files"""
 
461
    def new_paths(self, filesystem_only=False):
 
462
        """Determine the paths of all new and changed files.
 
463
 
 
464
        :param filesystem_only: if True, only calculate values for files
 
465
            that require renames or execute bit changes.
 
466
        """
336
467
        new_ids = set()
337
 
        fp = FinalPaths(self)
338
 
        for id_set in (self._new_name, self._new_parent, self._new_contents,
339
 
                       self._new_id, self._new_executability):
 
468
        if filesystem_only:
 
469
            id_sets = (self._needs_rename, self._new_executability)
 
470
        else:
 
471
            id_sets = (self._new_name, self._new_parent, self._new_contents,
 
472
                       self._new_id, self._new_executability)
 
473
        for id_set in id_sets:
340
474
            new_ids.update(id_set)
341
 
        new_paths = [(fp.get_path(t), t) for t in new_ids]
342
 
        new_paths.sort()
343
 
        return new_paths
 
475
        return sorted(FinalPaths(self).get_paths(new_ids))
344
476
 
345
477
    def tree_kind(self, trans_id):
346
478
        """Determine the file kind in the working tree.
381
513
            return None
382
514
        # the file is old; the old id is still valid
383
515
        if self._new_root == trans_id:
384
 
            return self._tree.inventory.root.file_id
 
516
            return self._tree.get_root_id()
385
517
        return self._tree.inventory.path2id(path)
386
518
 
387
519
    def final_file_id(self, trans_id):
391
523
        applied.
392
524
        """
393
525
        try:
394
 
            # there is a new id for this file
395
 
            assert self._new_id[trans_id] is not None
396
526
            return self._new_id[trans_id]
397
527
        except KeyError:
398
528
            if trans_id in self._removed_id:
426
556
        try:
427
557
            return self._new_name[trans_id]
428
558
        except KeyError:
429
 
            return os.path.basename(self._tree_id_paths[trans_id])
 
559
            try:
 
560
                return os.path.basename(self._tree_id_paths[trans_id])
 
561
            except KeyError:
 
562
                raise NoFinalPath(trans_id, self)
430
563
 
431
564
    def by_parent(self):
432
565
        """Return a map of parent: children for known parents.
445
578
 
446
579
    def path_changed(self, trans_id):
447
580
        """Return True if a trans_id's path has changed."""
448
 
        return trans_id in self._new_name or trans_id in self._new_parent
 
581
        return (trans_id in self._new_name) or (trans_id in self._new_parent)
 
582
 
 
583
    def new_contents(self, trans_id):
 
584
        return (trans_id in self._new_contents)
449
585
 
450
586
    def find_conflicts(self):
451
587
        """Find any violations of inventory or filesystem invariants"""
452
 
        if self.__done is True:
 
588
        if self._done is True:
453
589
            raise ReusingTransform()
454
590
        conflicts = []
455
591
        # ensure all children of all existent parents are known
477
613
                        self.tree_kind(t) == 'directory'])
478
614
        for trans_id in self._removed_id:
479
615
            file_id = self.tree_file_id(trans_id)
480
 
            if self._tree.inventory[file_id].kind in ('directory', 
481
 
                                                      'root_directory'):
 
616
            if file_id is not None:
 
617
                if self._tree.inventory[file_id].kind == 'directory':
 
618
                    parents.append(trans_id)
 
619
            elif self.tree_kind(trans_id) == 'directory':
482
620
                parents.append(trans_id)
483
621
 
484
622
        for parent_id in parents:
494
632
        try:
495
633
            children = os.listdir(self._tree.abspath(path))
496
634
        except OSError, e:
497
 
            if e.errno != errno.ENOENT and e.errno != errno.ESRCH:
 
635
            if e.errno not in (errno.ENOENT, errno.ESRCH, errno.ENOTDIR):
498
636
                raise
499
637
            return
500
638
            
521
659
        if child_id is None:
522
660
            return lexists(self._tree.abspath(childpath))
523
661
        else:
524
 
            if tt.final_parent(child_id) != parent_id:
 
662
            if self.final_parent(child_id) != parent_id:
525
663
                return False
526
 
            if child_id in tt._removed_contents:
 
664
            if child_id in self._removed_contents:
527
665
                # XXX What about dangling file-ids?
528
666
                return False
529
667
            else:
537
675
            parent_id = trans_id
538
676
            while parent_id is not ROOT_PARENT:
539
677
                seen.add(parent_id)
540
 
                parent_id = self.final_parent(parent_id)
 
678
                try:
 
679
                    parent_id = self.final_parent(parent_id)
 
680
                except KeyError:
 
681
                    break
541
682
                if parent_id == trans_id:
542
683
                    conflicts.append(('parent loop', trans_id))
543
684
                if parent_id in seen:
611
752
    def _duplicate_entries(self, by_parent):
612
753
        """No directory may have two entries with the same name."""
613
754
        conflicts = []
 
755
        if (self._new_name, self._new_parent) == ({}, {}):
 
756
            return conflicts
614
757
        for children in by_parent.itervalues():
615
758
            name_ids = [(self.final_name(t), t) for t in children]
 
759
            if not self._case_sensitive_target:
 
760
                name_ids = [(n.lower(), t) for n, t in name_ids]
616
761
            name_ids.sort()
617
762
            last_name = None
618
763
            last_trans_id = None
619
764
            for name, trans_id in name_ids:
 
765
                try:
 
766
                    kind = self.final_kind(trans_id)
 
767
                except NoSuchFile:
 
768
                    kind = None
 
769
                file_id = self.final_file_id(trans_id)
 
770
                if kind is None and file_id is None:
 
771
                    continue
620
772
                if name == last_name:
621
773
                    conflicts.append(('duplicate', last_trans_id, trans_id,
622
774
                    name))
623
 
                try:
624
 
                    kind = self.final_kind(trans_id)
625
 
                except NoSuchFile:
626
 
                    kind = None
627
 
                file_id = self.final_file_id(trans_id)
628
 
                if kind is not None or file_id is not None:
629
 
                    last_name = name
630
 
                    last_trans_id = trans_id
 
775
                last_name = name
 
776
                last_trans_id = trans_id
631
777
        return conflicts
632
778
 
633
779
    def _duplicate_ids(self):
635
781
        conflicts = []
636
782
        removed_tree_ids = set((self.tree_file_id(trans_id) for trans_id in
637
783
                                self._removed_id))
638
 
        active_tree_ids = set((f for f in self._tree.inventory if
639
 
                               f not in removed_tree_ids))
 
784
        all_ids = self._tree.all_file_ids()
 
785
        active_tree_ids = all_ids.difference(removed_tree_ids)
640
786
        for trans_id, file_id in self._new_id.iteritems():
641
787
            if file_id in active_tree_ids:
642
788
                old_trans_id = self.trans_id_tree_file_id(file_id)
675
821
                continue
676
822
            return True
677
823
        return False
678
 
            
679
 
    def apply(self):
680
 
        """Apply all changes to the inventory and filesystem.
681
 
        
682
 
        If filesystem or inventory conflicts are present, MalformedTransform
683
 
        will be thrown.
684
 
        """
685
 
        conflicts = self.find_conflicts()
686
 
        if len(conflicts) != 0:
687
 
            raise MalformedTransform(conflicts=conflicts)
688
 
        limbo_inv = {}
689
 
        inv = self._tree.inventory
690
 
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
691
 
        try:
692
 
            child_pb.update('Apply phase', 0, 2)
693
 
            self._apply_removals(inv, limbo_inv)
694
 
            child_pb.update('Apply phase', 1, 2)
695
 
            modified_paths = self._apply_insertions(inv, limbo_inv)
696
 
        finally:
697
 
            child_pb.finished()
698
 
        self._tree._write_inventory(inv)
699
 
        self.__done = True
700
 
        self.finalize()
701
 
        return _TransformResults(modified_paths)
702
824
 
703
825
    def _limbo_name(self, trans_id):
704
826
        """Generate the limbo name of a file"""
705
 
        return pathjoin(self._limbodir, trans_id)
706
 
 
707
 
    def _apply_removals(self, inv, limbo_inv):
708
 
        """Perform tree operations that remove directory/inventory names.
709
 
        
710
 
        That is, delete files that are to be deleted, and put any files that
711
 
        need renaming into limbo.  This must be done in strict child-to-parent
712
 
        order.
713
 
        """
714
 
        tree_paths = list(self._tree_path_ids.iteritems())
715
 
        tree_paths.sort(reverse=True)
716
 
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
717
 
        try:
718
 
            for num, data in enumerate(tree_paths):
719
 
                path, trans_id = data
720
 
                child_pb.update('removing file', num, len(tree_paths))
721
 
                full_path = self._tree.abspath(path)
722
 
                if trans_id in self._removed_contents:
723
 
                    delete_any(full_path)
724
 
                elif trans_id in self._new_name or trans_id in \
725
 
                    self._new_parent:
726
 
                    try:
727
 
                        os.rename(full_path, self._limbo_name(trans_id))
728
 
                    except OSError, e:
729
 
                        if e.errno != errno.ENOENT:
730
 
                            raise
731
 
                if trans_id in self._removed_id:
732
 
                    if trans_id == self._new_root:
733
 
                        file_id = self._tree.inventory.root.file_id
 
827
        limbo_name = self._limbo_files.get(trans_id)
 
828
        if limbo_name is not None:
 
829
            return limbo_name
 
830
        parent = self._new_parent.get(trans_id)
 
831
        # if the parent directory is already in limbo (e.g. when building a
 
832
        # tree), choose a limbo name inside the parent, to reduce further
 
833
        # renames.
 
834
        use_direct_path = False
 
835
        if self._new_contents.get(parent) == 'directory':
 
836
            filename = self._new_name.get(trans_id)
 
837
            if filename is not None:
 
838
                if parent not in self._limbo_children:
 
839
                    self._limbo_children[parent] = set()
 
840
                    self._limbo_children_names[parent] = {}
 
841
                    use_direct_path = True
 
842
                # the direct path can only be used if no other file has
 
843
                # already taken this pathname, i.e. if the name is unused, or
 
844
                # if it is already associated with this trans_id.
 
845
                elif self._case_sensitive_target:
 
846
                    if (self._limbo_children_names[parent].get(filename)
 
847
                        in (trans_id, None)):
 
848
                        use_direct_path = True
 
849
                else:
 
850
                    for l_filename, l_trans_id in\
 
851
                        self._limbo_children_names[parent].iteritems():
 
852
                        if l_trans_id == trans_id:
 
853
                            continue
 
854
                        if l_filename.lower() == filename.lower():
 
855
                            break
734
856
                    else:
735
 
                        file_id = self.tree_file_id(trans_id)
736
 
                    del inv[file_id]
737
 
                elif trans_id in self._new_name or trans_id in self._new_parent:
738
 
                    file_id = self.tree_file_id(trans_id)
739
 
                    if file_id is not None:
740
 
                        limbo_inv[trans_id] = inv[file_id]
741
 
                        del inv[file_id]
742
 
        finally:
743
 
            child_pb.finished()
744
 
 
745
 
    def _apply_insertions(self, inv, limbo_inv):
746
 
        """Perform tree operations that insert directory/inventory names.
747
 
        
748
 
        That is, create any files that need to be created, and restore from
749
 
        limbo any files that needed renaming.  This must be done in strict
750
 
        parent-to-child order.
751
 
        """
752
 
        new_paths = self.new_paths()
753
 
        modified_paths = []
754
 
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
755
 
        try:
756
 
            for num, (path, trans_id) in enumerate(new_paths):
757
 
                child_pb.update('adding file', num, len(new_paths))
758
 
                try:
759
 
                    kind = self._new_contents[trans_id]
760
 
                except KeyError:
761
 
                    kind = contents = None
762
 
                if trans_id in self._new_contents or \
763
 
                    self.path_changed(trans_id):
764
 
                    full_path = self._tree.abspath(path)
765
 
                    try:
766
 
                        os.rename(self._limbo_name(trans_id), full_path)
767
 
                    except OSError, e:
768
 
                        # We may be renaming a dangling inventory id
769
 
                        if e.errno != errno.ENOENT:
770
 
                            raise
771
 
                    if trans_id in self._new_contents:
772
 
                        modified_paths.append(full_path)
773
 
                        del self._new_contents[trans_id]
774
 
 
775
 
                if trans_id in self._new_id:
776
 
                    if kind is None:
777
 
                        kind = file_kind(self._tree.abspath(path))
778
 
                    inv.add_path(path, kind, self._new_id[trans_id])
779
 
                elif trans_id in self._new_name or trans_id in\
780
 
                    self._new_parent:
781
 
                    entry = limbo_inv.get(trans_id)
782
 
                    if entry is not None:
783
 
                        entry.name = self.final_name(trans_id)
784
 
                        parent_path = os.path.dirname(path)
785
 
                        entry.parent_id = \
786
 
                            self._tree.inventory.path2id(parent_path)
787
 
                        inv.add(entry)
788
 
 
789
 
                # requires files and inventory entries to be in place
790
 
                if trans_id in self._new_executability:
791
 
                    self._set_executability(path, inv, trans_id)
792
 
        finally:
793
 
            child_pb.finished()
794
 
        return modified_paths
795
 
 
796
 
    def _set_executability(self, path, inv, trans_id):
 
857
                        use_direct_path = True
 
858
 
 
859
        if use_direct_path:
 
860
            limbo_name = pathjoin(self._limbo_files[parent], filename)
 
861
            self._limbo_children[parent].add(trans_id)
 
862
            self._limbo_children_names[parent][filename] = trans_id
 
863
        else:
 
864
            limbo_name = pathjoin(self._limbodir, trans_id)
 
865
            self._needs_rename.add(trans_id)
 
866
        self._limbo_files[trans_id] = limbo_name
 
867
        return limbo_name
 
868
 
 
869
    def _set_executability(self, path, entry, trans_id):
797
870
        """Set the executability of versioned files """
798
 
        file_id = inv.path2id(path)
799
871
        new_executability = self._new_executability[trans_id]
800
 
        inv[file_id].executable = new_executability
 
872
        if entry is not None:
 
873
            entry.executable = new_executability
801
874
        if supports_executable():
802
875
            abspath = self._tree.abspath(path)
803
876
            current_mode = os.stat(abspath).st_mode
829
902
        parent_id is the transaction id of the parent directory of the file.
830
903
        contents is an iterator of bytestrings, which will be used to produce
831
904
        the file.
832
 
        file_id is the inventory ID of the file, if it is to be versioned.
 
905
        :param file_id: The inventory ID of the file, if it is to be versioned.
 
906
        :param executable: Only valid when a file_id has been supplied.
833
907
        """
834
908
        trans_id = self._new_entry(name, parent_id, file_id)
 
909
        # TODO: rather than scheduling a set_executable call,
 
910
        # have create_file create the file with the right mode.
835
911
        self.create_file(contents, trans_id)
836
912
        if executable is not None:
837
913
            self.set_executability(executable, trans_id)
861
937
        self.create_symlink(target, trans_id)
862
938
        return trans_id
863
939
 
 
940
    def _affected_ids(self):
 
941
        """Return the set of transform ids affected by the transform"""
 
942
        trans_ids = set(self._removed_id)
 
943
        trans_ids.update(self._new_id.keys())
 
944
        trans_ids.update(self._removed_contents)
 
945
        trans_ids.update(self._new_contents.keys())
 
946
        trans_ids.update(self._new_executability.keys())
 
947
        trans_ids.update(self._new_name.keys())
 
948
        trans_ids.update(self._new_parent.keys())
 
949
        return trans_ids
 
950
 
 
951
    def _get_file_id_maps(self):
 
952
        """Return mapping of file_ids to trans_ids in the to and from states"""
 
953
        trans_ids = self._affected_ids()
 
954
        from_trans_ids = {}
 
955
        to_trans_ids = {}
 
956
        # Build up two dicts: trans_ids associated with file ids in the
 
957
        # FROM state, vs the TO state.
 
958
        for trans_id in trans_ids:
 
959
            from_file_id = self.tree_file_id(trans_id)
 
960
            if from_file_id is not None:
 
961
                from_trans_ids[from_file_id] = trans_id
 
962
            to_file_id = self.final_file_id(trans_id)
 
963
            if to_file_id is not None:
 
964
                to_trans_ids[to_file_id] = trans_id
 
965
        return from_trans_ids, to_trans_ids
 
966
 
 
967
    def _from_file_data(self, from_trans_id, from_versioned, file_id):
 
968
        """Get data about a file in the from (tree) state
 
969
 
 
970
        Return a (name, parent, kind, executable) tuple
 
971
        """
 
972
        from_path = self._tree_id_paths.get(from_trans_id)
 
973
        if from_versioned:
 
974
            # get data from working tree if versioned
 
975
            from_entry = self._tree.inventory[file_id]
 
976
            from_name = from_entry.name
 
977
            from_parent = from_entry.parent_id
 
978
        else:
 
979
            from_entry = None
 
980
            if from_path is None:
 
981
                # File does not exist in FROM state
 
982
                from_name = None
 
983
                from_parent = None
 
984
            else:
 
985
                # File exists, but is not versioned.  Have to use path-
 
986
                # splitting stuff
 
987
                from_name = os.path.basename(from_path)
 
988
                tree_parent = self.get_tree_parent(from_trans_id)
 
989
                from_parent = self.tree_file_id(tree_parent)
 
990
        if from_path is not None:
 
991
            from_kind, from_executable, from_stats = \
 
992
                self._tree._comparison_data(from_entry, from_path)
 
993
        else:
 
994
            from_kind = None
 
995
            from_executable = False
 
996
        return from_name, from_parent, from_kind, from_executable
 
997
 
 
998
    def _to_file_data(self, to_trans_id, from_trans_id, from_executable):
 
999
        """Get data about a file in the to (target) state
 
1000
 
 
1001
        Return a (name, parent, kind, executable) tuple
 
1002
        """
 
1003
        to_name = self.final_name(to_trans_id)
 
1004
        try:
 
1005
            to_kind = self.final_kind(to_trans_id)
 
1006
        except NoSuchFile:
 
1007
            to_kind = None
 
1008
        to_parent = self.final_file_id(self.final_parent(to_trans_id))
 
1009
        if to_trans_id in self._new_executability:
 
1010
            to_executable = self._new_executability[to_trans_id]
 
1011
        elif to_trans_id == from_trans_id:
 
1012
            to_executable = from_executable
 
1013
        else:
 
1014
            to_executable = False
 
1015
        return to_name, to_parent, to_kind, to_executable
 
1016
 
 
1017
    def iter_changes(self):
 
1018
        """Produce output in the same format as Tree.iter_changes.
 
1019
 
 
1020
        Will produce nonsensical results if invoked while inventory/filesystem
 
1021
        conflicts (as reported by TreeTransform.find_conflicts()) are present.
 
1022
 
 
1023
        This reads the Transform, but only reproduces changes involving a
 
1024
        file_id.  Files that are not versioned in either of the FROM or TO
 
1025
        states are not reflected.
 
1026
        """
 
1027
        final_paths = FinalPaths(self)
 
1028
        from_trans_ids, to_trans_ids = self._get_file_id_maps()
 
1029
        results = []
 
1030
        # Now iterate through all active file_ids
 
1031
        for file_id in set(from_trans_ids.keys() + to_trans_ids.keys()):
 
1032
            modified = False
 
1033
            from_trans_id = from_trans_ids.get(file_id)
 
1034
            # find file ids, and determine versioning state
 
1035
            if from_trans_id is None:
 
1036
                from_versioned = False
 
1037
                from_trans_id = to_trans_ids[file_id]
 
1038
            else:
 
1039
                from_versioned = True
 
1040
            to_trans_id = to_trans_ids.get(file_id)
 
1041
            if to_trans_id is None:
 
1042
                to_versioned = False
 
1043
                to_trans_id = from_trans_id
 
1044
            else:
 
1045
                to_versioned = True
 
1046
 
 
1047
            from_name, from_parent, from_kind, from_executable = \
 
1048
                self._from_file_data(from_trans_id, from_versioned, file_id)
 
1049
 
 
1050
            to_name, to_parent, to_kind, to_executable = \
 
1051
                self._to_file_data(to_trans_id, from_trans_id, from_executable)
 
1052
 
 
1053
            if not from_versioned:
 
1054
                from_path = None
 
1055
            else:
 
1056
                from_path = self._tree_id_paths.get(from_trans_id)
 
1057
            if not to_versioned:
 
1058
                to_path = None
 
1059
            else:
 
1060
                to_path = final_paths.get_path(to_trans_id)
 
1061
            if from_kind != to_kind:
 
1062
                modified = True
 
1063
            elif to_kind in ('file', 'symlink') and (
 
1064
                to_trans_id != from_trans_id or
 
1065
                to_trans_id in self._new_contents):
 
1066
                modified = True
 
1067
            if (not modified and from_versioned == to_versioned and
 
1068
                from_parent==to_parent and from_name == to_name and
 
1069
                from_executable == to_executable):
 
1070
                continue
 
1071
            results.append((file_id, (from_path, to_path), modified,
 
1072
                   (from_versioned, to_versioned),
 
1073
                   (from_parent, to_parent),
 
1074
                   (from_name, to_name),
 
1075
                   (from_kind, to_kind),
 
1076
                   (from_executable, to_executable)))
 
1077
        return iter(sorted(results, key=lambda x:x[1]))
 
1078
 
 
1079
    def get_preview_tree(self):
 
1080
        """Return a tree representing the result of the transform.
 
1081
 
 
1082
        This tree only supports the subset of Tree functionality required
 
1083
        by show_diff_trees.  It must only be compared to tt._tree.
 
1084
        """
 
1085
        return _PreviewTree(self)
 
1086
 
 
1087
 
 
1088
class TreeTransform(TreeTransformBase):
 
1089
    """Represent a tree transformation.
 
1090
 
 
1091
    This object is designed to support incremental generation of the transform,
 
1092
    in any order.
 
1093
 
 
1094
    However, it gives optimum performance when parent directories are created
 
1095
    before their contents.  The transform is then able to put child files
 
1096
    directly in their parent directory, avoiding later renames.
 
1097
 
 
1098
    It is easy to produce malformed transforms, but they are generally
 
1099
    harmless.  Attempting to apply a malformed transform will cause an
 
1100
    exception to be raised before any modifications are made to the tree.
 
1101
 
 
1102
    Many kinds of malformed transforms can be corrected with the
 
1103
    resolve_conflicts function.  The remaining ones indicate programming error,
 
1104
    such as trying to create a file with no path.
 
1105
 
 
1106
    Two sets of file creation methods are supplied.  Convenience methods are:
 
1107
     * new_file
 
1108
     * new_directory
 
1109
     * new_symlink
 
1110
 
 
1111
    These are composed of the low-level methods:
 
1112
     * create_path
 
1113
     * create_file or create_directory or create_symlink
 
1114
     * version_file
 
1115
     * set_executability
 
1116
 
 
1117
    Transform/Transaction ids
 
1118
    -------------------------
 
1119
    trans_ids are temporary ids assigned to all files involved in a transform.
 
1120
    It's possible, even common, that not all files in the Tree have trans_ids.
 
1121
 
 
1122
    trans_ids are used because filenames and file_ids are not good enough
 
1123
    identifiers; filenames change, and not all files have file_ids.  File-ids
 
1124
    are also associated with trans-ids, so that moving a file moves its
 
1125
    file-id.
 
1126
 
 
1127
    trans_ids are only valid for the TreeTransform that generated them.
 
1128
 
 
1129
    Limbo
 
1130
    -----
 
1131
    Limbo is a temporary directory use to hold new versions of files.
 
1132
    Files are added to limbo by create_file, create_directory, create_symlink,
 
1133
    and their convenience variants (new_*).  Files may be removed from limbo
 
1134
    using cancel_creation.  Files are renamed from limbo into their final
 
1135
    location as part of TreeTransform.apply
 
1136
 
 
1137
    Limbo must be cleaned up, by either calling TreeTransform.apply or
 
1138
    calling TreeTransform.finalize.
 
1139
 
 
1140
    Files are placed into limbo inside their parent directories, where
 
1141
    possible.  This reduces subsequent renames, and makes operations involving
 
1142
    lots of files faster.  This optimization is only possible if the parent
 
1143
    directory is created *before* creating any of its children, so avoid
 
1144
    creating children before parents, where possible.
 
1145
 
 
1146
    Pending-deletion
 
1147
    ----------------
 
1148
    This temporary directory is used by _FileMover for storing files that are
 
1149
    about to be deleted.  In case of rollback, the files will be restored.
 
1150
    FileMover does not delete files until it is sure that a rollback will not
 
1151
    happen.
 
1152
    """
 
1153
    def __init__(self, tree, pb=DummyProgress()):
 
1154
        """Note: a tree_write lock is taken on the tree.
 
1155
 
 
1156
        Use TreeTransform.finalize() to release the lock (can be omitted if
 
1157
        TreeTransform.apply() called).
 
1158
        """
 
1159
        tree.lock_tree_write()
 
1160
 
 
1161
        try:
 
1162
            limbodir = urlutils.local_path_from_url(
 
1163
                tree._transport.abspath('limbo'))
 
1164
            try:
 
1165
                os.mkdir(limbodir)
 
1166
            except OSError, e:
 
1167
                if e.errno == errno.EEXIST:
 
1168
                    raise ExistingLimbo(limbodir)
 
1169
            deletiondir = urlutils.local_path_from_url(
 
1170
                tree._transport.abspath('pending-deletion'))
 
1171
            try:
 
1172
                os.mkdir(deletiondir)
 
1173
            except OSError, e:
 
1174
                if e.errno == errno.EEXIST:
 
1175
                    raise errors.ExistingPendingDeletion(deletiondir)
 
1176
        except:
 
1177
            tree.unlock()
 
1178
            raise
 
1179
 
 
1180
        TreeTransformBase.__init__(self, tree, limbodir, pb,
 
1181
                                   tree.case_sensitive)
 
1182
        self._deletiondir = deletiondir
 
1183
 
 
1184
    def apply(self, no_conflicts=False, precomputed_delta=None, _mover=None):
 
1185
        """Apply all changes to the inventory and filesystem.
 
1186
 
 
1187
        If filesystem or inventory conflicts are present, MalformedTransform
 
1188
        will be thrown.
 
1189
 
 
1190
        If apply succeeds, finalize is not necessary.
 
1191
 
 
1192
        :param no_conflicts: if True, the caller guarantees there are no
 
1193
            conflicts, so no check is made.
 
1194
        :param precomputed_delta: An inventory delta to use instead of
 
1195
            calculating one.
 
1196
        :param _mover: Supply an alternate FileMover, for testing
 
1197
        """
 
1198
        if not no_conflicts:
 
1199
            conflicts = self.find_conflicts()
 
1200
            if len(conflicts) != 0:
 
1201
                raise MalformedTransform(conflicts=conflicts)
 
1202
        if precomputed_delta is None:
 
1203
            new_inventory_delta = []
 
1204
            inventory_delta = new_inventory_delta
 
1205
        else:
 
1206
            new_inventory_delta = None
 
1207
            inventory_delta = precomputed_delta
 
1208
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
1209
        try:
 
1210
            if _mover is None:
 
1211
                mover = _FileMover()
 
1212
            else:
 
1213
                mover = _mover
 
1214
            try:
 
1215
                child_pb.update('Apply phase', 0, 2)
 
1216
                self._apply_removals(new_inventory_delta, mover)
 
1217
                child_pb.update('Apply phase', 1, 2)
 
1218
                modified_paths = self._apply_insertions(new_inventory_delta,
 
1219
                                                        mover)
 
1220
            except:
 
1221
                mover.rollback()
 
1222
                raise
 
1223
            else:
 
1224
                mover.apply_deletions()
 
1225
        finally:
 
1226
            child_pb.finished()
 
1227
        self._tree.apply_inventory_delta(inventory_delta)
 
1228
        self._done = True
 
1229
        self.finalize()
 
1230
        return _TransformResults(modified_paths, self.rename_count)
 
1231
 
 
1232
    def _apply_removals(self, inventory_delta, mover):
 
1233
        """Perform tree operations that remove directory/inventory names.
 
1234
 
 
1235
        That is, delete files that are to be deleted, and put any files that
 
1236
        need renaming into limbo.  This must be done in strict child-to-parent
 
1237
        order.
 
1238
 
 
1239
        If inventory_delta is None, no inventory delta generation is performed.
 
1240
        """
 
1241
        tree_paths = list(self._tree_path_ids.iteritems())
 
1242
        tree_paths.sort(reverse=True)
 
1243
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
1244
        try:
 
1245
            for num, data in enumerate(tree_paths):
 
1246
                path, trans_id = data
 
1247
                child_pb.update('removing file', num, len(tree_paths))
 
1248
                full_path = self._tree.abspath(path)
 
1249
                if trans_id in self._removed_contents:
 
1250
                    mover.pre_delete(full_path, os.path.join(self._deletiondir,
 
1251
                                     trans_id))
 
1252
                elif trans_id in self._new_name or trans_id in \
 
1253
                    self._new_parent:
 
1254
                    try:
 
1255
                        mover.rename(full_path, self._limbo_name(trans_id))
 
1256
                    except OSError, e:
 
1257
                        if e.errno != errno.ENOENT:
 
1258
                            raise
 
1259
                    else:
 
1260
                        self.rename_count += 1
 
1261
                if (trans_id in self._removed_id
 
1262
                    and inventory_delta is not None):
 
1263
                    if trans_id == self._new_root:
 
1264
                        file_id = self._tree.get_root_id()
 
1265
                    else:
 
1266
                        file_id = self.tree_file_id(trans_id)
 
1267
                    # File-id isn't really being deleted, just moved
 
1268
                    if file_id in self._r_new_id:
 
1269
                        continue
 
1270
                    inventory_delta.append((path, None, file_id, None))
 
1271
        finally:
 
1272
            child_pb.finished()
 
1273
 
 
1274
    def _apply_insertions(self, inventory_delta, mover):
 
1275
        """Perform tree operations that insert directory/inventory names.
 
1276
 
 
1277
        That is, create any files that need to be created, and restore from
 
1278
        limbo any files that needed renaming.  This must be done in strict
 
1279
        parent-to-child order.
 
1280
 
 
1281
        If inventory_delta is None, no inventory delta is calculated, and
 
1282
        no list of modified paths is returned.
 
1283
        """
 
1284
        new_paths = self.new_paths(filesystem_only=(inventory_delta is None))
 
1285
        modified_paths = []
 
1286
        completed_new = []
 
1287
        new_path_file_ids = dict((t, self.final_file_id(t)) for p, t in
 
1288
                                 new_paths)
 
1289
        if inventory_delta is not None:
 
1290
            entries = self._tree.iter_entries_by_dir(
 
1291
                new_path_file_ids.values())
 
1292
            old_paths = dict((e.file_id, p) for p, e in entries)
 
1293
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
1294
        try:
 
1295
            for num, (path, trans_id) in enumerate(new_paths):
 
1296
                new_entry = None
 
1297
                if (num % 10) == 0:
 
1298
                    child_pb.update('adding file', num, len(new_paths))
 
1299
                full_path = self._tree.abspath(path)
 
1300
                if trans_id in self._needs_rename:
 
1301
                    try:
 
1302
                        mover.rename(self._limbo_name(trans_id), full_path)
 
1303
                    except OSError, e:
 
1304
                        # We may be renaming a dangling inventory id
 
1305
                        if e.errno != errno.ENOENT:
 
1306
                            raise
 
1307
                    else:
 
1308
                        self.rename_count += 1
 
1309
                if inventory_delta is not None:
 
1310
                    if (trans_id in self._new_contents or
 
1311
                        self.path_changed(trans_id)):
 
1312
                        if trans_id in self._new_contents:
 
1313
                            modified_paths.append(full_path)
 
1314
                            completed_new.append(trans_id)
 
1315
                    file_id = new_path_file_ids[trans_id]
 
1316
                    if file_id is not None and (trans_id in self._new_id or
 
1317
                        trans_id in self._new_name or
 
1318
                        trans_id in self._new_parent
 
1319
                        or trans_id in self._new_executability):
 
1320
                        try:
 
1321
                            kind = self.final_kind(trans_id)
 
1322
                        except NoSuchFile:
 
1323
                            kind = self._tree.stored_kind(file_id)
 
1324
                        parent_trans_id = self.final_parent(trans_id)
 
1325
                        parent_file_id = new_path_file_ids.get(parent_trans_id)
 
1326
                        if parent_file_id is None:
 
1327
                            parent_file_id = self.final_file_id(
 
1328
                                parent_trans_id)
 
1329
                        if trans_id in self._new_reference_revision:
 
1330
                            new_entry = inventory.TreeReference(
 
1331
                                file_id,
 
1332
                                self._new_name[trans_id],
 
1333
                                self.final_file_id(self._new_parent[trans_id]),
 
1334
                                None, self._new_reference_revision[trans_id])
 
1335
                        else:
 
1336
                            new_entry = inventory.make_entry(kind,
 
1337
                                self.final_name(trans_id),
 
1338
                                parent_file_id, file_id)
 
1339
                        old_path = old_paths.get(new_entry.file_id)
 
1340
                        inventory_delta.append(
 
1341
                            (old_path, path, new_entry.file_id, new_entry))
 
1342
 
 
1343
                if trans_id in self._new_executability:
 
1344
                    self._set_executability(path, new_entry, trans_id)
 
1345
        finally:
 
1346
            child_pb.finished()
 
1347
        if inventory_delta is None:
 
1348
            self._new_contents.clear()
 
1349
        else:
 
1350
            for trans_id in completed_new:
 
1351
                del self._new_contents[trans_id]
 
1352
        return modified_paths
 
1353
 
 
1354
 
 
1355
class TransformPreview(TreeTransformBase):
 
1356
    """A TreeTransform for generating preview trees.
 
1357
 
 
1358
    Unlike TreeTransform, this version works when the input tree is a
 
1359
    RevisionTree, rather than a WorkingTree.  As a result, it tends to ignore
 
1360
    unversioned files in the input tree.
 
1361
    """
 
1362
 
 
1363
    def __init__(self, tree, pb=DummyProgress(), case_sensitive=True):
 
1364
        tree.lock_read()
 
1365
        limbodir = tempfile.mkdtemp(prefix='bzr-limbo-')
 
1366
        TreeTransformBase.__init__(self, tree, limbodir, pb, case_sensitive)
 
1367
 
 
1368
    def canonical_path(self, path):
 
1369
        return path
 
1370
 
 
1371
    def tree_kind(self, trans_id):
 
1372
        path = self._tree_id_paths.get(trans_id)
 
1373
        if path is None:
 
1374
            raise NoSuchFile(None)
 
1375
        file_id = self._tree.path2id(path)
 
1376
        return self._tree.kind(file_id)
 
1377
 
 
1378
    def _set_mode(self, trans_id, mode_id, typefunc):
 
1379
        """Set the mode of new file contents.
 
1380
        The mode_id is the existing file to get the mode from (often the same
 
1381
        as trans_id).  The operation is only performed if there's a mode match
 
1382
        according to typefunc.
 
1383
        """
 
1384
        # is it ok to ignore this?  probably
 
1385
        pass
 
1386
 
 
1387
    def iter_tree_children(self, parent_id):
 
1388
        """Iterate through the entry's tree children, if any"""
 
1389
        try:
 
1390
            path = self._tree_id_paths[parent_id]
 
1391
        except KeyError:
 
1392
            return
 
1393
        file_id = self.tree_file_id(parent_id)
 
1394
        if file_id is None:
 
1395
            return
 
1396
        children = getattr(self._tree.inventory[file_id], 'children', {})
 
1397
        for child in children:
 
1398
            childpath = joinpath(path, child)
 
1399
            yield self.trans_id_tree_path(childpath)
 
1400
 
 
1401
 
 
1402
class _PreviewTree(tree.Tree):
 
1403
    """Partial implementation of Tree to support show_diff_trees"""
 
1404
 
 
1405
    def __init__(self, transform):
 
1406
        self._transform = transform
 
1407
        self._final_paths = FinalPaths(transform)
 
1408
        self.__by_parent = None
 
1409
 
 
1410
    def _changes(self, file_id):
 
1411
        for changes in self._transform.iter_changes():
 
1412
            if changes[0] == file_id:
 
1413
                return changes
 
1414
 
 
1415
    def _content_change(self, file_id):
 
1416
        """Return True if the content of this file changed"""
 
1417
        changes = self._changes(file_id)
 
1418
        # changes[2] is true if the file content changed.  See
 
1419
        # InterTree.iter_changes.
 
1420
        return (changes is not None and changes[2])
 
1421
 
 
1422
    def _get_file_revision(self, file_id, vf, tree_revision):
 
1423
        return self._transform._tree._get_file_revision(file_id, vf,
 
1424
                                                        tree_revision)
 
1425
 
 
1426
    def _stat_limbo_file(self, file_id):
 
1427
        trans_id = self._transform.trans_id_file_id(file_id)
 
1428
        name = self._transform._limbo_name(trans_id)
 
1429
        return os.lstat(name)
 
1430
 
 
1431
    @property
 
1432
    def _by_parent(self):
 
1433
        if self.__by_parent is None:
 
1434
            self.__by_parent = self._transform.by_parent()
 
1435
        return self.__by_parent
 
1436
 
 
1437
    def lock_read(self):
 
1438
        # Perhaps in theory, this should lock the TreeTransform?
 
1439
        pass
 
1440
 
 
1441
    def unlock(self):
 
1442
        pass
 
1443
 
 
1444
    @property
 
1445
    def inventory(self):
 
1446
        """This Tree does not use inventory as its backing data."""
 
1447
        raise NotImplementedError(_PreviewTree.inventory)
 
1448
 
 
1449
    def get_root_id(self):
 
1450
        return self._transform.final_file_id(self._transform.root)
 
1451
 
 
1452
    def all_file_ids(self):
 
1453
        tree_ids = set(self._transform._tree.all_file_ids())
 
1454
        tree_ids.difference_update(self._transform.tree_file_id(t)
 
1455
                                   for t in self._transform._removed_id)
 
1456
        tree_ids.update(self._transform._new_id.values())
 
1457
        return tree_ids
 
1458
 
 
1459
    def __iter__(self):
 
1460
        return iter(self.all_file_ids())
 
1461
 
 
1462
    def paths2ids(self, specific_files, trees=None, require_versioned=False):
 
1463
        """See Tree.paths2ids"""
 
1464
        to_find = set(specific_files)
 
1465
        result = set()
 
1466
        for (file_id, paths, changed, versioned, parent, name, kind,
 
1467
             executable) in self._transform.iter_changes():
 
1468
            if paths[1] in to_find:
 
1469
                result.append(file_id)
 
1470
                to_find.remove(paths[1])
 
1471
        result.update(self._transform._tree.paths2ids(to_find,
 
1472
                      trees=[], require_versioned=require_versioned))
 
1473
        return result
 
1474
 
 
1475
    def _path2trans_id(self, path):
 
1476
        segments = splitpath(path)
 
1477
        cur_parent = self._transform.root
 
1478
        for cur_segment in segments:
 
1479
            for child in self._all_children(cur_parent):
 
1480
                if self._transform.final_name(child) == cur_segment:
 
1481
                    cur_parent = child
 
1482
                    break
 
1483
            else:
 
1484
                return None
 
1485
        return cur_parent
 
1486
 
 
1487
    def path2id(self, path):
 
1488
        return self._transform.final_file_id(self._path2trans_id(path))
 
1489
 
 
1490
    def id2path(self, file_id):
 
1491
        trans_id = self._transform.trans_id_file_id(file_id)
 
1492
        try:
 
1493
            return self._final_paths._determine_path(trans_id)
 
1494
        except NoFinalPath:
 
1495
            raise errors.NoSuchId(self, file_id)
 
1496
 
 
1497
    def _all_children(self, trans_id):
 
1498
        children = set(self._transform.iter_tree_children(trans_id))
 
1499
        # children in the _new_parent set are provided by _by_parent.
 
1500
        children.difference_update(self._transform._new_parent.keys())
 
1501
        children.update(self._by_parent.get(trans_id, []))
 
1502
        return children
 
1503
 
 
1504
    def _make_inv_entries(self, ordered_entries, specific_file_ids):
 
1505
        for trans_id, parent_file_id in ordered_entries:
 
1506
            file_id = self._transform.final_file_id(trans_id)
 
1507
            if file_id is None:
 
1508
                continue
 
1509
            if (specific_file_ids is not None
 
1510
                and file_id not in specific_file_ids):
 
1511
                continue
 
1512
            try:
 
1513
                kind = self._transform.final_kind(trans_id)
 
1514
            except NoSuchFile:
 
1515
                kind = self._transform._tree.stored_kind(file_id)
 
1516
            new_entry = inventory.make_entry(
 
1517
                kind,
 
1518
                self._transform.final_name(trans_id),
 
1519
                parent_file_id, file_id)
 
1520
            yield new_entry, trans_id
 
1521
 
 
1522
    def iter_entries_by_dir(self, specific_file_ids=None):
 
1523
        # This may not be a maximally efficient implementation, but it is
 
1524
        # reasonably straightforward.  An implementation that grafts the
 
1525
        # TreeTransform changes onto the tree's iter_entries_by_dir results
 
1526
        # might be more efficient, but requires tricky inferences about stack
 
1527
        # position.
 
1528
        todo = [ROOT_PARENT]
 
1529
        ordered_ids = []
 
1530
        while len(todo) > 0:
 
1531
            parent = todo.pop()
 
1532
            parent_file_id = self._transform.final_file_id(parent)
 
1533
            children = list(self._all_children(parent))
 
1534
            paths = dict(zip(children, self._final_paths.get_paths(children)))
 
1535
            children.sort(key=paths.get)
 
1536
            todo.extend(reversed(children))
 
1537
            for trans_id in children:
 
1538
                ordered_ids.append((trans_id, parent_file_id))
 
1539
        for entry, trans_id in self._make_inv_entries(ordered_ids,
 
1540
                                                      specific_file_ids):
 
1541
            yield unicode(self._final_paths.get_path(trans_id)), entry
 
1542
 
 
1543
    def kind(self, file_id):
 
1544
        trans_id = self._transform.trans_id_file_id(file_id)
 
1545
        return self._transform.final_kind(trans_id)
 
1546
 
 
1547
    def stored_kind(self, file_id):
 
1548
        trans_id = self._transform.trans_id_file_id(file_id)
 
1549
        try:
 
1550
            return self._transform._new_contents[trans_id]
 
1551
        except KeyError:
 
1552
            return self._transform._tree.stored_kind(file_id)
 
1553
 
 
1554
    def get_file_mtime(self, file_id, path=None):
 
1555
        """See Tree.get_file_mtime"""
 
1556
        if not self._content_change(file_id):
 
1557
            return self._transform._tree.get_file_mtime(file_id, path)
 
1558
        return self._stat_limbo_file(file_id).st_mtime
 
1559
 
 
1560
    def get_file_size(self, file_id):
 
1561
        """See Tree.get_file_size"""
 
1562
        if self.kind(file_id) == 'file':
 
1563
            return self._transform._tree.get_file_size(file_id)
 
1564
        else:
 
1565
            return None
 
1566
 
 
1567
    def get_file_sha1(self, file_id, path=None, stat_value=None):
 
1568
        return self._transform._tree.get_file_sha1(file_id)
 
1569
 
 
1570
    def is_executable(self, file_id, path=None):
 
1571
        trans_id = self._transform.trans_id_file_id(file_id)
 
1572
        try:
 
1573
            return self._transform._new_executability[trans_id]
 
1574
        except KeyError:
 
1575
            return self._transform._tree.is_executable(file_id, path)
 
1576
 
 
1577
    def path_content_summary(self, path):
 
1578
        trans_id = self._path2trans_id(path)
 
1579
        tt = self._transform
 
1580
        tree_path = tt._tree_id_paths.get(trans_id)
 
1581
        kind = tt._new_contents.get(trans_id)
 
1582
        if kind is None:
 
1583
            if tree_path is None or trans_id in tt._removed_contents:
 
1584
                return 'missing', None, None, None
 
1585
            summary = tt._tree.path_content_summary(tree_path)
 
1586
            kind, size, executable, link_or_sha1 = summary
 
1587
        else:
 
1588
            link_or_sha1 = None
 
1589
            limbo_name = tt._limbo_name(trans_id)
 
1590
            if trans_id in tt._new_reference_revision:
 
1591
                kind = 'tree-reference'
 
1592
            if kind == 'file':
 
1593
                statval = os.lstat(limbo_name)
 
1594
                size = statval.st_size
 
1595
                if not supports_executable():
 
1596
                    executable = None
 
1597
                else:
 
1598
                    executable = statval.st_mode & S_IEXEC
 
1599
            else:
 
1600
                size = None
 
1601
                executable = None
 
1602
            if kind == 'symlink':
 
1603
                link_or_sha1 = os.readlink(limbo_name)
 
1604
        if supports_executable():
 
1605
            executable = tt._new_executability.get(trans_id, executable)
 
1606
        return kind, size, executable, link_or_sha1
 
1607
 
 
1608
    def iter_changes(self, from_tree, include_unchanged=False,
 
1609
                      specific_files=None, pb=None, extra_trees=None,
 
1610
                      require_versioned=True, want_unversioned=False):
 
1611
        """See InterTree.iter_changes.
 
1612
 
 
1613
        This implementation does not support include_unchanged, specific_files,
 
1614
        or want_unversioned.  extra_trees, require_versioned, and pb are
 
1615
        ignored.
 
1616
        """
 
1617
        if from_tree is not self._transform._tree:
 
1618
            raise ValueError('from_tree must be transform source tree.')
 
1619
        if include_unchanged:
 
1620
            raise ValueError('include_unchanged is not supported')
 
1621
        if specific_files is not None:
 
1622
            raise ValueError('specific_files is not supported')
 
1623
        if want_unversioned:
 
1624
            raise ValueError('want_unversioned is not supported')
 
1625
        return self._transform.iter_changes()
 
1626
 
 
1627
    def get_file(self, file_id, path=None):
 
1628
        """See Tree.get_file"""
 
1629
        if not self._content_change(file_id):
 
1630
            return self._transform._tree.get_file(file_id, path)
 
1631
        trans_id = self._transform.trans_id_file_id(file_id)
 
1632
        name = self._transform._limbo_name(trans_id)
 
1633
        return open(name, 'rb')
 
1634
 
 
1635
    def get_file_text(self, file_id):
 
1636
        text_file = self.get_file(file_id)
 
1637
        try:
 
1638
            return text_file.read()
 
1639
        finally:
 
1640
            text_file.close()
 
1641
 
 
1642
    def annotate_iter(self, file_id,
 
1643
                      default_revision=_mod_revision.CURRENT_REVISION):
 
1644
        changes = self._changes(file_id)
 
1645
        if changes is None:
 
1646
            get_old = True
 
1647
        else:
 
1648
            changed_content, versioned, kind = (changes[2], changes[3],
 
1649
                                                changes[6])
 
1650
            if kind[1] is None:
 
1651
                return None
 
1652
            get_old = (kind[0] == 'file' and versioned[0])
 
1653
        if get_old:
 
1654
            old_annotation = self._transform._tree.annotate_iter(file_id,
 
1655
                default_revision=default_revision)
 
1656
        else:
 
1657
            old_annotation = []
 
1658
        if changes is None:
 
1659
            return old_annotation
 
1660
        if not changed_content:
 
1661
            return old_annotation
 
1662
        return annotate.reannotate([old_annotation],
 
1663
                                   self.get_file(file_id).readlines(),
 
1664
                                   default_revision)
 
1665
 
 
1666
    def get_symlink_target(self, file_id):
 
1667
        """See Tree.get_symlink_target"""
 
1668
        if not self._content_change(file_id):
 
1669
            return self._transform._tree.get_symlink_target(file_id)
 
1670
        trans_id = self._transform.trans_id_file_id(file_id)
 
1671
        name = self._transform._limbo_name(trans_id)
 
1672
        return os.readlink(name)
 
1673
 
 
1674
    def list_files(self, include_root=False):
 
1675
        return self._transform._tree.list_files(include_root)
 
1676
 
 
1677
    def walkdirs(self, prefix=""):
 
1678
        return self._transform._tree.walkdirs(prefix)
 
1679
 
 
1680
    def get_parent_ids(self):
 
1681
        return self._transform._tree.get_parent_ids()
 
1682
 
 
1683
    def get_revision_tree(self, revision_id):
 
1684
        return self._transform._tree.get_revision_tree(revision_id)
 
1685
 
 
1686
 
864
1687
def joinpath(parent, child):
865
1688
    """Join tree-relative paths, handling the tree root specially"""
866
1689
    if parent is None or parent == "":
896
1719
            self._known_paths[trans_id] = self._determine_path(trans_id)
897
1720
        return self._known_paths[trans_id]
898
1721
 
 
1722
    def get_paths(self, trans_ids):
 
1723
        return [(self.get_path(t), t) for t in trans_ids]
 
1724
 
 
1725
 
 
1726
 
899
1727
def topology_sorted_ids(tree):
900
1728
    """Determine the topological order of the ids in a tree"""
901
1729
    file_ids = list(tree)
902
1730
    file_ids.sort(key=tree.id2path)
903
1731
    return file_ids
904
1732
 
905
 
def build_tree(tree, wt):
906
 
    """Create working tree for a branch, using a Transaction."""
 
1733
 
 
1734
def build_tree(tree, wt, accelerator_tree=None, hardlink=False,
 
1735
               delta_from_tree=False):
 
1736
    """Create working tree for a branch, using a TreeTransform.
 
1737
    
 
1738
    This function should be used on empty trees, having a tree root at most.
 
1739
    (see merge and revert functionality for working with existing trees)
 
1740
 
 
1741
    Existing files are handled like so:
 
1742
    
 
1743
    - Existing bzrdirs take precedence over creating new items.  They are
 
1744
      created as '%s.diverted' % name.
 
1745
    - Otherwise, if the content on disk matches the content we are building,
 
1746
      it is silently replaced.
 
1747
    - Otherwise, conflict resolution will move the old file to 'oldname.moved'.
 
1748
 
 
1749
    :param tree: The tree to convert wt into a copy of
 
1750
    :param wt: The working tree that files will be placed into
 
1751
    :param accelerator_tree: A tree which can be used for retrieving file
 
1752
        contents more quickly than tree itself, i.e. a workingtree.  tree
 
1753
        will be used for cases where accelerator_tree's content is different.
 
1754
    :param hardlink: If true, hard-link files to accelerator_tree, where
 
1755
        possible.  accelerator_tree must implement abspath, i.e. be a
 
1756
        working tree.
 
1757
    :param delta_from_tree: If true, build_tree may use the input Tree to
 
1758
        generate the inventory delta.
 
1759
    """
 
1760
    wt.lock_tree_write()
 
1761
    try:
 
1762
        tree.lock_read()
 
1763
        try:
 
1764
            if accelerator_tree is not None:
 
1765
                accelerator_tree.lock_read()
 
1766
            try:
 
1767
                return _build_tree(tree, wt, accelerator_tree, hardlink,
 
1768
                                   delta_from_tree)
 
1769
            finally:
 
1770
                if accelerator_tree is not None:
 
1771
                    accelerator_tree.unlock()
 
1772
        finally:
 
1773
            tree.unlock()
 
1774
    finally:
 
1775
        wt.unlock()
 
1776
 
 
1777
 
 
1778
def _build_tree(tree, wt, accelerator_tree, hardlink, delta_from_tree):
 
1779
    """See build_tree."""
 
1780
    for num, _unused in enumerate(wt.all_file_ids()):
 
1781
        if num > 0:  # more than just a root
 
1782
            raise errors.WorkingTreeAlreadyPopulated(base=wt.basedir)
 
1783
    existing_files = set()
 
1784
    for dir, files in wt.walkdirs():
 
1785
        existing_files.update(f[0] for f in files)
907
1786
    file_trans_id = {}
908
1787
    top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
909
1788
    pp = ProgressPhase("Build phase", 2, top_pb)
 
1789
    if tree.inventory.root is not None:
 
1790
        # This is kind of a hack: we should be altering the root
 
1791
        # as part of the regular tree shape diff logic.
 
1792
        # The conditional test here is to avoid doing an
 
1793
        # expensive operation (flush) every time the root id
 
1794
        # is set within the tree, nor setting the root and thus
 
1795
        # marking the tree as dirty, because we use two different
 
1796
        # idioms here: tree interfaces and inventory interfaces.
 
1797
        if wt.get_root_id() != tree.get_root_id():
 
1798
            wt.set_root_id(tree.get_root_id())
 
1799
            wt.flush()
910
1800
    tt = TreeTransform(wt)
 
1801
    divert = set()
911
1802
    try:
912
1803
        pp.next_phase()
913
 
        file_trans_id[wt.get_root_id()] = tt.trans_id_tree_file_id(wt.get_root_id())
914
 
        file_ids = topology_sorted_ids(tree)
 
1804
        file_trans_id[wt.get_root_id()] = \
 
1805
            tt.trans_id_tree_file_id(wt.get_root_id())
915
1806
        pb = bzrlib.ui.ui_factory.nested_progress_bar()
916
1807
        try:
917
 
            for num, file_id in enumerate(file_ids):
918
 
                pb.update("Building tree", num, len(file_ids))
919
 
                entry = tree.inventory[file_id]
 
1808
            deferred_contents = []
 
1809
            num = 0
 
1810
            total = len(tree.inventory)
 
1811
            if delta_from_tree:
 
1812
                precomputed_delta = []
 
1813
            else:
 
1814
                precomputed_delta = None
 
1815
            for num, (tree_path, entry) in \
 
1816
                enumerate(tree.inventory.iter_entries_by_dir()):
 
1817
                pb.update("Building tree", num - len(deferred_contents), total)
920
1818
                if entry.parent_id is None:
921
1819
                    continue
922
 
                if entry.parent_id not in file_trans_id:
923
 
                    raise repr(entry.parent_id)
 
1820
                reparent = False
 
1821
                file_id = entry.file_id
 
1822
                if delta_from_tree:
 
1823
                    precomputed_delta.append((None, tree_path, file_id, entry))
 
1824
                if tree_path in existing_files:
 
1825
                    target_path = wt.abspath(tree_path)
 
1826
                    kind = file_kind(target_path)
 
1827
                    if kind == "directory":
 
1828
                        try:
 
1829
                            bzrdir.BzrDir.open(target_path)
 
1830
                        except errors.NotBranchError:
 
1831
                            pass
 
1832
                        else:
 
1833
                            divert.add(file_id)
 
1834
                    if (file_id not in divert and
 
1835
                        _content_match(tree, entry, file_id, kind,
 
1836
                        target_path)):
 
1837
                        tt.delete_contents(tt.trans_id_tree_path(tree_path))
 
1838
                        if kind == 'directory':
 
1839
                            reparent = True
924
1840
                parent_id = file_trans_id[entry.parent_id]
925
 
                file_trans_id[file_id] = new_by_entry(tt, entry, parent_id, 
926
 
                                                      tree)
 
1841
                if entry.kind == 'file':
 
1842
                    # We *almost* replicate new_by_entry, so that we can defer
 
1843
                    # getting the file text, and get them all at once.
 
1844
                    trans_id = tt.create_path(entry.name, parent_id)
 
1845
                    file_trans_id[file_id] = trans_id
 
1846
                    tt.version_file(file_id, trans_id)
 
1847
                    executable = tree.is_executable(file_id, tree_path)
 
1848
                    if executable:
 
1849
                        tt.set_executability(executable, trans_id)
 
1850
                    deferred_contents.append((file_id, trans_id))
 
1851
                else:
 
1852
                    file_trans_id[file_id] = new_by_entry(tt, entry, parent_id,
 
1853
                                                          tree)
 
1854
                if reparent:
 
1855
                    new_trans_id = file_trans_id[file_id]
 
1856
                    old_parent = tt.trans_id_tree_path(tree_path)
 
1857
                    _reparent_children(tt, old_parent, new_trans_id)
 
1858
            offset = num + 1 - len(deferred_contents)
 
1859
            _create_files(tt, tree, deferred_contents, pb, offset,
 
1860
                          accelerator_tree, hardlink)
927
1861
        finally:
928
1862
            pb.finished()
929
1863
        pp.next_phase()
930
 
        tt.apply()
 
1864
        divert_trans = set(file_trans_id[f] for f in divert)
 
1865
        resolver = lambda t, c: resolve_checkout(t, c, divert_trans)
 
1866
        raw_conflicts = resolve_conflicts(tt, pass_func=resolver)
 
1867
        if len(raw_conflicts) > 0:
 
1868
            precomputed_delta = None
 
1869
        conflicts = cook_conflicts(raw_conflicts, tt)
 
1870
        for conflict in conflicts:
 
1871
            warning(conflict)
 
1872
        try:
 
1873
            wt.add_conflicts(conflicts)
 
1874
        except errors.UnsupportedOperation:
 
1875
            pass
 
1876
        result = tt.apply(no_conflicts=True,
 
1877
                          precomputed_delta=precomputed_delta)
931
1878
    finally:
932
1879
        tt.finalize()
933
1880
        top_pb.finished()
 
1881
    return result
 
1882
 
 
1883
 
 
1884
def _create_files(tt, tree, desired_files, pb, offset, accelerator_tree,
 
1885
                  hardlink):
 
1886
    total = len(desired_files) + offset
 
1887
    if accelerator_tree is None:
 
1888
        new_desired_files = desired_files
 
1889
    else:
 
1890
        iter = accelerator_tree.iter_changes(tree, include_unchanged=True)
 
1891
        unchanged = dict((f, p[1]) for (f, p, c, v, d, n, k, e)
 
1892
                         in iter if not (c or e[0] != e[1]))
 
1893
        new_desired_files = []
 
1894
        count = 0
 
1895
        for file_id, trans_id in desired_files:
 
1896
            accelerator_path = unchanged.get(file_id)
 
1897
            if accelerator_path is None:
 
1898
                new_desired_files.append((file_id, trans_id))
 
1899
                continue
 
1900
            pb.update('Adding file contents', count + offset, total)
 
1901
            if hardlink:
 
1902
                tt.create_hardlink(accelerator_tree.abspath(accelerator_path),
 
1903
                                   trans_id)
 
1904
            else:
 
1905
                contents = accelerator_tree.get_file(file_id, accelerator_path)
 
1906
                try:
 
1907
                    tt.create_file(contents, trans_id)
 
1908
                finally:
 
1909
                    contents.close()
 
1910
            count += 1
 
1911
        offset += count
 
1912
    for count, (trans_id, contents) in enumerate(tree.iter_files_bytes(
 
1913
                                                 new_desired_files)):
 
1914
        tt.create_file(contents, trans_id)
 
1915
        pb.update('Adding file contents', count + offset, total)
 
1916
 
 
1917
 
 
1918
def _reparent_children(tt, old_parent, new_parent):
 
1919
    for child in tt.iter_tree_children(old_parent):
 
1920
        tt.adjust_path(tt.final_name(child), new_parent, child)
 
1921
 
 
1922
def _reparent_transform_children(tt, old_parent, new_parent):
 
1923
    by_parent = tt.by_parent()
 
1924
    for child in by_parent[old_parent]:
 
1925
        tt.adjust_path(tt.final_name(child), new_parent, child)
 
1926
    return by_parent[old_parent]
 
1927
 
 
1928
def _content_match(tree, entry, file_id, kind, target_path):
 
1929
    if entry.kind != kind:
 
1930
        return False
 
1931
    if entry.kind == "directory":
 
1932
        return True
 
1933
    if entry.kind == "file":
 
1934
        if tree.get_file(file_id).read() == file(target_path, 'rb').read():
 
1935
            return True
 
1936
    elif entry.kind == "symlink":
 
1937
        if tree.get_symlink_target(file_id) == os.readlink(target_path):
 
1938
            return True
 
1939
    return False
 
1940
 
 
1941
 
 
1942
def resolve_checkout(tt, conflicts, divert):
 
1943
    new_conflicts = set()
 
1944
    for c_type, conflict in ((c[0], c) for c in conflicts):
 
1945
        # Anything but a 'duplicate' would indicate programmer error
 
1946
        if c_type != 'duplicate':
 
1947
            raise AssertionError(c_type)
 
1948
        # Now figure out which is new and which is old
 
1949
        if tt.new_contents(conflict[1]):
 
1950
            new_file = conflict[1]
 
1951
            old_file = conflict[2]
 
1952
        else:
 
1953
            new_file = conflict[2]
 
1954
            old_file = conflict[1]
 
1955
 
 
1956
        # We should only get here if the conflict wasn't completely
 
1957
        # resolved
 
1958
        final_parent = tt.final_parent(old_file)
 
1959
        if new_file in divert:
 
1960
            new_name = tt.final_name(old_file)+'.diverted'
 
1961
            tt.adjust_path(new_name, final_parent, new_file)
 
1962
            new_conflicts.add((c_type, 'Diverted to',
 
1963
                               new_file, old_file))
 
1964
        else:
 
1965
            new_name = tt.final_name(old_file)+'.moved'
 
1966
            tt.adjust_path(new_name, final_parent, old_file)
 
1967
            new_conflicts.add((c_type, 'Moved existing file to',
 
1968
                               old_file, new_file))
 
1969
    return new_conflicts
 
1970
 
934
1971
 
935
1972
def new_by_entry(tt, entry, parent_id, tree):
936
1973
    """Create a new file according to its inventory entry"""
941
1978
        executable = tree.is_executable(entry.file_id)
942
1979
        return tt.new_file(name, parent_id, contents, entry.file_id, 
943
1980
                           executable)
944
 
    elif kind == 'directory':
945
 
        return tt.new_directory(name, parent_id, entry.file_id)
 
1981
    elif kind in ('directory', 'tree-reference'):
 
1982
        trans_id = tt.new_directory(name, parent_id, entry.file_id)
 
1983
        if kind == 'tree-reference':
 
1984
            tt.set_tree_reference(entry.reference_revision, trans_id)
 
1985
        return trans_id 
946
1986
    elif kind == 'symlink':
947
1987
        target = tree.get_symlink_target(entry.file_id)
948
1988
        return tt.new_symlink(name, parent_id, target, entry.file_id)
 
1989
    else:
 
1990
        raise errors.BadFileKindError(name, kind)
 
1991
 
949
1992
 
950
1993
def create_by_entry(tt, entry, tree, trans_id, lines=None, mode_id=None):
951
1994
    """Create new file contents according to an inventory entry."""
952
1995
    if entry.kind == "file":
953
 
        if lines == None:
 
1996
        if lines is None:
954
1997
            lines = tree.get_file(entry.file_id).readlines()
955
1998
        tt.create_file(lines, trans_id, mode_id=mode_id)
956
1999
    elif entry.kind == "symlink":
958
2001
    elif entry.kind == "directory":
959
2002
        tt.create_directory(trans_id)
960
2003
 
 
2004
 
961
2005
def create_entry_executability(tt, entry, trans_id):
962
2006
    """Set the executability of a trans_id according to an inventory entry"""
963
2007
    if entry.kind == "file":
964
2008
        tt.set_executability(entry.executable, trans_id)
965
2009
 
966
2010
 
967
 
def find_interesting(working_tree, target_tree, filenames):
968
 
    """Find the ids corresponding to specified filenames."""
969
 
    if not filenames:
970
 
        interesting_ids = None
971
 
    else:
972
 
        interesting_ids = set()
973
 
        for tree_path in filenames:
974
 
            not_found = True
975
 
            for tree in (working_tree, target_tree):
976
 
                file_id = tree.inventory.path2id(tree_path)
977
 
                if file_id is not None:
978
 
                    interesting_ids.add(file_id)
979
 
                    not_found = False
980
 
            if not_found:
981
 
                raise NotVersionedError(path=tree_path)
982
 
    return interesting_ids
983
 
 
984
 
 
985
 
def change_entry(tt, file_id, working_tree, target_tree, 
986
 
                 trans_id_file_id, backups, trans_id, by_parent):
987
 
    """Replace a file_id's contents with those from a target tree."""
988
 
    e_trans_id = trans_id_file_id(file_id)
989
 
    entry = target_tree.inventory[file_id]
990
 
    has_contents, contents_mod, meta_mod, = _entry_changes(file_id, entry, 
991
 
                                                           working_tree)
992
 
    if contents_mod:
993
 
        mode_id = e_trans_id
994
 
        if has_contents:
995
 
            if not backups:
996
 
                tt.delete_contents(e_trans_id)
997
 
            else:
998
 
                parent_trans_id = trans_id_file_id(entry.parent_id)
999
 
                backup_name = get_backup_name(entry, by_parent,
1000
 
                                              parent_trans_id, tt)
1001
 
                tt.adjust_path(backup_name, parent_trans_id, e_trans_id)
1002
 
                tt.unversion_file(e_trans_id)
1003
 
                e_trans_id = tt.create_path(entry.name, parent_trans_id)
1004
 
                tt.version_file(file_id, e_trans_id)
1005
 
                trans_id[file_id] = e_trans_id
1006
 
        create_by_entry(tt, entry, target_tree, e_trans_id, mode_id=mode_id)
1007
 
        create_entry_executability(tt, entry, e_trans_id)
1008
 
 
1009
 
    elif meta_mod:
1010
 
        tt.set_executability(entry.executable, e_trans_id)
1011
 
    if tt.final_name(e_trans_id) != entry.name:
1012
 
        adjust_path  = True
1013
 
    else:
1014
 
        parent_id = tt.final_parent(e_trans_id)
1015
 
        parent_file_id = tt.final_file_id(parent_id)
1016
 
        if parent_file_id != entry.parent_id:
1017
 
            adjust_path = True
1018
 
        else:
1019
 
            adjust_path = False
1020
 
    if adjust_path:
1021
 
        parent_trans_id = trans_id_file_id(entry.parent_id)
1022
 
        tt.adjust_path(entry.name, parent_trans_id, e_trans_id)
1023
 
 
1024
 
 
1025
2011
def get_backup_name(entry, by_parent, parent_trans_id, tt):
 
2012
    return _get_backup_name(entry.name, by_parent, parent_trans_id, tt)
 
2013
 
 
2014
 
 
2015
def _get_backup_name(name, by_parent, parent_trans_id, tt):
1026
2016
    """Produce a backup-style name that appears to be available"""
1027
2017
    def name_gen():
1028
2018
        counter = 1
1029
2019
        while True:
1030
 
            yield "%s.~%d~" % (entry.name, counter)
 
2020
            yield "%s.~%d~" % (name, counter)
1031
2021
            counter += 1
1032
 
    for name in name_gen():
1033
 
        if not tt.has_named_child(by_parent, parent_trans_id, name):
1034
 
            return name
 
2022
    for new_name in name_gen():
 
2023
        if not tt.has_named_child(by_parent, parent_trans_id, new_name):
 
2024
            return new_name
 
2025
 
1035
2026
 
1036
2027
def _entry_changes(file_id, entry, working_tree):
1037
2028
    """Determine in which ways the inventory entry has changed.
1045
2036
    try:
1046
2037
        working_kind = working_tree.kind(file_id)
1047
2038
        has_contents = True
1048
 
    except OSError, e:
1049
 
        if e.errno != errno.ENOENT:
1050
 
            raise
 
2039
    except NoSuchFile:
1051
2040
        has_contents = False
1052
2041
        contents_mod = True
1053
2042
        meta_mod = False
1054
2043
    if has_contents is True:
1055
 
        real_e_kind = entry.kind
1056
 
        if real_e_kind == 'root_directory':
1057
 
            real_e_kind = 'directory'
1058
 
        if real_e_kind != working_kind:
 
2044
        if entry.kind != working_kind:
1059
2045
            contents_mod, meta_mod = True, False
1060
2046
        else:
1061
2047
            cur_entry._read_tree_state(working_tree.id2path(file_id), 
1065
2051
    return has_contents, contents_mod, meta_mod
1066
2052
 
1067
2053
 
1068
 
def revert(working_tree, target_tree, filenames, backups=False, 
1069
 
           pb=DummyProgress()):
 
2054
def revert(working_tree, target_tree, filenames, backups=False,
 
2055
           pb=DummyProgress(), change_reporter=None):
1070
2056
    """Revert a working tree's contents to those of a target tree."""
1071
 
    interesting_ids = find_interesting(working_tree, target_tree, filenames)
1072
 
    def interesting(file_id):
1073
 
        return interesting_ids is None or file_id in interesting_ids
1074
 
 
 
2057
    target_tree.lock_read()
1075
2058
    tt = TreeTransform(working_tree, pb)
1076
2059
    try:
1077
 
        merge_modified = working_tree.merge_modified()
1078
 
        trans_id = {}
1079
 
        def trans_id_file_id(file_id):
1080
 
            try:
1081
 
                return trans_id[file_id]
1082
 
            except KeyError:
1083
 
                return tt.trans_id_tree_file_id(file_id)
1084
 
 
1085
 
        pp = ProgressPhase("Revert phase", 4, pb)
1086
 
        pp.next_phase()
1087
 
        sorted_interesting = [i for i in topology_sorted_ids(target_tree) if
1088
 
                              interesting(i)]
1089
 
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1090
 
        try:
1091
 
            by_parent = tt.by_parent()
1092
 
            for id_num, file_id in enumerate(sorted_interesting):
1093
 
                child_pb.update("Reverting file", id_num+1, 
1094
 
                                len(sorted_interesting))
1095
 
                if file_id not in working_tree.inventory:
1096
 
                    entry = target_tree.inventory[file_id]
1097
 
                    parent_id = trans_id_file_id(entry.parent_id)
1098
 
                    e_trans_id = new_by_entry(tt, entry, parent_id, target_tree)
1099
 
                    trans_id[file_id] = e_trans_id
1100
 
                else:
1101
 
                    backup_this = backups
1102
 
                    if file_id in merge_modified:
1103
 
                        backup_this = False
1104
 
                        del merge_modified[file_id]
1105
 
                    change_entry(tt, file_id, working_tree, target_tree, 
1106
 
                                 trans_id_file_id, backup_this, trans_id,
1107
 
                                 by_parent)
1108
 
        finally:
1109
 
            child_pb.finished()
1110
 
        pp.next_phase()
1111
 
        wt_interesting = [i for i in working_tree.inventory if interesting(i)]
1112
 
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1113
 
        try:
1114
 
            for id_num, file_id in enumerate(wt_interesting):
1115
 
                child_pb.update("New file check", id_num+1, 
1116
 
                                len(sorted_interesting))
1117
 
                if file_id not in target_tree:
1118
 
                    trans_id = tt.trans_id_tree_file_id(file_id)
1119
 
                    tt.unversion_file(trans_id)
1120
 
                    if file_id in merge_modified:
 
2060
        pp = ProgressPhase("Revert phase", 3, pb)
 
2061
        pp.next_phase()
 
2062
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
2063
        try:
 
2064
            merge_modified = _alter_files(working_tree, target_tree, tt,
 
2065
                                          child_pb, filenames, backups)
 
2066
        finally:
 
2067
            child_pb.finished()
 
2068
        pp.next_phase()
 
2069
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
2070
        try:
 
2071
            raw_conflicts = resolve_conflicts(tt, child_pb,
 
2072
                lambda t, c: conflict_pass(t, c, target_tree))
 
2073
        finally:
 
2074
            child_pb.finished()
 
2075
        conflicts = cook_conflicts(raw_conflicts, tt)
 
2076
        if change_reporter:
 
2077
            change_reporter = delta._ChangeReporter(
 
2078
                unversioned_filter=working_tree.is_ignored)
 
2079
            delta.report_changes(tt.iter_changes(), change_reporter)
 
2080
        for conflict in conflicts:
 
2081
            warning(conflict)
 
2082
        pp.next_phase()
 
2083
        tt.apply()
 
2084
        working_tree.set_merge_modified(merge_modified)
 
2085
    finally:
 
2086
        target_tree.unlock()
 
2087
        tt.finalize()
 
2088
        pb.clear()
 
2089
    return conflicts
 
2090
 
 
2091
 
 
2092
def _alter_files(working_tree, target_tree, tt, pb, specific_files,
 
2093
                 backups):
 
2094
    merge_modified = working_tree.merge_modified()
 
2095
    change_list = target_tree.iter_changes(working_tree,
 
2096
        specific_files=specific_files, pb=pb)
 
2097
    if target_tree.inventory.root is None:
 
2098
        skip_root = True
 
2099
    else:
 
2100
        skip_root = False
 
2101
    basis_tree = None
 
2102
    try:
 
2103
        deferred_files = []
 
2104
        for id_num, (file_id, path, changed_content, versioned, parent, name,
 
2105
                kind, executable) in enumerate(change_list):
 
2106
            if skip_root and file_id[0] is not None and parent[0] is None:
 
2107
                continue
 
2108
            trans_id = tt.trans_id_file_id(file_id)
 
2109
            mode_id = None
 
2110
            if changed_content:
 
2111
                keep_content = False
 
2112
                if kind[0] == 'file' and (backups or kind[1] is None):
 
2113
                    wt_sha1 = working_tree.get_file_sha1(file_id)
 
2114
                    if merge_modified.get(file_id) != wt_sha1:
 
2115
                        # acquire the basis tree lazily to prevent the
 
2116
                        # expense of accessing it when it's not needed ?
 
2117
                        # (Guessing, RBC, 200702)
 
2118
                        if basis_tree is None:
 
2119
                            basis_tree = working_tree.basis_tree()
 
2120
                            basis_tree.lock_read()
 
2121
                        if file_id in basis_tree:
 
2122
                            if wt_sha1 != basis_tree.get_file_sha1(file_id):
 
2123
                                keep_content = True
 
2124
                        elif kind[1] is None and not versioned[1]:
 
2125
                            keep_content = True
 
2126
                if kind[0] is not None:
 
2127
                    if not keep_content:
1121
2128
                        tt.delete_contents(trans_id)
1122
 
                        del merge_modified[file_id]
1123
 
        finally:
1124
 
            child_pb.finished()
1125
 
        pp.next_phase()
1126
 
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1127
 
        try:
1128
 
            raw_conflicts = resolve_conflicts(tt, child_pb)
1129
 
        finally:
1130
 
            child_pb.finished()
1131
 
        conflicts = cook_conflicts(raw_conflicts, tt)
1132
 
        for conflict in conflicts:
1133
 
            warning(conflict)
1134
 
        pp.next_phase()
1135
 
        tt.apply()
1136
 
        working_tree.set_merge_modified({})
 
2129
                    elif kind[1] is not None:
 
2130
                        parent_trans_id = tt.trans_id_file_id(parent[0])
 
2131
                        by_parent = tt.by_parent()
 
2132
                        backup_name = _get_backup_name(name[0], by_parent,
 
2133
                                                       parent_trans_id, tt)
 
2134
                        tt.adjust_path(backup_name, parent_trans_id, trans_id)
 
2135
                        new_trans_id = tt.create_path(name[0], parent_trans_id)
 
2136
                        if versioned == (True, True):
 
2137
                            tt.unversion_file(trans_id)
 
2138
                            tt.version_file(file_id, new_trans_id)
 
2139
                        # New contents should have the same unix perms as old
 
2140
                        # contents
 
2141
                        mode_id = trans_id
 
2142
                        trans_id = new_trans_id
 
2143
                if kind[1] == 'directory':
 
2144
                    tt.create_directory(trans_id)
 
2145
                elif kind[1] == 'symlink':
 
2146
                    tt.create_symlink(target_tree.get_symlink_target(file_id),
 
2147
                                      trans_id)
 
2148
                elif kind[1] == 'file':
 
2149
                    deferred_files.append((file_id, (trans_id, mode_id)))
 
2150
                    if basis_tree is None:
 
2151
                        basis_tree = working_tree.basis_tree()
 
2152
                        basis_tree.lock_read()
 
2153
                    new_sha1 = target_tree.get_file_sha1(file_id)
 
2154
                    if (file_id in basis_tree and new_sha1 ==
 
2155
                        basis_tree.get_file_sha1(file_id)):
 
2156
                        if file_id in merge_modified:
 
2157
                            del merge_modified[file_id]
 
2158
                    else:
 
2159
                        merge_modified[file_id] = new_sha1
 
2160
 
 
2161
                    # preserve the execute bit when backing up
 
2162
                    if keep_content and executable[0] == executable[1]:
 
2163
                        tt.set_executability(executable[1], trans_id)
 
2164
                elif kind[1] is not None:
 
2165
                    raise AssertionError(kind[1])
 
2166
            if versioned == (False, True):
 
2167
                tt.version_file(file_id, trans_id)
 
2168
            if versioned == (True, False):
 
2169
                tt.unversion_file(trans_id)
 
2170
            if (name[1] is not None and 
 
2171
                (name[0] != name[1] or parent[0] != parent[1])):
 
2172
                tt.adjust_path(
 
2173
                    name[1], tt.trans_id_file_id(parent[1]), trans_id)
 
2174
            if executable[0] != executable[1] and kind[1] == "file":
 
2175
                tt.set_executability(executable[1], trans_id)
 
2176
        for (trans_id, mode_id), bytes in target_tree.iter_files_bytes(
 
2177
            deferred_files):
 
2178
            tt.create_file(bytes, trans_id, mode_id)
1137
2179
    finally:
1138
 
        tt.finalize()
1139
 
        pb.clear()
1140
 
    return conflicts
1141
 
 
1142
 
 
1143
 
def resolve_conflicts(tt, pb=DummyProgress()):
 
2180
        if basis_tree is not None:
 
2181
            basis_tree.unlock()
 
2182
    return merge_modified
 
2183
 
 
2184
 
 
2185
def resolve_conflicts(tt, pb=DummyProgress(), pass_func=None):
1144
2186
    """Make many conflict-resolution attempts, but die if they fail"""
 
2187
    if pass_func is None:
 
2188
        pass_func = conflict_pass
1145
2189
    new_conflicts = set()
1146
2190
    try:
1147
2191
        for n in range(10):
1149
2193
            conflicts = tt.find_conflicts()
1150
2194
            if len(conflicts) == 0:
1151
2195
                return new_conflicts
1152
 
            new_conflicts.update(conflict_pass(tt, conflicts))
 
2196
            new_conflicts.update(pass_func(tt, conflicts))
1153
2197
        raise MalformedTransform(conflicts=conflicts)
1154
2198
    finally:
1155
2199
        pb.clear()
1156
2200
 
1157
2201
 
1158
 
def conflict_pass(tt, conflicts):
1159
 
    """Resolve some classes of conflicts."""
 
2202
def conflict_pass(tt, conflicts, path_tree=None):
 
2203
    """Resolve some classes of conflicts.
 
2204
 
 
2205
    :param tt: The transform to resolve conflicts in
 
2206
    :param conflicts: The conflicts to resolve
 
2207
    :param path_tree: A Tree to get supplemental paths from
 
2208
    """
1160
2209
    new_conflicts = set()
1161
2210
    for c_type, conflict in ((c[0], c) for c in conflicts):
1162
2211
        if c_type == 'duplicate id':
1165
2214
                               conflict[1], conflict[2], ))
1166
2215
        elif c_type == 'duplicate':
1167
2216
            # files that were renamed take precedence
1168
 
            new_name = tt.final_name(conflict[1])+'.moved'
1169
2217
            final_parent = tt.final_parent(conflict[1])
1170
2218
            if tt.path_changed(conflict[1]):
1171
 
                tt.adjust_path(new_name, final_parent, conflict[2])
1172
 
                new_conflicts.add((c_type, 'Moved existing file to', 
1173
 
                                   conflict[2], conflict[1]))
 
2219
                existing_file, new_file = conflict[2], conflict[1]
1174
2220
            else:
1175
 
                tt.adjust_path(new_name, final_parent, conflict[1])
1176
 
                new_conflicts.add((c_type, 'Moved existing file to', 
1177
 
                                  conflict[1], conflict[2]))
 
2221
                existing_file, new_file = conflict[1], conflict[2]
 
2222
            new_name = tt.final_name(existing_file)+'.moved'
 
2223
            tt.adjust_path(new_name, final_parent, existing_file)
 
2224
            new_conflicts.add((c_type, 'Moved existing file to', 
 
2225
                               existing_file, new_file))
1178
2226
        elif c_type == 'parent loop':
1179
2227
            # break the loop by undoing one of the ops that caused the loop
1180
2228
            cur = conflict[1]
1188
2236
            trans_id = conflict[1]
1189
2237
            try:
1190
2238
                tt.cancel_deletion(trans_id)
1191
 
                new_conflicts.add((c_type, 'Not deleting', trans_id))
 
2239
                new_conflicts.add(('deleting parent', 'Not deleting', 
 
2240
                                   trans_id))
1192
2241
            except KeyError:
1193
 
                tt.create_directory(trans_id)
1194
 
                new_conflicts.add((c_type, 'Created directory.', trans_id))
 
2242
                create = True
 
2243
                try:
 
2244
                    tt.final_name(trans_id)
 
2245
                except NoFinalPath:
 
2246
                    if path_tree is not None:
 
2247
                        file_id = tt.final_file_id(trans_id)
 
2248
                        if file_id is None:
 
2249
                            file_id = tt.inactive_file_id(trans_id)
 
2250
                        entry = path_tree.inventory[file_id]
 
2251
                        # special-case the other tree root (move its
 
2252
                        # children to current root)
 
2253
                        if entry.parent_id is None:
 
2254
                            create=False
 
2255
                            moved = _reparent_transform_children(
 
2256
                                tt, trans_id, tt.root)
 
2257
                            for child in moved:
 
2258
                                new_conflicts.add((c_type, 'Moved to root',
 
2259
                                                   child))
 
2260
                        else:
 
2261
                            parent_trans_id = tt.trans_id_file_id(
 
2262
                                entry.parent_id)
 
2263
                            tt.adjust_path(entry.name, parent_trans_id,
 
2264
                                           trans_id)
 
2265
                if create:
 
2266
                    tt.create_directory(trans_id)
 
2267
                    new_conflicts.add((c_type, 'Created directory', trans_id))
1195
2268
        elif c_type == 'unversioned parent':
1196
 
            tt.version_file(tt.inactive_file_id(conflict[1]), conflict[1])
 
2269
            file_id = tt.inactive_file_id(conflict[1])
 
2270
            # special-case the other tree root (move its children instead)
 
2271
            if path_tree and file_id in path_tree:
 
2272
                if path_tree.inventory[file_id].parent_id is None:
 
2273
                    continue
 
2274
            tt.version_file(file_id, conflict[1])
1197
2275
            new_conflicts.add((c_type, 'Versioned directory', conflict[1]))
 
2276
        elif c_type == 'non-directory parent':
 
2277
            parent_id = conflict[1]
 
2278
            parent_parent = tt.final_parent(parent_id)
 
2279
            parent_name = tt.final_name(parent_id)
 
2280
            parent_file_id = tt.final_file_id(parent_id)
 
2281
            new_parent_id = tt.new_directory(parent_name + '.new',
 
2282
                parent_parent, parent_file_id)
 
2283
            _reparent_transform_children(tt, parent_id, new_parent_id)
 
2284
            if parent_file_id is not None:
 
2285
                tt.unversion_file(parent_id)
 
2286
            new_conflicts.add((c_type, 'Created directory', new_parent_id))
1198
2287
    return new_conflicts
1199
2288
 
 
2289
 
1200
2290
def cook_conflicts(raw_conflicts, tt):
1201
2291
    """Generate a list of cooked conflicts, sorted by file path"""
1202
 
    def key(conflict):
1203
 
        if conflict.path is not None:
1204
 
            return conflict.path, conflict.typestring
1205
 
        elif getattr(conflict, "conflict_path", None) is not None:
1206
 
            return conflict.conflict_path, conflict.typestring
1207
 
        else:
1208
 
            return None, conflict.typestring
 
2292
    from bzrlib.conflicts import Conflict
 
2293
    conflict_iter = iter_cook_conflicts(raw_conflicts, tt)
 
2294
    return sorted(conflict_iter, key=Conflict.sort_key)
1209
2295
 
1210
 
    return sorted(list(iter_cook_conflicts(raw_conflicts, tt)), key=key)
1211
2296
 
1212
2297
def iter_cook_conflicts(raw_conflicts, tt):
1213
2298
    from bzrlib.conflicts import Conflict
1228
2313
                                   file_id=modified_id, 
1229
2314
                                   conflict_path=conflicting_path,
1230
2315
                                   conflict_file_id=conflicting_id)
 
2316
 
 
2317
 
 
2318
class _FileMover(object):
 
2319
    """Moves and deletes files for TreeTransform, tracking operations"""
 
2320
 
 
2321
    def __init__(self):
 
2322
        self.past_renames = []
 
2323
        self.pending_deletions = []
 
2324
 
 
2325
    def rename(self, from_, to):
 
2326
        """Rename a file from one path to another.  Functions like os.rename"""
 
2327
        try:
 
2328
            os.rename(from_, to)
 
2329
        except OSError, e:
 
2330
            if e.errno in (errno.EEXIST, errno.ENOTEMPTY):
 
2331
                raise errors.FileExists(to, str(e))
 
2332
            raise
 
2333
        self.past_renames.append((from_, to))
 
2334
 
 
2335
    def pre_delete(self, from_, to):
 
2336
        """Rename a file out of the way and mark it for deletion.
 
2337
 
 
2338
        Unlike os.unlink, this works equally well for files and directories.
 
2339
        :param from_: The current file path
 
2340
        :param to: A temporary path for the file
 
2341
        """
 
2342
        self.rename(from_, to)
 
2343
        self.pending_deletions.append(to)
 
2344
 
 
2345
    def rollback(self):
 
2346
        """Reverse all renames that have been performed"""
 
2347
        for from_, to in reversed(self.past_renames):
 
2348
            os.rename(to, from_)
 
2349
        # after rollback, don't reuse _FileMover
 
2350
        past_renames = None
 
2351
        pending_deletions = None
 
2352
 
 
2353
    def apply_deletions(self):
 
2354
        """Apply all marked deletions"""
 
2355
        for path in self.pending_deletions:
 
2356
            delete_any(path)
 
2357
        # after apply_deletions, don't reuse _FileMover
 
2358
        past_renames = None
 
2359
        pending_deletions = None