← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

  • Committer: Naoki INADA
  • Date: 2009-10-29 10:01:19 UTC
  • mto: (4634.97.3 2.0)
  • mto: This revision was merged to the branch mainline in revision 4798.
  • Revision ID: inada-n@klab.jp-20091029100119-uckv9t7ej2qrghw3
import doc-ja rev90

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
1
 
# Copyright (C) 2006, 2007 Canonical Ltd
 
1
# Copyright (C) 2006, 2007, 2008, 2009 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
import os
18
18
import errno
19
 
from stat import S_ISREG
 
19
from stat import S_ISREG, S_IEXEC
20
20
 
21
21
from bzrlib.lazy_import import lazy_import
22
22
lazy_import(globals(), """
23
23
from bzrlib import (
 
24
    annotate,
 
25
    bencode,
24
26
    bzrdir,
25
27
    delta,
26
28
    errors,
27
 
    inventory
 
29
    inventory,
 
30
    multiparent,
 
31
    osutils,
 
32
    revision as _mod_revision,
28
33
    )
29
34
""")
30
35
from bzrlib.errors import (DuplicateKey, MalformedTransform, NoSuchFile,
31
36
                           ReusingTransform, NotVersionedError, CantMoveRoot,
32
 
                           ExistingLimbo, ImmortalLimbo, NoFinalPath)
 
37
                           ExistingLimbo, ImmortalLimbo, NoFinalPath,
 
38
                           UnableCreateSymlink)
 
39
from bzrlib.filters import filtered_output_bytes, ContentFilterContext
33
40
from bzrlib.inventory import InventoryEntry
34
 
from bzrlib.osutils import (file_kind, supports_executable, pathjoin, lexists,
35
 
                            delete_any)
 
41
from bzrlib.osutils import (
 
42
    delete_any,
 
43
    file_kind,
 
44
    has_symlinks,
 
45
    lexists,
 
46
    pathjoin,
 
47
    sha_file,
 
48
    splitpath,
 
49
    supports_executable,
 
50
)
36
51
from bzrlib.progress import DummyProgress, ProgressPhase
37
52
from bzrlib.symbol_versioning import (
38
53
        deprecated_function,
39
 
        zero_fifteen,
40
 
        zero_ninety,
 
54
        deprecated_in,
41
55
        )
42
56
from bzrlib.trace import mutter, warning
43
57
from bzrlib import tree
61
75
        self.rename_count = rename_count
62
76
 
63
77
 
64
 
class TreeTransform(object):
65
 
    """Represent a tree transformation.
66
 
    
67
 
    This object is designed to support incremental generation of the transform,
68
 
    in any order.
69
 
 
70
 
    However, it gives optimum performance when parent directories are created
71
 
    before their contents.  The transform is then able to put child files
72
 
    directly in their parent directory, avoiding later renames.
73
 
    
74
 
    It is easy to produce malformed transforms, but they are generally
75
 
    harmless.  Attempting to apply a malformed transform will cause an
76
 
    exception to be raised before any modifications are made to the tree.  
77
 
 
78
 
    Many kinds of malformed transforms can be corrected with the 
79
 
    resolve_conflicts function.  The remaining ones indicate programming error,
80
 
    such as trying to create a file with no path.
81
 
 
82
 
    Two sets of file creation methods are supplied.  Convenience methods are:
83
 
     * new_file
84
 
     * new_directory
85
 
     * new_symlink
86
 
 
87
 
    These are composed of the low-level methods:
88
 
     * create_path
89
 
     * create_file or create_directory or create_symlink
90
 
     * version_file
91
 
     * set_executability
92
 
    """
93
 
    def __init__(self, tree, pb=DummyProgress()):
94
 
        """Note: a tree_write lock is taken on the tree.
95
 
        
96
 
        Use TreeTransform.finalize() to release the lock (can be omitted if
97
 
        TreeTransform.apply() called).
 
78
class TreeTransformBase(object):
 
79
    """The base class for TreeTransform and its kin."""
 
80
 
 
81
    def __init__(self, tree, pb=DummyProgress(),
 
82
                 case_sensitive=True):
 
83
        """Constructor.
 
84
 
 
85
        :param tree: The tree that will be transformed, but not necessarily
 
86
            the output tree.
 
87
        :param pb: A ProgressTask indicating how much progress is being made
 
88
        :param case_sensitive: If True, the target of the transform is
 
89
            case sensitive, not just case preserving.
98
90
        """
99
91
        object.__init__(self)
100
92
        self._tree = tree
101
 
        self._tree.lock_tree_write()
102
 
        try:
103
 
            control_files = self._tree._control_files
104
 
            self._limbodir = urlutils.local_path_from_url(
105
 
                control_files.controlfilename('limbo'))
106
 
            try:
107
 
                os.mkdir(self._limbodir)
108
 
            except OSError, e:
109
 
                if e.errno == errno.EEXIST:
110
 
                    raise ExistingLimbo(self._limbodir)
111
 
            self._deletiondir = urlutils.local_path_from_url(
112
 
                control_files.controlfilename('pending-deletion'))
113
 
            try:
114
 
                os.mkdir(self._deletiondir)
115
 
            except OSError, e:
116
 
                if e.errno == errno.EEXIST:
117
 
                    raise errors.ExistingPendingDeletion(self._deletiondir)
118
 
 
119
 
        except: 
120
 
            self._tree.unlock()
121
 
            raise
122
 
 
123
93
        self._id_number = 0
 
94
        # mapping of trans_id -> new basename
124
95
        self._new_name = {}
 
96
        # mapping of trans_id -> new parent trans_id
125
97
        self._new_parent = {}
 
98
        # mapping of trans_id with new contents -> new file_kind
126
99
        self._new_contents = {}
127
 
        # A mapping of transform ids to their limbo filename
128
 
        self._limbo_files = {}
129
 
        # A mapping of transform ids to a set of the transform ids of children
130
 
        # that their limbo directory has
131
 
        self._limbo_children = {}
132
 
        # Map transform ids to maps of child filename to child transform id
133
 
        self._limbo_children_names = {}
134
 
        # List of transform ids that need to be renamed from limbo into place
135
 
        self._needs_rename = set()
 
100
        # Set of trans_ids whose contents will be removed
136
101
        self._removed_contents = set()
 
102
        # Mapping of trans_id -> new execute-bit value
137
103
        self._new_executability = {}
 
104
        # Mapping of trans_id -> new tree-reference value
138
105
        self._new_reference_revision = {}
 
106
        # Mapping of trans_id -> new file_id
139
107
        self._new_id = {}
 
108
        # Mapping of old file-id -> trans_id
140
109
        self._non_present_ids = {}
 
110
        # Mapping of new file_id -> trans_id
141
111
        self._r_new_id = {}
 
112
        # Set of trans_ids that will be removed
142
113
        self._removed_id = set()
 
114
        # Mapping of path in old tree -> trans_id
143
115
        self._tree_path_ids = {}
 
116
        # Mapping trans_id -> path in old tree
144
117
        self._tree_id_paths = {}
145
 
        # Cache of realpath results, to speed up canonical_path
146
 
        self._realpaths = {}
147
 
        # Cache of relpath results, to speed up canonical_path
148
 
        self._relpaths = {}
149
 
        self._new_root = self.trans_id_tree_file_id(tree.get_root_id())
150
 
        self.__done = False
 
118
        # The trans_id that will be used as the tree root
 
119
        root_id = tree.get_root_id()
 
120
        if root_id is not None:
 
121
            self._new_root = self.trans_id_tree_file_id(root_id)
 
122
        else:
 
123
            self._new_root = None
 
124
        # Indictor of whether the transform has been applied
 
125
        self._done = False
 
126
        # A progress bar
151
127
        self._pb = pb
 
128
        # Whether the target is case sensitive
 
129
        self._case_sensitive_target = case_sensitive
 
130
        # A counter of how many files have been renamed
152
131
        self.rename_count = 0
153
132
 
 
133
    def finalize(self):
 
134
        """Release the working tree lock, if held.
 
135
 
 
136
        This is required if apply has not been invoked, but can be invoked
 
137
        even after apply.
 
138
        """
 
139
        if self._tree is None:
 
140
            return
 
141
        self._tree.unlock()
 
142
        self._tree = None
 
143
 
154
144
    def __get_root(self):
155
145
        return self._new_root
156
146
 
157
147
    root = property(__get_root)
158
148
 
159
 
    def finalize(self):
160
 
        """Release the working tree lock, if held, clean up limbo dir.
161
 
 
162
 
        This is required if apply has not been invoked, but can be invoked
163
 
        even after apply.
164
 
        """
165
 
        if self._tree is None:
166
 
            return
167
 
        try:
168
 
            entries = [(self._limbo_name(t), t, k) for t, k in
169
 
                       self._new_contents.iteritems()]
170
 
            entries.sort(reverse=True)
171
 
            for path, trans_id, kind in entries:
172
 
                if kind == "directory":
173
 
                    os.rmdir(path)
174
 
                else:
175
 
                    os.unlink(path)
176
 
            try:
177
 
                os.rmdir(self._limbodir)
178
 
            except OSError:
179
 
                # We don't especially care *why* the dir is immortal.
180
 
                raise ImmortalLimbo(self._limbodir)
181
 
            try:
182
 
                os.rmdir(self._deletiondir)
183
 
            except OSError:
184
 
                raise errors.ImmortalPendingDeletion(self._deletiondir)
185
 
        finally:
186
 
            self._tree.unlock()
187
 
            self._tree = None
188
 
 
189
149
    def _assign_id(self):
190
150
        """Produce a new tranform id"""
191
151
        new_id = "new-%s" % self._id_number
203
163
        """Change the path that is assigned to a transaction id."""
204
164
        if trans_id == self._new_root:
205
165
            raise CantMoveRoot
206
 
        previous_parent = self._new_parent.get(trans_id)
207
 
        previous_name = self._new_name.get(trans_id)
208
166
        self._new_name[trans_id] = name
209
167
        self._new_parent[trans_id] = parent
210
 
        if (trans_id in self._limbo_files and
211
 
            trans_id not in self._needs_rename):
212
 
            self._rename_in_limbo([trans_id])
213
 
            self._limbo_children[previous_parent].remove(trans_id)
214
 
            del self._limbo_children_names[previous_parent][previous_name]
215
 
 
216
 
    def _rename_in_limbo(self, trans_ids):
217
 
        """Fix limbo names so that the right final path is produced.
218
 
 
219
 
        This means we outsmarted ourselves-- we tried to avoid renaming
220
 
        these files later by creating them with their final names in their
221
 
        final parents.  But now the previous name or parent is no longer
222
 
        suitable, so we have to rename them.
223
 
 
224
 
        Even for trans_ids that have no new contents, we must remove their
225
 
        entries from _limbo_files, because they are now stale.
226
 
        """
227
 
        for trans_id in trans_ids:
228
 
            old_path = self._limbo_files.pop(trans_id)
229
 
            if trans_id not in self._new_contents:
230
 
                continue
231
 
            new_path = self._limbo_name(trans_id)
232
 
            os.rename(old_path, new_path)
 
168
        if parent == ROOT_PARENT:
 
169
            if self._new_root is not None:
 
170
                raise ValueError("Cannot have multiple roots.")
 
171
            self._new_root = trans_id
233
172
 
234
173
    def adjust_root_path(self, name, parent):
235
174
        """Emulate moving the root by moving all children, instead.
236
 
        
 
175
 
237
176
        We do this by undoing the association of root's transaction id with the
238
177
        current tree.  This allows us to create a new directory with that
239
 
        transaction id.  We unversion the root directory and version the 
 
178
        transaction id.  We unversion the root directory and version the
240
179
        physically new directory, and hope someone versions the tree root
241
180
        later.
242
181
        """
245
184
        # force moving all children of root
246
185
        for child_id in self.iter_tree_children(old_root):
247
186
            if child_id != parent:
248
 
                self.adjust_path(self.final_name(child_id), 
 
187
                self.adjust_path(self.final_name(child_id),
249
188
                                 self.final_parent(child_id), child_id)
250
189
            file_id = self.final_file_id(child_id)
251
190
            if file_id is not None:
252
191
                self.unversion_file(child_id)
253
192
            self.version_file(file_id, child_id)
254
 
        
 
193
 
255
194
        # the physical root needs a new transaction id
256
195
        self._tree_path_ids.pop("")
257
196
        self._tree_id_paths.pop(old_root)
265
204
 
266
205
    def trans_id_tree_file_id(self, inventory_id):
267
206
        """Determine the transaction id of a working tree file.
268
 
        
 
207
 
269
208
        This reflects only files that already exist, not ones that will be
270
209
        added by transactions.
271
210
        """
272
 
        path = self._tree.inventory.id2path(inventory_id)
 
211
        if inventory_id is None:
 
212
            raise ValueError('None is not a valid file id')
 
213
        path = self._tree.id2path(inventory_id)
273
214
        return self.trans_id_tree_path(path)
274
215
 
275
216
    def trans_id_file_id(self, file_id):
278
219
        a transaction has been unversioned, it is deliberately still returned.
279
220
        (this will likely lead to an unversioned parent conflict.)
280
221
        """
 
222
        if file_id is None:
 
223
            raise ValueError('None is not a valid file id')
281
224
        if file_id in self._r_new_id and self._r_new_id[file_id] is not None:
282
225
            return self._r_new_id[file_id]
283
 
        elif file_id in self._tree.inventory:
284
 
            return self.trans_id_tree_file_id(file_id)
285
 
        elif file_id in self._non_present_ids:
286
 
            return self._non_present_ids[file_id]
287
 
        else:
288
 
            trans_id = self._assign_id()
289
 
            self._non_present_ids[file_id] = trans_id
290
 
            return trans_id
291
 
 
292
 
    def canonical_path(self, path):
293
 
        """Get the canonical tree-relative path"""
294
 
        # don't follow final symlinks
295
 
        abs = self._tree.abspath(path)
296
 
        if abs in self._relpaths:
297
 
            return self._relpaths[abs]
298
 
        dirname, basename = os.path.split(abs)
299
 
        if dirname not in self._realpaths:
300
 
            self._realpaths[dirname] = os.path.realpath(dirname)
301
 
        dirname = self._realpaths[dirname]
302
 
        abs = pathjoin(dirname, basename)
303
 
        if dirname in self._relpaths:
304
 
            relpath = pathjoin(self._relpaths[dirname], basename)
305
 
            relpath = relpath.rstrip('/\\')
306
 
        else:
307
 
            relpath = self._tree.relpath(abs)
308
 
        self._relpaths[abs] = relpath
309
 
        return relpath
 
226
        else:
 
227
            try:
 
228
                self._tree.iter_entries_by_dir([file_id]).next()
 
229
            except StopIteration:
 
230
                if file_id in self._non_present_ids:
 
231
                    return self._non_present_ids[file_id]
 
232
                else:
 
233
                    trans_id = self._assign_id()
 
234
                    self._non_present_ids[file_id] = trans_id
 
235
                    return trans_id
 
236
            else:
 
237
                return self.trans_id_tree_file_id(file_id)
310
238
 
311
239
    def trans_id_tree_path(self, path):
312
240
        """Determine (and maybe set) the transaction ID for a tree path."""
323
251
            return ROOT_PARENT
324
252
        return self.trans_id_tree_path(os.path.dirname(path))
325
253
 
326
 
    def create_file(self, contents, trans_id, mode_id=None):
327
 
        """Schedule creation of a new file.
328
 
 
329
 
        See also new_file.
330
 
        
331
 
        Contents is an iterator of strings, all of which will be written
332
 
        to the target destination.
333
 
 
334
 
        New file takes the permissions of any existing file with that id,
335
 
        unless mode_id is specified.
336
 
        """
337
 
        name = self._limbo_name(trans_id)
338
 
        f = open(name, 'wb')
339
 
        try:
340
 
            try:
341
 
                unique_add(self._new_contents, trans_id, 'file')
342
 
            except:
343
 
                # Clean up the file, it never got registered so
344
 
                # TreeTransform.finalize() won't clean it up.
345
 
                f.close()
346
 
                os.unlink(name)
347
 
                raise
348
 
 
349
 
            f.writelines(contents)
350
 
        finally:
351
 
            f.close()
352
 
        self._set_mode(trans_id, mode_id, S_ISREG)
353
 
 
354
 
    def _set_mode(self, trans_id, mode_id, typefunc):
355
 
        """Set the mode of new file contents.
356
 
        The mode_id is the existing file to get the mode from (often the same
357
 
        as trans_id).  The operation is only performed if there's a mode match
358
 
        according to typefunc.
359
 
        """
360
 
        if mode_id is None:
361
 
            mode_id = trans_id
362
 
        try:
363
 
            old_path = self._tree_id_paths[mode_id]
364
 
        except KeyError:
365
 
            return
366
 
        try:
367
 
            mode = os.stat(self._tree.abspath(old_path)).st_mode
368
 
        except OSError, e:
369
 
            if e.errno == errno.ENOENT:
370
 
                return
371
 
            else:
372
 
                raise
373
 
        if typefunc(mode):
374
 
            os.chmod(self._limbo_name(trans_id), mode)
375
 
 
376
 
    def create_directory(self, trans_id):
377
 
        """Schedule creation of a new directory.
378
 
        
379
 
        See also new_directory.
380
 
        """
381
 
        os.mkdir(self._limbo_name(trans_id))
382
 
        unique_add(self._new_contents, trans_id, 'directory')
383
 
 
384
 
    def create_symlink(self, target, trans_id):
385
 
        """Schedule creation of a new symbolic link.
386
 
 
387
 
        target is a bytestring.
388
 
        See also new_symlink.
389
 
        """
390
 
        os.symlink(target, self._limbo_name(trans_id))
391
 
        unique_add(self._new_contents, trans_id, 'symlink')
392
 
 
393
 
    def cancel_creation(self, trans_id):
394
 
        """Cancel the creation of new file contents."""
395
 
        del self._new_contents[trans_id]
396
 
        children = self._limbo_children.get(trans_id)
397
 
        # if this is a limbo directory with children, move them before removing
398
 
        # the directory
399
 
        if children is not None:
400
 
            self._rename_in_limbo(children)
401
 
            del self._limbo_children[trans_id]
402
 
            del self._limbo_children_names[trans_id]
403
 
        delete_any(self._limbo_name(trans_id))
404
 
 
405
254
    def delete_contents(self, trans_id):
406
255
        """Schedule the contents of a path entry for deletion"""
407
256
        self.tree_kind(trans_id)
435
284
 
436
285
    def version_file(self, file_id, trans_id):
437
286
        """Schedule a file to become versioned."""
438
 
        assert file_id is not None
 
287
        if file_id is None:
 
288
            raise ValueError()
439
289
        unique_add(self._new_id, trans_id, file_id)
440
290
        unique_add(self._r_new_id, file_id, trans_id)
441
291
 
445
295
        del self._new_id[trans_id]
446
296
        del self._r_new_id[file_id]
447
297
 
448
 
    def new_paths(self):
449
 
        """Determine the paths of all new and changed files"""
450
 
        new_ids = set()
451
 
        fp = FinalPaths(self)
452
 
        for id_set in (self._new_name, self._new_parent, self._new_contents,
453
 
                       self._new_id, self._new_executability):
454
 
            new_ids.update(id_set)
455
 
        new_paths = [(fp.get_path(t), t) for t in new_ids]
456
 
        new_paths.sort()
457
 
        return new_paths
458
 
 
459
 
    def tree_kind(self, trans_id):
460
 
        """Determine the file kind in the working tree.
461
 
 
462
 
        Raises NoSuchFile if the file does not exist
 
298
    def new_paths(self, filesystem_only=False):
 
299
        """Determine the paths of all new and changed files.
 
300
 
 
301
        :param filesystem_only: if True, only calculate values for files
 
302
            that require renames or execute bit changes.
463
303
        """
464
 
        path = self._tree_id_paths.get(trans_id)
465
 
        if path is None:
466
 
            raise NoSuchFile(None)
467
 
        try:
468
 
            return file_kind(self._tree.abspath(path))
469
 
        except OSError, e:
470
 
            if e.errno != errno.ENOENT:
471
 
                raise
472
 
            else:
473
 
                raise NoSuchFile(path)
 
304
        new_ids = set()
 
305
        if filesystem_only:
 
306
            stale_ids = self._needs_rename.difference(self._new_name)
 
307
            stale_ids.difference_update(self._new_parent)
 
308
            stale_ids.difference_update(self._new_contents)
 
309
            stale_ids.difference_update(self._new_id)
 
310
            needs_rename = self._needs_rename.difference(stale_ids)
 
311
            id_sets = (needs_rename, self._new_executability)
 
312
        else:
 
313
            id_sets = (self._new_name, self._new_parent, self._new_contents,
 
314
                       self._new_id, self._new_executability)
 
315
        for id_set in id_sets:
 
316
            new_ids.update(id_set)
 
317
        return sorted(FinalPaths(self).get_paths(new_ids))
 
318
 
 
319
    def _inventory_altered(self):
 
320
        """Get the trans_ids and paths of files needing new inv entries."""
 
321
        new_ids = set()
 
322
        for id_set in [self._new_name, self._new_parent, self._new_id,
 
323
                       self._new_executability]:
 
324
            new_ids.update(id_set)
 
325
        changed_kind = set(self._removed_contents)
 
326
        changed_kind.intersection_update(self._new_contents)
 
327
        changed_kind.difference_update(new_ids)
 
328
        changed_kind = (t for t in changed_kind if self.tree_kind(t) !=
 
329
                        self.final_kind(t))
 
330
        new_ids.update(changed_kind)
 
331
        return sorted(FinalPaths(self).get_paths(new_ids))
474
332
 
475
333
    def final_kind(self, trans_id):
476
334
        """Determine the final file kind, after any changes applied.
477
 
        
 
335
 
478
336
        Raises NoSuchFile if the file does not exist/has no contents.
479
337
        (It is conceivable that a path would be created without the
480
338
        corresponding contents insertion command)
495
353
            return None
496
354
        # the file is old; the old id is still valid
497
355
        if self._new_root == trans_id:
498
 
            return self._tree.inventory.root.file_id
499
 
        return self._tree.inventory.path2id(path)
 
356
            return self._tree.get_root_id()
 
357
        return self._tree.path2id(path)
500
358
 
501
359
    def final_file_id(self, trans_id):
502
360
        """Determine the file id after any changes are applied, or None.
503
 
        
 
361
 
504
362
        None indicates that the file will not be versioned after changes are
505
363
        applied.
506
364
        """
507
365
        try:
508
 
            # there is a new id for this file
509
 
            assert self._new_id[trans_id] is not None
510
366
            return self._new_id[trans_id]
511
367
        except KeyError:
512
368
            if trans_id in self._removed_id:
547
403
 
548
404
    def by_parent(self):
549
405
        """Return a map of parent: children for known parents.
550
 
        
 
406
 
551
407
        Only new paths and parents of tree files with assigned ids are used.
552
408
        """
553
409
        by_parent = {}
554
410
        items = list(self._new_parent.iteritems())
555
 
        items.extend((t, self.final_parent(t)) for t in 
 
411
        items.extend((t, self.final_parent(t)) for t in
556
412
                      self._tree_id_paths.keys())
557
413
        for trans_id, parent_id in items:
558
414
            if parent_id not in by_parent:
569
425
 
570
426
    def find_conflicts(self):
571
427
        """Find any violations of inventory or filesystem invariants"""
572
 
        if self.__done is True:
 
428
        if self._done is True:
573
429
            raise ReusingTransform()
574
430
        conflicts = []
575
431
        # ensure all children of all existent parents are known
586
442
        conflicts.extend(self._overwrite_conflicts())
587
443
        return conflicts
588
444
 
 
445
    def _check_malformed(self):
 
446
        conflicts = self.find_conflicts()
 
447
        if len(conflicts) != 0:
 
448
            raise MalformedTransform(conflicts=conflicts)
 
449
 
589
450
    def _add_tree_children(self):
590
451
        """Add all the children of all active parents to the known paths.
591
452
 
593
454
        removed.  This is a necessary first step in detecting conflicts.
594
455
        """
595
456
        parents = self.by_parent().keys()
596
 
        parents.extend([t for t in self._removed_contents if 
 
457
        parents.extend([t for t in self._removed_contents if
597
458
                        self.tree_kind(t) == 'directory'])
598
459
        for trans_id in self._removed_id:
599
460
            file_id = self.tree_file_id(trans_id)
600
 
            if self._tree.inventory[file_id].kind == 'directory':
 
461
            if file_id is not None:
 
462
                if self._tree.inventory[file_id].kind == 'directory':
 
463
                    parents.append(trans_id)
 
464
            elif self.tree_kind(trans_id) == 'directory':
601
465
                parents.append(trans_id)
602
466
 
603
467
        for parent_id in parents:
604
468
            # ensure that all children are registered with the transaction
605
469
            list(self.iter_tree_children(parent_id))
606
470
 
607
 
    def iter_tree_children(self, parent_id):
608
 
        """Iterate through the entry's tree children, if any"""
609
 
        try:
610
 
            path = self._tree_id_paths[parent_id]
611
 
        except KeyError:
612
 
            return
613
 
        try:
614
 
            children = os.listdir(self._tree.abspath(path))
615
 
        except OSError, e:
616
 
            if e.errno != errno.ENOENT and e.errno != errno.ESRCH:
617
 
                raise
618
 
            return
619
 
            
620
 
        for child in children:
621
 
            childpath = joinpath(path, child)
622
 
            if self._tree.is_control_filename(childpath):
623
 
                continue
624
 
            yield self.trans_id_tree_path(childpath)
625
 
 
626
471
    def has_named_child(self, by_parent, parent_id, name):
627
472
        try:
628
473
            children = by_parent[parent_id]
682
527
 
683
528
    def _improper_versioning(self):
684
529
        """Cannot version a file with no contents, or a bad type.
685
 
        
 
530
 
686
531
        However, existing entries with no contents are okay.
687
532
        """
688
533
        conflicts = []
698
543
 
699
544
    def _executability_conflicts(self):
700
545
        """Check for bad executability changes.
701
 
        
 
546
 
702
547
        Only versioned files may have their executability set, because
703
548
        1. only versioned entries can have executability under windows
704
549
        2. only files can be executable.  (The execute bit on a directory
737
582
            return conflicts
738
583
        for children in by_parent.itervalues():
739
584
            name_ids = [(self.final_name(t), t) for t in children]
 
585
            if not self._case_sensitive_target:
 
586
                name_ids = [(n.lower(), t) for n, t in name_ids]
740
587
            name_ids.sort()
741
588
            last_name = None
742
589
            last_trans_id = None
760
607
        conflicts = []
761
608
        removed_tree_ids = set((self.tree_file_id(trans_id) for trans_id in
762
609
                                self._removed_id))
763
 
        active_tree_ids = set((f for f in self._tree.inventory if
764
 
                               f not in removed_tree_ids))
 
610
        all_ids = self._tree.all_file_ids()
 
611
        active_tree_ids = all_ids.difference(removed_tree_ids)
765
612
        for trans_id, file_id in self._new_id.iteritems():
766
613
            if file_id in active_tree_ids:
767
614
                old_trans_id = self.trans_id_tree_file_id(file_id)
800
647
                continue
801
648
            return True
802
649
        return False
803
 
            
804
 
    def apply(self, no_conflicts=False, _mover=None):
805
 
        """Apply all changes to the inventory and filesystem.
806
 
        
807
 
        If filesystem or inventory conflicts are present, MalformedTransform
808
 
        will be thrown.
809
 
 
810
 
        If apply succeeds, finalize is not necessary.
811
 
 
812
 
        :param no_conflicts: if True, the caller guarantees there are no
813
 
            conflicts, so no check is made.
814
 
        :param _mover: Supply an alternate FileMover, for testing
815
 
        """
816
 
        if not no_conflicts:
817
 
            conflicts = self.find_conflicts()
818
 
            if len(conflicts) != 0:
819
 
                raise MalformedTransform(conflicts=conflicts)
820
 
        inv = self._tree.inventory
821
 
        inventory_delta = []
822
 
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
823
 
        try:
824
 
            if _mover is None:
825
 
                mover = _FileMover()
826
 
            else:
827
 
                mover = _mover
828
 
            try:
829
 
                child_pb.update('Apply phase', 0, 2)
830
 
                self._apply_removals(inv, inventory_delta, mover)
831
 
                child_pb.update('Apply phase', 1, 2)
832
 
                modified_paths = self._apply_insertions(inv, inventory_delta,
833
 
                                                        mover)
834
 
            except:
835
 
                mover.rollback()
836
 
                raise
837
 
            else:
838
 
                mover.apply_deletions()
839
 
        finally:
840
 
            child_pb.finished()
841
 
        self._tree.apply_inventory_delta(inventory_delta)
842
 
        self.__done = True
843
 
        self.finalize()
844
 
        return _TransformResults(modified_paths, self.rename_count)
845
 
 
846
 
    def _limbo_name(self, trans_id):
847
 
        """Generate the limbo name of a file"""
848
 
        limbo_name = self._limbo_files.get(trans_id)
849
 
        if limbo_name is not None:
850
 
            return limbo_name
851
 
        parent = self._new_parent.get(trans_id)
852
 
        # if the parent directory is already in limbo (e.g. when building a
853
 
        # tree), choose a limbo name inside the parent, to reduce further
854
 
        # renames.
855
 
        use_direct_path = False
856
 
        if self._new_contents.get(parent) == 'directory':
857
 
            filename = self._new_name.get(trans_id)
858
 
            if filename is not None:
859
 
                if parent not in self._limbo_children:
860
 
                    self._limbo_children[parent] = set()
861
 
                    self._limbo_children_names[parent] = {}
862
 
                    use_direct_path = True
863
 
                # the direct path can only be used if no other file has
864
 
                # already taken this pathname, i.e. if the name is unused, or
865
 
                # if it is already associated with this trans_id.
866
 
                elif (self._limbo_children_names[parent].get(filename)
867
 
                      in (trans_id, None)):
868
 
                    use_direct_path = True
869
 
        if use_direct_path:
870
 
            limbo_name = pathjoin(self._limbo_files[parent], filename)
871
 
            self._limbo_children[parent].add(trans_id)
872
 
            self._limbo_children_names[parent][filename] = trans_id
873
 
        else:
874
 
            limbo_name = pathjoin(self._limbodir, trans_id)
875
 
            self._needs_rename.add(trans_id)
876
 
        self._limbo_files[trans_id] = limbo_name
877
 
        return limbo_name
878
 
 
879
 
    def _apply_removals(self, inv, inventory_delta, mover):
880
 
        """Perform tree operations that remove directory/inventory names.
881
 
        
882
 
        That is, delete files that are to be deleted, and put any files that
883
 
        need renaming into limbo.  This must be done in strict child-to-parent
884
 
        order.
885
 
        """
886
 
        tree_paths = list(self._tree_path_ids.iteritems())
887
 
        tree_paths.sort(reverse=True)
888
 
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
889
 
        try:
890
 
            for num, data in enumerate(tree_paths):
891
 
                path, trans_id = data
892
 
                child_pb.update('removing file', num, len(tree_paths))
893
 
                full_path = self._tree.abspath(path)
894
 
                if trans_id in self._removed_contents:
895
 
                    mover.pre_delete(full_path, os.path.join(self._deletiondir,
896
 
                                     trans_id))
897
 
                elif trans_id in self._new_name or trans_id in \
898
 
                    self._new_parent:
899
 
                    try:
900
 
                        mover.rename(full_path, self._limbo_name(trans_id))
901
 
                    except OSError, e:
902
 
                        if e.errno != errno.ENOENT:
903
 
                            raise
904
 
                    else:
905
 
                        self.rename_count += 1
906
 
                if trans_id in self._removed_id:
907
 
                    if trans_id == self._new_root:
908
 
                        file_id = self._tree.inventory.root.file_id
909
 
                    else:
910
 
                        file_id = self.tree_file_id(trans_id)
911
 
                    assert file_id is not None
912
 
                    inventory_delta.append((path, None, file_id, None))
913
 
        finally:
914
 
            child_pb.finished()
915
 
 
916
 
    def _apply_insertions(self, inv, inventory_delta, mover):
917
 
        """Perform tree operations that insert directory/inventory names.
918
 
        
919
 
        That is, create any files that need to be created, and restore from
920
 
        limbo any files that needed renaming.  This must be done in strict
921
 
        parent-to-child order.
922
 
        """
923
 
        new_paths = self.new_paths()
924
 
        modified_paths = []
925
 
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
926
 
        try:
927
 
            for num, (path, trans_id) in enumerate(new_paths):
928
 
                new_entry = None
929
 
                child_pb.update('adding file', num, len(new_paths))
930
 
                try:
931
 
                    kind = self._new_contents[trans_id]
932
 
                except KeyError:
933
 
                    kind = contents = None
934
 
                if trans_id in self._new_contents or \
935
 
                    self.path_changed(trans_id):
936
 
                    full_path = self._tree.abspath(path)
937
 
                    if trans_id in self._needs_rename:
938
 
                        try:
939
 
                            mover.rename(self._limbo_name(trans_id), full_path)
940
 
                        except OSError, e:
941
 
                            # We may be renaming a dangling inventory id
942
 
                            if e.errno != errno.ENOENT:
943
 
                                raise
944
 
                        else:
945
 
                            self.rename_count += 1
946
 
                    if trans_id in self._new_contents:
947
 
                        modified_paths.append(full_path)
948
 
                        del self._new_contents[trans_id]
949
 
 
950
 
                if trans_id in self._new_id:
951
 
                    if kind is None:
952
 
                        kind = file_kind(self._tree.abspath(path))
953
 
                    if trans_id in self._new_reference_revision:
954
 
                        new_entry = inventory.TreeReference(
955
 
                            self._new_id[trans_id],
956
 
                            self._new_name[trans_id], 
957
 
                            self.final_file_id(self._new_parent[trans_id]),
958
 
                            None, self._new_reference_revision[trans_id])
959
 
                    else:
960
 
                        new_entry = inventory.make_entry(kind,
961
 
                            self.final_name(trans_id),
962
 
                            self.final_file_id(self.final_parent(trans_id)),
963
 
                            self._new_id[trans_id])
964
 
                else:
965
 
                    if trans_id in self._new_name or trans_id in\
966
 
                        self._new_parent or\
967
 
                        trans_id in self._new_executability:
968
 
                        file_id = self.final_file_id(trans_id)
969
 
                        if file_id is not None:
970
 
                            entry = inv[file_id]
971
 
                            new_entry = entry.copy()
972
 
 
973
 
                    if trans_id in self._new_name or trans_id in\
974
 
                        self._new_parent:
975
 
                            if new_entry is not None:
976
 
                                new_entry.name = self.final_name(trans_id)
977
 
                                parent = self.final_parent(trans_id)
978
 
                                parent_id = self.final_file_id(parent)
979
 
                                new_entry.parent_id = parent_id
980
 
 
981
 
                if trans_id in self._new_executability:
982
 
                    self._set_executability(path, new_entry, trans_id)
983
 
                if new_entry is not None:
984
 
                    if new_entry.file_id in inv:
985
 
                        old_path = inv.id2path(new_entry.file_id)
986
 
                    else:
987
 
                        old_path = None
988
 
                    inventory_delta.append((old_path, path,
989
 
                                            new_entry.file_id,
990
 
                                            new_entry))
991
 
        finally:
992
 
            child_pb.finished()
993
 
        return modified_paths
994
 
 
995
 
    def _set_executability(self, path, entry, trans_id):
 
650
 
 
651
    def _set_executability(self, path, trans_id):
996
652
        """Set the executability of versioned files """
997
 
        new_executability = self._new_executability[trans_id]
998
 
        entry.executable = new_executability
999
653
        if supports_executable():
 
654
            new_executability = self._new_executability[trans_id]
1000
655
            abspath = self._tree.abspath(path)
1001
656
            current_mode = os.stat(abspath).st_mode
1002
657
            if new_executability:
1019
674
            self.version_file(file_id, trans_id)
1020
675
        return trans_id
1021
676
 
1022
 
    def new_file(self, name, parent_id, contents, file_id=None, 
 
677
    def new_file(self, name, parent_id, contents, file_id=None,
1023
678
                 executable=None):
1024
679
        """Convenience method to create files.
1025
 
        
 
680
 
1026
681
        name is the name of the file to create.
1027
682
        parent_id is the transaction id of the parent directory of the file.
1028
683
        contents is an iterator of bytestrings, which will be used to produce
1048
703
        """
1049
704
        trans_id = self._new_entry(name, parent_id, file_id)
1050
705
        self.create_directory(trans_id)
1051
 
        return trans_id 
 
706
        return trans_id
1052
707
 
1053
708
    def new_symlink(self, name, parent_id, target, file_id=None):
1054
709
        """Convenience method to create symbolic link.
1055
 
        
 
710
 
1056
711
        name is the name of the symlink to create.
1057
712
        parent_id is the transaction id of the parent directory of the symlink.
1058
713
        target is a bytestring of the target of the symlink.
1097
752
        from_path = self._tree_id_paths.get(from_trans_id)
1098
753
        if from_versioned:
1099
754
            # get data from working tree if versioned
1100
 
            from_entry = self._tree.inventory[file_id]
 
755
            from_entry = self._tree.iter_entries_by_dir([file_id]).next()[1]
1101
756
            from_name = from_entry.name
1102
757
            from_parent = from_entry.parent_id
1103
758
        else:
1139
794
            to_executable = False
1140
795
        return to_name, to_parent, to_kind, to_executable
1141
796
 
1142
 
    def _iter_changes(self):
1143
 
        """Produce output in the same format as Tree._iter_changes.
 
797
    def iter_changes(self):
 
798
        """Produce output in the same format as Tree.iter_changes.
1144
799
 
1145
800
        Will produce nonsensical results if invoked while inventory/filesystem
1146
801
        conflicts (as reported by TreeTransform.find_conflicts()) are present.
1201
856
                   (from_executable, to_executable)))
1202
857
        return iter(sorted(results, key=lambda x:x[1]))
1203
858
 
 
859
    def get_preview_tree(self):
 
860
        """Return a tree representing the result of the transform.
 
861
 
 
862
        The tree is a snapshot, and altering the TreeTransform will invalidate
 
863
        it.
 
864
        """
 
865
        return _PreviewTree(self)
 
866
 
 
867
    def commit(self, branch, message, merge_parents=None, strict=False):
 
868
        """Commit the result of this TreeTransform to a branch.
 
869
 
 
870
        :param branch: The branch to commit to.
 
871
        :param message: The message to attach to the commit.
 
872
        :param merge_parents: Additional parents specified by pending merges.
 
873
        :return: The revision_id of the revision committed.
 
874
        """
 
875
        self._check_malformed()
 
876
        if strict:
 
877
            unversioned = set(self._new_contents).difference(set(self._new_id))
 
878
            for trans_id in unversioned:
 
879
                if self.final_file_id(trans_id) is None:
 
880
                    raise errors.StrictCommitFailed()
 
881
 
 
882
        revno, last_rev_id = branch.last_revision_info()
 
883
        if last_rev_id == _mod_revision.NULL_REVISION:
 
884
            if merge_parents is not None:
 
885
                raise ValueError('Cannot supply merge parents for first'
 
886
                                 ' commit.')
 
887
            parent_ids = []
 
888
        else:
 
889
            parent_ids = [last_rev_id]
 
890
            if merge_parents is not None:
 
891
                parent_ids.extend(merge_parents)
 
892
        if self._tree.get_revision_id() != last_rev_id:
 
893
            raise ValueError('TreeTransform not based on branch basis: %s' %
 
894
                             self._tree.get_revision_id())
 
895
        builder = branch.get_commit_builder(parent_ids)
 
896
        preview = self.get_preview_tree()
 
897
        list(builder.record_iter_changes(preview, last_rev_id,
 
898
                                         self.iter_changes()))
 
899
        builder.finish_inventory()
 
900
        revision_id = builder.commit(message)
 
901
        branch.set_last_revision_info(revno + 1, revision_id)
 
902
        return revision_id
 
903
 
 
904
    def _text_parent(self, trans_id):
 
905
        file_id = self.tree_file_id(trans_id)
 
906
        try:
 
907
            if file_id is None or self._tree.kind(file_id) != 'file':
 
908
                return None
 
909
        except errors.NoSuchFile:
 
910
            return None
 
911
        return file_id
 
912
 
 
913
    def _get_parents_texts(self, trans_id):
 
914
        """Get texts for compression parents of this file."""
 
915
        file_id = self._text_parent(trans_id)
 
916
        if file_id is None:
 
917
            return ()
 
918
        return (self._tree.get_file_text(file_id),)
 
919
 
 
920
    def _get_parents_lines(self, trans_id):
 
921
        """Get lines for compression parents of this file."""
 
922
        file_id = self._text_parent(trans_id)
 
923
        if file_id is None:
 
924
            return ()
 
925
        return (self._tree.get_file_lines(file_id),)
 
926
 
 
927
    def serialize(self, serializer):
 
928
        """Serialize this TreeTransform.
 
929
 
 
930
        :param serializer: A Serialiser like pack.ContainerSerializer.
 
931
        """
 
932
        new_name = dict((k, v.encode('utf-8')) for k, v in
 
933
                        self._new_name.items())
 
934
        new_executability = dict((k, int(v)) for k, v in
 
935
                                 self._new_executability.items())
 
936
        tree_path_ids = dict((k.encode('utf-8'), v)
 
937
                             for k, v in self._tree_path_ids.items())
 
938
        attribs = {
 
939
            '_id_number': self._id_number,
 
940
            '_new_name': new_name,
 
941
            '_new_parent': self._new_parent,
 
942
            '_new_executability': new_executability,
 
943
            '_new_id': self._new_id,
 
944
            '_tree_path_ids': tree_path_ids,
 
945
            '_removed_id': list(self._removed_id),
 
946
            '_removed_contents': list(self._removed_contents),
 
947
            '_non_present_ids': self._non_present_ids,
 
948
            }
 
949
        yield serializer.bytes_record(bencode.bencode(attribs),
 
950
                                      (('attribs',),))
 
951
        for trans_id, kind in self._new_contents.items():
 
952
            if kind == 'file':
 
953
                lines = osutils.chunks_to_lines(
 
954
                    self._read_file_chunks(trans_id))
 
955
                parents = self._get_parents_lines(trans_id)
 
956
                mpdiff = multiparent.MultiParent.from_lines(lines, parents)
 
957
                content = ''.join(mpdiff.to_patch())
 
958
            if kind == 'directory':
 
959
                content = ''
 
960
            if kind == 'symlink':
 
961
                content = self._read_symlink_target(trans_id)
 
962
            yield serializer.bytes_record(content, ((trans_id, kind),))
 
963
 
 
964
    def deserialize(self, records):
 
965
        """Deserialize a stored TreeTransform.
 
966
 
 
967
        :param records: An iterable of (names, content) tuples, as per
 
968
            pack.ContainerPushParser.
 
969
        """
 
970
        names, content = records.next()
 
971
        attribs = bencode.bdecode(content)
 
972
        self._id_number = attribs['_id_number']
 
973
        self._new_name = dict((k, v.decode('utf-8'))
 
974
                            for k, v in attribs['_new_name'].items())
 
975
        self._new_parent = attribs['_new_parent']
 
976
        self._new_executability = dict((k, bool(v)) for k, v in
 
977
            attribs['_new_executability'].items())
 
978
        self._new_id = attribs['_new_id']
 
979
        self._r_new_id = dict((v, k) for k, v in self._new_id.items())
 
980
        self._tree_path_ids = {}
 
981
        self._tree_id_paths = {}
 
982
        for bytepath, trans_id in attribs['_tree_path_ids'].items():
 
983
            path = bytepath.decode('utf-8')
 
984
            self._tree_path_ids[path] = trans_id
 
985
            self._tree_id_paths[trans_id] = path
 
986
        self._removed_id = set(attribs['_removed_id'])
 
987
        self._removed_contents = set(attribs['_removed_contents'])
 
988
        self._non_present_ids = attribs['_non_present_ids']
 
989
        for ((trans_id, kind),), content in records:
 
990
            if kind == 'file':
 
991
                mpdiff = multiparent.MultiParent.from_patch(content)
 
992
                lines = mpdiff.to_lines(self._get_parents_texts(trans_id))
 
993
                self.create_file(lines, trans_id)
 
994
            if kind == 'directory':
 
995
                self.create_directory(trans_id)
 
996
            if kind == 'symlink':
 
997
                self.create_symlink(content.decode('utf-8'), trans_id)
 
998
 
 
999
 
 
1000
class DiskTreeTransform(TreeTransformBase):
 
1001
    """Tree transform storing its contents on disk."""
 
1002
 
 
1003
    def __init__(self, tree, limbodir, pb=DummyProgress(),
 
1004
                 case_sensitive=True):
 
1005
        """Constructor.
 
1006
        :param tree: The tree that will be transformed, but not necessarily
 
1007
            the output tree.
 
1008
        :param limbodir: A directory where new files can be stored until
 
1009
            they are installed in their proper places
 
1010
        :param pb: A ProgressBar indicating how much progress is being made
 
1011
        :param case_sensitive: If True, the target of the transform is
 
1012
            case sensitive, not just case preserving.
 
1013
        """
 
1014
        TreeTransformBase.__init__(self, tree, pb, case_sensitive)
 
1015
        self._limbodir = limbodir
 
1016
        self._deletiondir = None
 
1017
        # A mapping of transform ids to their limbo filename
 
1018
        self._limbo_files = {}
 
1019
        # A mapping of transform ids to a set of the transform ids of children
 
1020
        # that their limbo directory has
 
1021
        self._limbo_children = {}
 
1022
        # Map transform ids to maps of child filename to child transform id
 
1023
        self._limbo_children_names = {}
 
1024
        # List of transform ids that need to be renamed from limbo into place
 
1025
        self._needs_rename = set()
 
1026
 
 
1027
    def finalize(self):
 
1028
        """Release the working tree lock, if held, clean up limbo dir.
 
1029
 
 
1030
        This is required if apply has not been invoked, but can be invoked
 
1031
        even after apply.
 
1032
        """
 
1033
        if self._tree is None:
 
1034
            return
 
1035
        try:
 
1036
            entries = [(self._limbo_name(t), t, k) for t, k in
 
1037
                       self._new_contents.iteritems()]
 
1038
            entries.sort(reverse=True)
 
1039
            for path, trans_id, kind in entries:
 
1040
                delete_any(path)
 
1041
            try:
 
1042
                delete_any(self._limbodir)
 
1043
            except OSError:
 
1044
                # We don't especially care *why* the dir is immortal.
 
1045
                raise ImmortalLimbo(self._limbodir)
 
1046
            try:
 
1047
                if self._deletiondir is not None:
 
1048
                    delete_any(self._deletiondir)
 
1049
            except OSError:
 
1050
                raise errors.ImmortalPendingDeletion(self._deletiondir)
 
1051
        finally:
 
1052
            TreeTransformBase.finalize(self)
 
1053
 
 
1054
    def _limbo_name(self, trans_id):
 
1055
        """Generate the limbo name of a file"""
 
1056
        limbo_name = self._limbo_files.get(trans_id)
 
1057
        if limbo_name is None:
 
1058
            limbo_name = self._generate_limbo_path(trans_id)
 
1059
            self._limbo_files[trans_id] = limbo_name
 
1060
        return limbo_name
 
1061
 
 
1062
    def _generate_limbo_path(self, trans_id):
 
1063
        """Generate a limbo path using the trans_id as the relative path.
 
1064
 
 
1065
        This is suitable as a fallback, and when the transform should not be
 
1066
        sensitive to the path encoding of the limbo directory.
 
1067
        """
 
1068
        self._needs_rename.add(trans_id)
 
1069
        return pathjoin(self._limbodir, trans_id)
 
1070
 
 
1071
    def adjust_path(self, name, parent, trans_id):
 
1072
        previous_parent = self._new_parent.get(trans_id)
 
1073
        previous_name = self._new_name.get(trans_id)
 
1074
        TreeTransformBase.adjust_path(self, name, parent, trans_id)
 
1075
        if (trans_id in self._limbo_files and
 
1076
            trans_id not in self._needs_rename):
 
1077
            self._rename_in_limbo([trans_id])
 
1078
            self._limbo_children[previous_parent].remove(trans_id)
 
1079
            del self._limbo_children_names[previous_parent][previous_name]
 
1080
 
 
1081
    def _rename_in_limbo(self, trans_ids):
 
1082
        """Fix limbo names so that the right final path is produced.
 
1083
 
 
1084
        This means we outsmarted ourselves-- we tried to avoid renaming
 
1085
        these files later by creating them with their final names in their
 
1086
        final parents.  But now the previous name or parent is no longer
 
1087
        suitable, so we have to rename them.
 
1088
 
 
1089
        Even for trans_ids that have no new contents, we must remove their
 
1090
        entries from _limbo_files, because they are now stale.
 
1091
        """
 
1092
        for trans_id in trans_ids:
 
1093
            old_path = self._limbo_files.pop(trans_id)
 
1094
            if trans_id not in self._new_contents:
 
1095
                continue
 
1096
            new_path = self._limbo_name(trans_id)
 
1097
            os.rename(old_path, new_path)
 
1098
 
 
1099
    def create_file(self, contents, trans_id, mode_id=None):
 
1100
        """Schedule creation of a new file.
 
1101
 
 
1102
        See also new_file.
 
1103
 
 
1104
        Contents is an iterator of strings, all of which will be written
 
1105
        to the target destination.
 
1106
 
 
1107
        New file takes the permissions of any existing file with that id,
 
1108
        unless mode_id is specified.
 
1109
        """
 
1110
        name = self._limbo_name(trans_id)
 
1111
        f = open(name, 'wb')
 
1112
        try:
 
1113
            try:
 
1114
                unique_add(self._new_contents, trans_id, 'file')
 
1115
            except:
 
1116
                # Clean up the file, it never got registered so
 
1117
                # TreeTransform.finalize() won't clean it up.
 
1118
                f.close()
 
1119
                os.unlink(name)
 
1120
                raise
 
1121
 
 
1122
            f.writelines(contents)
 
1123
        finally:
 
1124
            f.close()
 
1125
        self._set_mode(trans_id, mode_id, S_ISREG)
 
1126
 
 
1127
    def _read_file_chunks(self, trans_id):
 
1128
        cur_file = open(self._limbo_name(trans_id), 'rb')
 
1129
        try:
 
1130
            return cur_file.readlines()
 
1131
        finally:
 
1132
            cur_file.close()
 
1133
 
 
1134
    def _read_symlink_target(self, trans_id):
 
1135
        return os.readlink(self._limbo_name(trans_id))
 
1136
 
 
1137
    def create_hardlink(self, path, trans_id):
 
1138
        """Schedule creation of a hard link"""
 
1139
        name = self._limbo_name(trans_id)
 
1140
        try:
 
1141
            os.link(path, name)
 
1142
        except OSError, e:
 
1143
            if e.errno != errno.EPERM:
 
1144
                raise
 
1145
            raise errors.HardLinkNotSupported(path)
 
1146
        try:
 
1147
            unique_add(self._new_contents, trans_id, 'file')
 
1148
        except:
 
1149
            # Clean up the file, it never got registered so
 
1150
            # TreeTransform.finalize() won't clean it up.
 
1151
            os.unlink(name)
 
1152
            raise
 
1153
 
 
1154
    def create_directory(self, trans_id):
 
1155
        """Schedule creation of a new directory.
 
1156
 
 
1157
        See also new_directory.
 
1158
        """
 
1159
        os.mkdir(self._limbo_name(trans_id))
 
1160
        unique_add(self._new_contents, trans_id, 'directory')
 
1161
 
 
1162
    def create_symlink(self, target, trans_id):
 
1163
        """Schedule creation of a new symbolic link.
 
1164
 
 
1165
        target is a bytestring.
 
1166
        See also new_symlink.
 
1167
        """
 
1168
        if has_symlinks():
 
1169
            os.symlink(target, self._limbo_name(trans_id))
 
1170
            unique_add(self._new_contents, trans_id, 'symlink')
 
1171
        else:
 
1172
            try:
 
1173
                path = FinalPaths(self).get_path(trans_id)
 
1174
            except KeyError:
 
1175
                path = None
 
1176
            raise UnableCreateSymlink(path=path)
 
1177
 
 
1178
    def cancel_creation(self, trans_id):
 
1179
        """Cancel the creation of new file contents."""
 
1180
        del self._new_contents[trans_id]
 
1181
        children = self._limbo_children.get(trans_id)
 
1182
        # if this is a limbo directory with children, move them before removing
 
1183
        # the directory
 
1184
        if children is not None:
 
1185
            self._rename_in_limbo(children)
 
1186
            del self._limbo_children[trans_id]
 
1187
            del self._limbo_children_names[trans_id]
 
1188
        delete_any(self._limbo_name(trans_id))
 
1189
 
 
1190
 
 
1191
class TreeTransform(DiskTreeTransform):
 
1192
    """Represent a tree transformation.
 
1193
 
 
1194
    This object is designed to support incremental generation of the transform,
 
1195
    in any order.
 
1196
 
 
1197
    However, it gives optimum performance when parent directories are created
 
1198
    before their contents.  The transform is then able to put child files
 
1199
    directly in their parent directory, avoiding later renames.
 
1200
 
 
1201
    It is easy to produce malformed transforms, but they are generally
 
1202
    harmless.  Attempting to apply a malformed transform will cause an
 
1203
    exception to be raised before any modifications are made to the tree.
 
1204
 
 
1205
    Many kinds of malformed transforms can be corrected with the
 
1206
    resolve_conflicts function.  The remaining ones indicate programming error,
 
1207
    such as trying to create a file with no path.
 
1208
 
 
1209
    Two sets of file creation methods are supplied.  Convenience methods are:
 
1210
     * new_file
 
1211
     * new_directory
 
1212
     * new_symlink
 
1213
 
 
1214
    These are composed of the low-level methods:
 
1215
     * create_path
 
1216
     * create_file or create_directory or create_symlink
 
1217
     * version_file
 
1218
     * set_executability
 
1219
 
 
1220
    Transform/Transaction ids
 
1221
    -------------------------
 
1222
    trans_ids are temporary ids assigned to all files involved in a transform.
 
1223
    It's possible, even common, that not all files in the Tree have trans_ids.
 
1224
 
 
1225
    trans_ids are used because filenames and file_ids are not good enough
 
1226
    identifiers; filenames change, and not all files have file_ids.  File-ids
 
1227
    are also associated with trans-ids, so that moving a file moves its
 
1228
    file-id.
 
1229
 
 
1230
    trans_ids are only valid for the TreeTransform that generated them.
 
1231
 
 
1232
    Limbo
 
1233
    -----
 
1234
    Limbo is a temporary directory use to hold new versions of files.
 
1235
    Files are added to limbo by create_file, create_directory, create_symlink,
 
1236
    and their convenience variants (new_*).  Files may be removed from limbo
 
1237
    using cancel_creation.  Files are renamed from limbo into their final
 
1238
    location as part of TreeTransform.apply
 
1239
 
 
1240
    Limbo must be cleaned up, by either calling TreeTransform.apply or
 
1241
    calling TreeTransform.finalize.
 
1242
 
 
1243
    Files are placed into limbo inside their parent directories, where
 
1244
    possible.  This reduces subsequent renames, and makes operations involving
 
1245
    lots of files faster.  This optimization is only possible if the parent
 
1246
    directory is created *before* creating any of its children, so avoid
 
1247
    creating children before parents, where possible.
 
1248
 
 
1249
    Pending-deletion
 
1250
    ----------------
 
1251
    This temporary directory is used by _FileMover for storing files that are
 
1252
    about to be deleted.  In case of rollback, the files will be restored.
 
1253
    FileMover does not delete files until it is sure that a rollback will not
 
1254
    happen.
 
1255
    """
 
1256
    def __init__(self, tree, pb=DummyProgress()):
 
1257
        """Note: a tree_write lock is taken on the tree.
 
1258
 
 
1259
        Use TreeTransform.finalize() to release the lock (can be omitted if
 
1260
        TreeTransform.apply() called).
 
1261
        """
 
1262
        tree.lock_tree_write()
 
1263
 
 
1264
        try:
 
1265
            limbodir = urlutils.local_path_from_url(
 
1266
                tree._transport.abspath('limbo'))
 
1267
            try:
 
1268
                os.mkdir(limbodir)
 
1269
            except OSError, e:
 
1270
                if e.errno == errno.EEXIST:
 
1271
                    raise ExistingLimbo(limbodir)
 
1272
            deletiondir = urlutils.local_path_from_url(
 
1273
                tree._transport.abspath('pending-deletion'))
 
1274
            try:
 
1275
                os.mkdir(deletiondir)
 
1276
            except OSError, e:
 
1277
                if e.errno == errno.EEXIST:
 
1278
                    raise errors.ExistingPendingDeletion(deletiondir)
 
1279
        except:
 
1280
            tree.unlock()
 
1281
            raise
 
1282
 
 
1283
        # Cache of realpath results, to speed up canonical_path
 
1284
        self._realpaths = {}
 
1285
        # Cache of relpath results, to speed up canonical_path
 
1286
        self._relpaths = {}
 
1287
        DiskTreeTransform.__init__(self, tree, limbodir, pb,
 
1288
                                   tree.case_sensitive)
 
1289
        self._deletiondir = deletiondir
 
1290
 
 
1291
    def canonical_path(self, path):
 
1292
        """Get the canonical tree-relative path"""
 
1293
        # don't follow final symlinks
 
1294
        abs = self._tree.abspath(path)
 
1295
        if abs in self._relpaths:
 
1296
            return self._relpaths[abs]
 
1297
        dirname, basename = os.path.split(abs)
 
1298
        if dirname not in self._realpaths:
 
1299
            self._realpaths[dirname] = os.path.realpath(dirname)
 
1300
        dirname = self._realpaths[dirname]
 
1301
        abs = pathjoin(dirname, basename)
 
1302
        if dirname in self._relpaths:
 
1303
            relpath = pathjoin(self._relpaths[dirname], basename)
 
1304
            relpath = relpath.rstrip('/\\')
 
1305
        else:
 
1306
            relpath = self._tree.relpath(abs)
 
1307
        self._relpaths[abs] = relpath
 
1308
        return relpath
 
1309
 
 
1310
    def tree_kind(self, trans_id):
 
1311
        """Determine the file kind in the working tree.
 
1312
 
 
1313
        Raises NoSuchFile if the file does not exist
 
1314
        """
 
1315
        path = self._tree_id_paths.get(trans_id)
 
1316
        if path is None:
 
1317
            raise NoSuchFile(None)
 
1318
        try:
 
1319
            return file_kind(self._tree.abspath(path))
 
1320
        except OSError, e:
 
1321
            if e.errno != errno.ENOENT:
 
1322
                raise
 
1323
            else:
 
1324
                raise NoSuchFile(path)
 
1325
 
 
1326
    def _set_mode(self, trans_id, mode_id, typefunc):
 
1327
        """Set the mode of new file contents.
 
1328
        The mode_id is the existing file to get the mode from (often the same
 
1329
        as trans_id).  The operation is only performed if there's a mode match
 
1330
        according to typefunc.
 
1331
        """
 
1332
        if mode_id is None:
 
1333
            mode_id = trans_id
 
1334
        try:
 
1335
            old_path = self._tree_id_paths[mode_id]
 
1336
        except KeyError:
 
1337
            return
 
1338
        try:
 
1339
            mode = os.stat(self._tree.abspath(old_path)).st_mode
 
1340
        except OSError, e:
 
1341
            if e.errno in (errno.ENOENT, errno.ENOTDIR):
 
1342
                # Either old_path doesn't exist, or the parent of the
 
1343
                # target is not a directory (but will be one eventually)
 
1344
                # Either way, we know it doesn't exist *right now*
 
1345
                # See also bug #248448
 
1346
                return
 
1347
            else:
 
1348
                raise
 
1349
        if typefunc(mode):
 
1350
            os.chmod(self._limbo_name(trans_id), mode)
 
1351
 
 
1352
    def iter_tree_children(self, parent_id):
 
1353
        """Iterate through the entry's tree children, if any"""
 
1354
        try:
 
1355
            path = self._tree_id_paths[parent_id]
 
1356
        except KeyError:
 
1357
            return
 
1358
        try:
 
1359
            children = os.listdir(self._tree.abspath(path))
 
1360
        except OSError, e:
 
1361
            if not (osutils._is_error_enotdir(e)
 
1362
                    or e.errno in (errno.ENOENT, errno.ESRCH)):
 
1363
                raise
 
1364
            return
 
1365
 
 
1366
        for child in children:
 
1367
            childpath = joinpath(path, child)
 
1368
            if self._tree.is_control_filename(childpath):
 
1369
                continue
 
1370
            yield self.trans_id_tree_path(childpath)
 
1371
 
 
1372
    def _generate_limbo_path(self, trans_id):
 
1373
        """Generate a limbo path using the final path if possible.
 
1374
 
 
1375
        This optimizes the performance of applying the tree transform by
 
1376
        avoiding renames.  These renames can be avoided only when the parent
 
1377
        directory is already scheduled for creation.
 
1378
 
 
1379
        If the final path cannot be used, falls back to using the trans_id as
 
1380
        the relpath.
 
1381
        """
 
1382
        parent = self._new_parent.get(trans_id)
 
1383
        # if the parent directory is already in limbo (e.g. when building a
 
1384
        # tree), choose a limbo name inside the parent, to reduce further
 
1385
        # renames.
 
1386
        use_direct_path = False
 
1387
        if self._new_contents.get(parent) == 'directory':
 
1388
            filename = self._new_name.get(trans_id)
 
1389
            if filename is not None:
 
1390
                if parent not in self._limbo_children:
 
1391
                    self._limbo_children[parent] = set()
 
1392
                    self._limbo_children_names[parent] = {}
 
1393
                    use_direct_path = True
 
1394
                # the direct path can only be used if no other file has
 
1395
                # already taken this pathname, i.e. if the name is unused, or
 
1396
                # if it is already associated with this trans_id.
 
1397
                elif self._case_sensitive_target:
 
1398
                    if (self._limbo_children_names[parent].get(filename)
 
1399
                        in (trans_id, None)):
 
1400
                        use_direct_path = True
 
1401
                else:
 
1402
                    for l_filename, l_trans_id in\
 
1403
                        self._limbo_children_names[parent].iteritems():
 
1404
                        if l_trans_id == trans_id:
 
1405
                            continue
 
1406
                        if l_filename.lower() == filename.lower():
 
1407
                            break
 
1408
                    else:
 
1409
                        use_direct_path = True
 
1410
 
 
1411
        if not use_direct_path:
 
1412
            return DiskTreeTransform._generate_limbo_path(self, trans_id)
 
1413
 
 
1414
        limbo_name = pathjoin(self._limbo_files[parent], filename)
 
1415
        self._limbo_children[parent].add(trans_id)
 
1416
        self._limbo_children_names[parent][filename] = trans_id
 
1417
        return limbo_name
 
1418
 
 
1419
 
 
1420
    def apply(self, no_conflicts=False, precomputed_delta=None, _mover=None):
 
1421
        """Apply all changes to the inventory and filesystem.
 
1422
 
 
1423
        If filesystem or inventory conflicts are present, MalformedTransform
 
1424
        will be thrown.
 
1425
 
 
1426
        If apply succeeds, finalize is not necessary.
 
1427
 
 
1428
        :param no_conflicts: if True, the caller guarantees there are no
 
1429
            conflicts, so no check is made.
 
1430
        :param precomputed_delta: An inventory delta to use instead of
 
1431
            calculating one.
 
1432
        :param _mover: Supply an alternate FileMover, for testing
 
1433
        """
 
1434
        if not no_conflicts:
 
1435
            self._check_malformed()
 
1436
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
1437
        try:
 
1438
            if precomputed_delta is None:
 
1439
                child_pb.update('Apply phase', 0, 2)
 
1440
                inventory_delta = self._generate_inventory_delta()
 
1441
                offset = 1
 
1442
            else:
 
1443
                inventory_delta = precomputed_delta
 
1444
                offset = 0
 
1445
            if _mover is None:
 
1446
                mover = _FileMover()
 
1447
            else:
 
1448
                mover = _mover
 
1449
            try:
 
1450
                child_pb.update('Apply phase', 0 + offset, 2 + offset)
 
1451
                self._apply_removals(mover)
 
1452
                child_pb.update('Apply phase', 1 + offset, 2 + offset)
 
1453
                modified_paths = self._apply_insertions(mover)
 
1454
            except:
 
1455
                mover.rollback()
 
1456
                raise
 
1457
            else:
 
1458
                mover.apply_deletions()
 
1459
        finally:
 
1460
            child_pb.finished()
 
1461
        self._tree.apply_inventory_delta(inventory_delta)
 
1462
        self._done = True
 
1463
        self.finalize()
 
1464
        return _TransformResults(modified_paths, self.rename_count)
 
1465
 
 
1466
    def _generate_inventory_delta(self):
 
1467
        """Generate an inventory delta for the current transform."""
 
1468
        inventory_delta = []
 
1469
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
1470
        new_paths = self._inventory_altered()
 
1471
        total_entries = len(new_paths) + len(self._removed_id)
 
1472
        try:
 
1473
            for num, trans_id in enumerate(self._removed_id):
 
1474
                if (num % 10) == 0:
 
1475
                    child_pb.update('removing file', num, total_entries)
 
1476
                if trans_id == self._new_root:
 
1477
                    file_id = self._tree.get_root_id()
 
1478
                else:
 
1479
                    file_id = self.tree_file_id(trans_id)
 
1480
                # File-id isn't really being deleted, just moved
 
1481
                if file_id in self._r_new_id:
 
1482
                    continue
 
1483
                path = self._tree_id_paths[trans_id]
 
1484
                inventory_delta.append((path, None, file_id, None))
 
1485
            new_path_file_ids = dict((t, self.final_file_id(t)) for p, t in
 
1486
                                     new_paths)
 
1487
            entries = self._tree.iter_entries_by_dir(
 
1488
                new_path_file_ids.values())
 
1489
            old_paths = dict((e.file_id, p) for p, e in entries)
 
1490
            final_kinds = {}
 
1491
            for num, (path, trans_id) in enumerate(new_paths):
 
1492
                if (num % 10) == 0:
 
1493
                    child_pb.update('adding file',
 
1494
                                    num + len(self._removed_id), total_entries)
 
1495
                file_id = new_path_file_ids[trans_id]
 
1496
                if file_id is None:
 
1497
                    continue
 
1498
                needs_entry = False
 
1499
                try:
 
1500
                    kind = self.final_kind(trans_id)
 
1501
                except NoSuchFile:
 
1502
                    kind = self._tree.stored_kind(file_id)
 
1503
                parent_trans_id = self.final_parent(trans_id)
 
1504
                parent_file_id = new_path_file_ids.get(parent_trans_id)
 
1505
                if parent_file_id is None:
 
1506
                    parent_file_id = self.final_file_id(parent_trans_id)
 
1507
                if trans_id in self._new_reference_revision:
 
1508
                    new_entry = inventory.TreeReference(
 
1509
                        file_id,
 
1510
                        self._new_name[trans_id],
 
1511
                        self.final_file_id(self._new_parent[trans_id]),
 
1512
                        None, self._new_reference_revision[trans_id])
 
1513
                else:
 
1514
                    new_entry = inventory.make_entry(kind,
 
1515
                        self.final_name(trans_id),
 
1516
                        parent_file_id, file_id)
 
1517
                old_path = old_paths.get(new_entry.file_id)
 
1518
                new_executability = self._new_executability.get(trans_id)
 
1519
                if new_executability is not None:
 
1520
                    new_entry.executable = new_executability
 
1521
                inventory_delta.append(
 
1522
                    (old_path, path, new_entry.file_id, new_entry))
 
1523
        finally:
 
1524
            child_pb.finished()
 
1525
        return inventory_delta
 
1526
 
 
1527
    def _apply_removals(self, mover):
 
1528
        """Perform tree operations that remove directory/inventory names.
 
1529
 
 
1530
        That is, delete files that are to be deleted, and put any files that
 
1531
        need renaming into limbo.  This must be done in strict child-to-parent
 
1532
        order.
 
1533
 
 
1534
        If inventory_delta is None, no inventory delta generation is performed.
 
1535
        """
 
1536
        tree_paths = list(self._tree_path_ids.iteritems())
 
1537
        tree_paths.sort(reverse=True)
 
1538
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
1539
        try:
 
1540
            for num, data in enumerate(tree_paths):
 
1541
                path, trans_id = data
 
1542
                child_pb.update('removing file', num, len(tree_paths))
 
1543
                full_path = self._tree.abspath(path)
 
1544
                if trans_id in self._removed_contents:
 
1545
                    mover.pre_delete(full_path, os.path.join(self._deletiondir,
 
1546
                                     trans_id))
 
1547
                elif trans_id in self._new_name or trans_id in \
 
1548
                    self._new_parent:
 
1549
                    try:
 
1550
                        mover.rename(full_path, self._limbo_name(trans_id))
 
1551
                    except OSError, e:
 
1552
                        if e.errno != errno.ENOENT:
 
1553
                            raise
 
1554
                    else:
 
1555
                        self.rename_count += 1
 
1556
        finally:
 
1557
            child_pb.finished()
 
1558
 
 
1559
    def _apply_insertions(self, mover):
 
1560
        """Perform tree operations that insert directory/inventory names.
 
1561
 
 
1562
        That is, create any files that need to be created, and restore from
 
1563
        limbo any files that needed renaming.  This must be done in strict
 
1564
        parent-to-child order.
 
1565
 
 
1566
        If inventory_delta is None, no inventory delta is calculated, and
 
1567
        no list of modified paths is returned.
 
1568
        """
 
1569
        new_paths = self.new_paths(filesystem_only=True)
 
1570
        modified_paths = []
 
1571
        new_path_file_ids = dict((t, self.final_file_id(t)) for p, t in
 
1572
                                 new_paths)
 
1573
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
1574
        try:
 
1575
            for num, (path, trans_id) in enumerate(new_paths):
 
1576
                if (num % 10) == 0:
 
1577
                    child_pb.update('adding file', num, len(new_paths))
 
1578
                full_path = self._tree.abspath(path)
 
1579
                if trans_id in self._needs_rename:
 
1580
                    try:
 
1581
                        mover.rename(self._limbo_name(trans_id), full_path)
 
1582
                    except OSError, e:
 
1583
                        # We may be renaming a dangling inventory id
 
1584
                        if e.errno != errno.ENOENT:
 
1585
                            raise
 
1586
                    else:
 
1587
                        self.rename_count += 1
 
1588
                if (trans_id in self._new_contents or
 
1589
                    self.path_changed(trans_id)):
 
1590
                    if trans_id in self._new_contents:
 
1591
                        modified_paths.append(full_path)
 
1592
                if trans_id in self._new_executability:
 
1593
                    self._set_executability(path, trans_id)
 
1594
        finally:
 
1595
            child_pb.finished()
 
1596
        self._new_contents.clear()
 
1597
        return modified_paths
 
1598
 
 
1599
 
 
1600
class TransformPreview(DiskTreeTransform):
 
1601
    """A TreeTransform for generating preview trees.
 
1602
 
 
1603
    Unlike TreeTransform, this version works when the input tree is a
 
1604
    RevisionTree, rather than a WorkingTree.  As a result, it tends to ignore
 
1605
    unversioned files in the input tree.
 
1606
    """
 
1607
 
 
1608
    def __init__(self, tree, pb=DummyProgress(), case_sensitive=True):
 
1609
        tree.lock_read()
 
1610
        limbodir = osutils.mkdtemp(prefix='bzr-limbo-')
 
1611
        DiskTreeTransform.__init__(self, tree, limbodir, pb, case_sensitive)
 
1612
 
 
1613
    def canonical_path(self, path):
 
1614
        return path
 
1615
 
 
1616
    def tree_kind(self, trans_id):
 
1617
        path = self._tree_id_paths.get(trans_id)
 
1618
        if path is None:
 
1619
            raise NoSuchFile(None)
 
1620
        file_id = self._tree.path2id(path)
 
1621
        return self._tree.kind(file_id)
 
1622
 
 
1623
    def _set_mode(self, trans_id, mode_id, typefunc):
 
1624
        """Set the mode of new file contents.
 
1625
        The mode_id is the existing file to get the mode from (often the same
 
1626
        as trans_id).  The operation is only performed if there's a mode match
 
1627
        according to typefunc.
 
1628
        """
 
1629
        # is it ok to ignore this?  probably
 
1630
        pass
 
1631
 
 
1632
    def iter_tree_children(self, parent_id):
 
1633
        """Iterate through the entry's tree children, if any"""
 
1634
        try:
 
1635
            path = self._tree_id_paths[parent_id]
 
1636
        except KeyError:
 
1637
            return
 
1638
        file_id = self.tree_file_id(parent_id)
 
1639
        if file_id is None:
 
1640
            return
 
1641
        entry = self._tree.iter_entries_by_dir([file_id]).next()[1]
 
1642
        children = getattr(entry, 'children', {})
 
1643
        for child in children:
 
1644
            childpath = joinpath(path, child)
 
1645
            yield self.trans_id_tree_path(childpath)
 
1646
 
 
1647
 
 
1648
class _PreviewTree(tree.Tree):
 
1649
    """Partial implementation of Tree to support show_diff_trees"""
 
1650
 
 
1651
    def __init__(self, transform):
 
1652
        self._transform = transform
 
1653
        self._final_paths = FinalPaths(transform)
 
1654
        self.__by_parent = None
 
1655
        self._parent_ids = []
 
1656
        self._all_children_cache = {}
 
1657
        self._path2trans_id_cache = {}
 
1658
        self._final_name_cache = {}
 
1659
        self._iter_changes_cache = dict((c[0], c) for c in
 
1660
                                        self._transform.iter_changes())
 
1661
 
 
1662
    def _content_change(self, file_id):
 
1663
        """Return True if the content of this file changed"""
 
1664
        changes = self._iter_changes_cache.get(file_id)
 
1665
        # changes[2] is true if the file content changed.  See
 
1666
        # InterTree.iter_changes.
 
1667
        return (changes is not None and changes[2])
 
1668
 
 
1669
    def _get_repository(self):
 
1670
        repo = getattr(self._transform._tree, '_repository', None)
 
1671
        if repo is None:
 
1672
            repo = self._transform._tree.branch.repository
 
1673
        return repo
 
1674
 
 
1675
    def _iter_parent_trees(self):
 
1676
        for revision_id in self.get_parent_ids():
 
1677
            try:
 
1678
                yield self.revision_tree(revision_id)
 
1679
            except errors.NoSuchRevisionInTree:
 
1680
                yield self._get_repository().revision_tree(revision_id)
 
1681
 
 
1682
    def _get_file_revision(self, file_id, vf, tree_revision):
 
1683
        parent_keys = [(file_id, self._file_revision(t, file_id)) for t in
 
1684
                       self._iter_parent_trees()]
 
1685
        vf.add_lines((file_id, tree_revision), parent_keys,
 
1686
                     self.get_file(file_id).readlines())
 
1687
        repo = self._get_repository()
 
1688
        base_vf = repo.texts
 
1689
        if base_vf not in vf.fallback_versionedfiles:
 
1690
            vf.fallback_versionedfiles.append(base_vf)
 
1691
        return tree_revision
 
1692
 
 
1693
    def _stat_limbo_file(self, file_id):
 
1694
        trans_id = self._transform.trans_id_file_id(file_id)
 
1695
        name = self._transform._limbo_name(trans_id)
 
1696
        return os.lstat(name)
 
1697
 
 
1698
    @property
 
1699
    def _by_parent(self):
 
1700
        if self.__by_parent is None:
 
1701
            self.__by_parent = self._transform.by_parent()
 
1702
        return self.__by_parent
 
1703
 
 
1704
    def _comparison_data(self, entry, path):
 
1705
        kind, size, executable, link_or_sha1 = self.path_content_summary(path)
 
1706
        if kind == 'missing':
 
1707
            kind = None
 
1708
            executable = False
 
1709
        else:
 
1710
            file_id = self._transform.final_file_id(self._path2trans_id(path))
 
1711
            executable = self.is_executable(file_id, path)
 
1712
        return kind, executable, None
 
1713
 
 
1714
    def lock_read(self):
 
1715
        # Perhaps in theory, this should lock the TreeTransform?
 
1716
        pass
 
1717
 
 
1718
    def unlock(self):
 
1719
        pass
 
1720
 
 
1721
    @property
 
1722
    def inventory(self):
 
1723
        """This Tree does not use inventory as its backing data."""
 
1724
        raise NotImplementedError(_PreviewTree.inventory)
 
1725
 
 
1726
    def get_root_id(self):
 
1727
        return self._transform.final_file_id(self._transform.root)
 
1728
 
 
1729
    def all_file_ids(self):
 
1730
        tree_ids = set(self._transform._tree.all_file_ids())
 
1731
        tree_ids.difference_update(self._transform.tree_file_id(t)
 
1732
                                   for t in self._transform._removed_id)
 
1733
        tree_ids.update(self._transform._new_id.values())
 
1734
        return tree_ids
 
1735
 
 
1736
    def __iter__(self):
 
1737
        return iter(self.all_file_ids())
 
1738
 
 
1739
    def _has_id(self, file_id, fallback_check):
 
1740
        if file_id in self._transform._r_new_id:
 
1741
            return True
 
1742
        elif file_id in set([self._transform.tree_file_id(trans_id) for
 
1743
            trans_id in self._transform._removed_id]):
 
1744
            return False
 
1745
        else:
 
1746
            return fallback_check(file_id)
 
1747
 
 
1748
    def has_id(self, file_id):
 
1749
        return self._has_id(file_id, self._transform._tree.has_id)
 
1750
 
 
1751
    def has_or_had_id(self, file_id):
 
1752
        return self._has_id(file_id, self._transform._tree.has_or_had_id)
 
1753
 
 
1754
    def _path2trans_id(self, path):
 
1755
        # We must not use None here, because that is a valid value to store.
 
1756
        trans_id = self._path2trans_id_cache.get(path, object)
 
1757
        if trans_id is not object:
 
1758
            return trans_id
 
1759
        segments = splitpath(path)
 
1760
        cur_parent = self._transform.root
 
1761
        for cur_segment in segments:
 
1762
            for child in self._all_children(cur_parent):
 
1763
                final_name = self._final_name_cache.get(child)
 
1764
                if final_name is None:
 
1765
                    final_name = self._transform.final_name(child)
 
1766
                    self._final_name_cache[child] = final_name
 
1767
                if final_name == cur_segment:
 
1768
                    cur_parent = child
 
1769
                    break
 
1770
            else:
 
1771
                self._path2trans_id_cache[path] = None
 
1772
                return None
 
1773
        self._path2trans_id_cache[path] = cur_parent
 
1774
        return cur_parent
 
1775
 
 
1776
    def path2id(self, path):
 
1777
        return self._transform.final_file_id(self._path2trans_id(path))
 
1778
 
 
1779
    def id2path(self, file_id):
 
1780
        trans_id = self._transform.trans_id_file_id(file_id)
 
1781
        try:
 
1782
            return self._final_paths._determine_path(trans_id)
 
1783
        except NoFinalPath:
 
1784
            raise errors.NoSuchId(self, file_id)
 
1785
 
 
1786
    def _all_children(self, trans_id):
 
1787
        children = self._all_children_cache.get(trans_id)
 
1788
        if children is not None:
 
1789
            return children
 
1790
        children = set(self._transform.iter_tree_children(trans_id))
 
1791
        # children in the _new_parent set are provided by _by_parent.
 
1792
        children.difference_update(self._transform._new_parent.keys())
 
1793
        children.update(self._by_parent.get(trans_id, []))
 
1794
        self._all_children_cache[trans_id] = children
 
1795
        return children
 
1796
 
 
1797
    def iter_children(self, file_id):
 
1798
        trans_id = self._transform.trans_id_file_id(file_id)
 
1799
        for child_trans_id in self._all_children(trans_id):
 
1800
            yield self._transform.final_file_id(child_trans_id)
 
1801
 
 
1802
    def extras(self):
 
1803
        possible_extras = set(self._transform.trans_id_tree_path(p) for p
 
1804
                              in self._transform._tree.extras())
 
1805
        possible_extras.update(self._transform._new_contents)
 
1806
        possible_extras.update(self._transform._removed_id)
 
1807
        for trans_id in possible_extras:
 
1808
            if self._transform.final_file_id(trans_id) is None:
 
1809
                yield self._final_paths._determine_path(trans_id)
 
1810
 
 
1811
    def _make_inv_entries(self, ordered_entries, specific_file_ids=None,
 
1812
        yield_parents=False):
 
1813
        for trans_id, parent_file_id in ordered_entries:
 
1814
            file_id = self._transform.final_file_id(trans_id)
 
1815
            if file_id is None:
 
1816
                continue
 
1817
            if (specific_file_ids is not None
 
1818
                and file_id not in specific_file_ids):
 
1819
                continue
 
1820
            try:
 
1821
                kind = self._transform.final_kind(trans_id)
 
1822
            except NoSuchFile:
 
1823
                kind = self._transform._tree.stored_kind(file_id)
 
1824
            new_entry = inventory.make_entry(
 
1825
                kind,
 
1826
                self._transform.final_name(trans_id),
 
1827
                parent_file_id, file_id)
 
1828
            yield new_entry, trans_id
 
1829
 
 
1830
    def _list_files_by_dir(self):
 
1831
        todo = [ROOT_PARENT]
 
1832
        ordered_ids = []
 
1833
        while len(todo) > 0:
 
1834
            parent = todo.pop()
 
1835
            parent_file_id = self._transform.final_file_id(parent)
 
1836
            children = list(self._all_children(parent))
 
1837
            paths = dict(zip(children, self._final_paths.get_paths(children)))
 
1838
            children.sort(key=paths.get)
 
1839
            todo.extend(reversed(children))
 
1840
            for trans_id in children:
 
1841
                ordered_ids.append((trans_id, parent_file_id))
 
1842
        return ordered_ids
 
1843
 
 
1844
    def iter_entries_by_dir(self, specific_file_ids=None, yield_parents=False):
 
1845
        # This may not be a maximally efficient implementation, but it is
 
1846
        # reasonably straightforward.  An implementation that grafts the
 
1847
        # TreeTransform changes onto the tree's iter_entries_by_dir results
 
1848
        # might be more efficient, but requires tricky inferences about stack
 
1849
        # position.
 
1850
        ordered_ids = self._list_files_by_dir()
 
1851
        for entry, trans_id in self._make_inv_entries(ordered_ids,
 
1852
            specific_file_ids, yield_parents=yield_parents):
 
1853
            yield unicode(self._final_paths.get_path(trans_id)), entry
 
1854
 
 
1855
    def _iter_entries_for_dir(self, dir_path):
 
1856
        """Return path, entry for items in a directory without recursing down."""
 
1857
        dir_file_id = self.path2id(dir_path)
 
1858
        ordered_ids = []
 
1859
        for file_id in self.iter_children(dir_file_id):
 
1860
            trans_id = self._transform.trans_id_file_id(file_id)
 
1861
            ordered_ids.append((trans_id, file_id))
 
1862
        for entry, trans_id in self._make_inv_entries(ordered_ids):
 
1863
            yield unicode(self._final_paths.get_path(trans_id)), entry
 
1864
 
 
1865
    def list_files(self, include_root=False, from_dir=None, recursive=True):
 
1866
        """See WorkingTree.list_files."""
 
1867
        # XXX This should behave like WorkingTree.list_files, but is really
 
1868
        # more like RevisionTree.list_files.
 
1869
        if recursive:
 
1870
            prefix = None
 
1871
            if from_dir:
 
1872
                prefix = from_dir + '/'
 
1873
            entries = self.iter_entries_by_dir()
 
1874
            for path, entry in entries:
 
1875
                if entry.name == '' and not include_root:
 
1876
                    continue
 
1877
                if prefix:
 
1878
                    if not path.startswith(prefix):
 
1879
                        continue
 
1880
                    path = path[len(prefix):]
 
1881
                yield path, 'V', entry.kind, entry.file_id, entry
 
1882
        else:
 
1883
            if from_dir is None and include_root is True:
 
1884
                root_entry = inventory.make_entry('directory', '',
 
1885
                    ROOT_PARENT, self.get_root_id())
 
1886
                yield '', 'V', 'directory', root_entry.file_id, root_entry
 
1887
            entries = self._iter_entries_for_dir(from_dir or '')
 
1888
            for path, entry in entries:
 
1889
                yield path, 'V', entry.kind, entry.file_id, entry
 
1890
 
 
1891
    def kind(self, file_id):
 
1892
        trans_id = self._transform.trans_id_file_id(file_id)
 
1893
        return self._transform.final_kind(trans_id)
 
1894
 
 
1895
    def stored_kind(self, file_id):
 
1896
        trans_id = self._transform.trans_id_file_id(file_id)
 
1897
        try:
 
1898
            return self._transform._new_contents[trans_id]
 
1899
        except KeyError:
 
1900
            return self._transform._tree.stored_kind(file_id)
 
1901
 
 
1902
    def get_file_mtime(self, file_id, path=None):
 
1903
        """See Tree.get_file_mtime"""
 
1904
        if not self._content_change(file_id):
 
1905
            return self._transform._tree.get_file_mtime(file_id, path)
 
1906
        return self._stat_limbo_file(file_id).st_mtime
 
1907
 
 
1908
    def _file_size(self, entry, stat_value):
 
1909
        return self.get_file_size(entry.file_id)
 
1910
 
 
1911
    def get_file_size(self, file_id):
 
1912
        """See Tree.get_file_size"""
 
1913
        if self.kind(file_id) == 'file':
 
1914
            return self._transform._tree.get_file_size(file_id)
 
1915
        else:
 
1916
            return None
 
1917
 
 
1918
    def get_file_sha1(self, file_id, path=None, stat_value=None):
 
1919
        trans_id = self._transform.trans_id_file_id(file_id)
 
1920
        kind = self._transform._new_contents.get(trans_id)
 
1921
        if kind is None:
 
1922
            return self._transform._tree.get_file_sha1(file_id)
 
1923
        if kind == 'file':
 
1924
            fileobj = self.get_file(file_id)
 
1925
            try:
 
1926
                return sha_file(fileobj)
 
1927
            finally:
 
1928
                fileobj.close()
 
1929
 
 
1930
    def is_executable(self, file_id, path=None):
 
1931
        if file_id is None:
 
1932
            return False
 
1933
        trans_id = self._transform.trans_id_file_id(file_id)
 
1934
        try:
 
1935
            return self._transform._new_executability[trans_id]
 
1936
        except KeyError:
 
1937
            try:
 
1938
                return self._transform._tree.is_executable(file_id, path)
 
1939
            except OSError, e:
 
1940
                if e.errno == errno.ENOENT:
 
1941
                    return False
 
1942
                raise
 
1943
            except errors.NoSuchId:
 
1944
                return False
 
1945
 
 
1946
    def path_content_summary(self, path):
 
1947
        trans_id = self._path2trans_id(path)
 
1948
        tt = self._transform
 
1949
        tree_path = tt._tree_id_paths.get(trans_id)
 
1950
        kind = tt._new_contents.get(trans_id)
 
1951
        if kind is None:
 
1952
            if tree_path is None or trans_id in tt._removed_contents:
 
1953
                return 'missing', None, None, None
 
1954
            summary = tt._tree.path_content_summary(tree_path)
 
1955
            kind, size, executable, link_or_sha1 = summary
 
1956
        else:
 
1957
            link_or_sha1 = None
 
1958
            limbo_name = tt._limbo_name(trans_id)
 
1959
            if trans_id in tt._new_reference_revision:
 
1960
                kind = 'tree-reference'
 
1961
            if kind == 'file':
 
1962
                statval = os.lstat(limbo_name)
 
1963
                size = statval.st_size
 
1964
                if not supports_executable():
 
1965
                    executable = None
 
1966
                else:
 
1967
                    executable = statval.st_mode & S_IEXEC
 
1968
            else:
 
1969
                size = None
 
1970
                executable = None
 
1971
            if kind == 'symlink':
 
1972
                link_or_sha1 = os.readlink(limbo_name).decode(osutils._fs_enc)
 
1973
        if supports_executable():
 
1974
            executable = tt._new_executability.get(trans_id, executable)
 
1975
        return kind, size, executable, link_or_sha1
 
1976
 
 
1977
    def iter_changes(self, from_tree, include_unchanged=False,
 
1978
                      specific_files=None, pb=None, extra_trees=None,
 
1979
                      require_versioned=True, want_unversioned=False):
 
1980
        """See InterTree.iter_changes.
 
1981
 
 
1982
        This has a fast path that is only used when the from_tree matches
 
1983
        the transform tree, and no fancy options are supplied.
 
1984
        """
 
1985
        if (from_tree is not self._transform._tree or include_unchanged or
 
1986
            specific_files or want_unversioned):
 
1987
            return tree.InterTree(from_tree, self).iter_changes(
 
1988
                include_unchanged=include_unchanged,
 
1989
                specific_files=specific_files,
 
1990
                pb=pb,
 
1991
                extra_trees=extra_trees,
 
1992
                require_versioned=require_versioned,
 
1993
                want_unversioned=want_unversioned)
 
1994
        if want_unversioned:
 
1995
            raise ValueError('want_unversioned is not supported')
 
1996
        return self._transform.iter_changes()
 
1997
 
 
1998
    def get_file(self, file_id, path=None):
 
1999
        """See Tree.get_file"""
 
2000
        if not self._content_change(file_id):
 
2001
            return self._transform._tree.get_file(file_id, path)
 
2002
        trans_id = self._transform.trans_id_file_id(file_id)
 
2003
        name = self._transform._limbo_name(trans_id)
 
2004
        return open(name, 'rb')
 
2005
 
 
2006
    def get_file_with_stat(self, file_id, path=None):
 
2007
        return self.get_file(file_id, path), None
 
2008
 
 
2009
    def annotate_iter(self, file_id,
 
2010
                      default_revision=_mod_revision.CURRENT_REVISION):
 
2011
        changes = self._iter_changes_cache.get(file_id)
 
2012
        if changes is None:
 
2013
            get_old = True
 
2014
        else:
 
2015
            changed_content, versioned, kind = (changes[2], changes[3],
 
2016
                                                changes[6])
 
2017
            if kind[1] is None:
 
2018
                return None
 
2019
            get_old = (kind[0] == 'file' and versioned[0])
 
2020
        if get_old:
 
2021
            old_annotation = self._transform._tree.annotate_iter(file_id,
 
2022
                default_revision=default_revision)
 
2023
        else:
 
2024
            old_annotation = []
 
2025
        if changes is None:
 
2026
            return old_annotation
 
2027
        if not changed_content:
 
2028
            return old_annotation
 
2029
        # TODO: This is doing something similar to what WT.annotate_iter is
 
2030
        #       doing, however it fails slightly because it doesn't know what
 
2031
        #       the *other* revision_id is, so it doesn't know how to give the
 
2032
        #       other as the origin for some lines, they all get
 
2033
        #       'default_revision'
 
2034
        #       It would be nice to be able to use the new Annotator based
 
2035
        #       approach, as well.
 
2036
        return annotate.reannotate([old_annotation],
 
2037
                                   self.get_file(file_id).readlines(),
 
2038
                                   default_revision)
 
2039
 
 
2040
    def get_symlink_target(self, file_id):
 
2041
        """See Tree.get_symlink_target"""
 
2042
        if not self._content_change(file_id):
 
2043
            return self._transform._tree.get_symlink_target(file_id)
 
2044
        trans_id = self._transform.trans_id_file_id(file_id)
 
2045
        name = self._transform._limbo_name(trans_id)
 
2046
        return osutils.readlink(name)
 
2047
 
 
2048
    def walkdirs(self, prefix=''):
 
2049
        pending = [self._transform.root]
 
2050
        while len(pending) > 0:
 
2051
            parent_id = pending.pop()
 
2052
            children = []
 
2053
            subdirs = []
 
2054
            prefix = prefix.rstrip('/')
 
2055
            parent_path = self._final_paths.get_path(parent_id)
 
2056
            parent_file_id = self._transform.final_file_id(parent_id)
 
2057
            for child_id in self._all_children(parent_id):
 
2058
                path_from_root = self._final_paths.get_path(child_id)
 
2059
                basename = self._transform.final_name(child_id)
 
2060
                file_id = self._transform.final_file_id(child_id)
 
2061
                try:
 
2062
                    kind = self._transform.final_kind(child_id)
 
2063
                    versioned_kind = kind
 
2064
                except NoSuchFile:
 
2065
                    kind = 'unknown'
 
2066
                    versioned_kind = self._transform._tree.stored_kind(file_id)
 
2067
                if versioned_kind == 'directory':
 
2068
                    subdirs.append(child_id)
 
2069
                children.append((path_from_root, basename, kind, None,
 
2070
                                 file_id, versioned_kind))
 
2071
            children.sort()
 
2072
            if parent_path.startswith(prefix):
 
2073
                yield (parent_path, parent_file_id), children
 
2074
            pending.extend(sorted(subdirs, key=self._final_paths.get_path,
 
2075
                                  reverse=True))
 
2076
 
 
2077
    def get_parent_ids(self):
 
2078
        return self._parent_ids
 
2079
 
 
2080
    def set_parent_ids(self, parent_ids):
 
2081
        self._parent_ids = parent_ids
 
2082
 
 
2083
    def get_revision_tree(self, revision_id):
 
2084
        return self._transform._tree.get_revision_tree(revision_id)
 
2085
 
1204
2086
 
1205
2087
def joinpath(parent, child):
1206
2088
    """Join tree-relative paths, handling the tree root specially"""
1222
2104
        self.transform = transform
1223
2105
 
1224
2106
    def _determine_path(self, trans_id):
1225
 
        if trans_id == self.transform.root:
 
2107
        if (trans_id == self.transform.root or trans_id == ROOT_PARENT):
1226
2108
            return ""
1227
2109
        name = self.transform.final_name(trans_id)
1228
2110
        parent_id = self.transform.final_parent(trans_id)
1237
2119
            self._known_paths[trans_id] = self._determine_path(trans_id)
1238
2120
        return self._known_paths[trans_id]
1239
2121
 
 
2122
    def get_paths(self, trans_ids):
 
2123
        return [(self.get_path(t), t) for t in trans_ids]
 
2124
 
 
2125
 
 
2126
 
1240
2127
def topology_sorted_ids(tree):
1241
2128
    """Determine the topological order of the ids in a tree"""
1242
2129
    file_ids = list(tree)
1244
2131
    return file_ids
1245
2132
 
1246
2133
 
1247
 
def build_tree(tree, wt):
 
2134
def build_tree(tree, wt, accelerator_tree=None, hardlink=False,
 
2135
               delta_from_tree=False):
1248
2136
    """Create working tree for a branch, using a TreeTransform.
1249
 
    
 
2137
 
1250
2138
    This function should be used on empty trees, having a tree root at most.
1251
2139
    (see merge and revert functionality for working with existing trees)
1252
2140
 
1253
2141
    Existing files are handled like so:
1254
 
    
 
2142
 
1255
2143
    - Existing bzrdirs take precedence over creating new items.  They are
1256
2144
      created as '%s.diverted' % name.
1257
2145
    - Otherwise, if the content on disk matches the content we are building,
1258
2146
      it is silently replaced.
1259
2147
    - Otherwise, conflict resolution will move the old file to 'oldname.moved'.
 
2148
 
 
2149
    :param tree: The tree to convert wt into a copy of
 
2150
    :param wt: The working tree that files will be placed into
 
2151
    :param accelerator_tree: A tree which can be used for retrieving file
 
2152
        contents more quickly than tree itself, i.e. a workingtree.  tree
 
2153
        will be used for cases where accelerator_tree's content is different.
 
2154
    :param hardlink: If true, hard-link files to accelerator_tree, where
 
2155
        possible.  accelerator_tree must implement abspath, i.e. be a
 
2156
        working tree.
 
2157
    :param delta_from_tree: If true, build_tree may use the input Tree to
 
2158
        generate the inventory delta.
1260
2159
    """
1261
2160
    wt.lock_tree_write()
1262
2161
    try:
1263
2162
        tree.lock_read()
1264
2163
        try:
1265
 
            return _build_tree(tree, wt)
 
2164
            if accelerator_tree is not None:
 
2165
                accelerator_tree.lock_read()
 
2166
            try:
 
2167
                return _build_tree(tree, wt, accelerator_tree, hardlink,
 
2168
                                   delta_from_tree)
 
2169
            finally:
 
2170
                if accelerator_tree is not None:
 
2171
                    accelerator_tree.unlock()
1266
2172
        finally:
1267
2173
            tree.unlock()
1268
2174
    finally:
1269
2175
        wt.unlock()
1270
2176
 
1271
 
def _build_tree(tree, wt):
 
2177
 
 
2178
def _build_tree(tree, wt, accelerator_tree, hardlink, delta_from_tree):
1272
2179
    """See build_tree."""
1273
 
    if len(wt.inventory) > 1:  # more than just a root
1274
 
        raise errors.WorkingTreeAlreadyPopulated(base=wt.basedir)
 
2180
    for num, _unused in enumerate(wt.all_file_ids()):
 
2181
        if num > 0:  # more than just a root
 
2182
            raise errors.WorkingTreeAlreadyPopulated(base=wt.basedir)
 
2183
    existing_files = set()
 
2184
    for dir, files in wt.walkdirs():
 
2185
        existing_files.update(f[0] for f in files)
1275
2186
    file_trans_id = {}
1276
2187
    top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1277
2188
    pp = ProgressPhase("Build phase", 2, top_pb)
1283
2194
        # is set within the tree, nor setting the root and thus
1284
2195
        # marking the tree as dirty, because we use two different
1285
2196
        # idioms here: tree interfaces and inventory interfaces.
1286
 
        if wt.path2id('') != tree.inventory.root.file_id:
1287
 
            wt.set_root_id(tree.inventory.root.file_id)
 
2197
        if wt.get_root_id() != tree.get_root_id():
 
2198
            wt.set_root_id(tree.get_root_id())
1288
2199
            wt.flush()
1289
2200
    tt = TreeTransform(wt)
1290
2201
    divert = set()
1295
2206
        pb = bzrlib.ui.ui_factory.nested_progress_bar()
1296
2207
        try:
1297
2208
            deferred_contents = []
 
2209
            num = 0
 
2210
            total = len(tree.inventory)
 
2211
            if delta_from_tree:
 
2212
                precomputed_delta = []
 
2213
            else:
 
2214
                precomputed_delta = None
1298
2215
            for num, (tree_path, entry) in \
1299
2216
                enumerate(tree.inventory.iter_entries_by_dir()):
1300
 
                pb.update("Building tree", num - len(deferred_contents),
1301
 
                          len(tree.inventory))
 
2217
                pb.update("Building tree", num - len(deferred_contents), total)
1302
2218
                if entry.parent_id is None:
1303
2219
                    continue
1304
2220
                reparent = False
1305
2221
                file_id = entry.file_id
1306
 
                target_path = wt.abspath(tree_path)
1307
 
                try:
 
2222
                if delta_from_tree:
 
2223
                    precomputed_delta.append((None, tree_path, file_id, entry))
 
2224
                if tree_path in existing_files:
 
2225
                    target_path = wt.abspath(tree_path)
1308
2226
                    kind = file_kind(target_path)
1309
 
                except NoSuchFile:
1310
 
                    pass
1311
 
                else:
1312
2227
                    if kind == "directory":
1313
2228
                        try:
1314
2229
                            bzrdir.BzrDir.open(target_path)
1322
2237
                        tt.delete_contents(tt.trans_id_tree_path(tree_path))
1323
2238
                        if kind == 'directory':
1324
2239
                            reparent = True
1325
 
                if entry.parent_id not in file_trans_id:
1326
 
                    raise AssertionError(
1327
 
                        'entry %s parent id %r is not in file_trans_id %r'
1328
 
                        % (entry, entry.parent_id, file_trans_id))
1329
2240
                parent_id = file_trans_id[entry.parent_id]
1330
2241
                if entry.kind == 'file':
1331
2242
                    # We *almost* replicate new_by_entry, so that we can defer
1332
2243
                    # getting the file text, and get them all at once.
1333
2244
                    trans_id = tt.create_path(entry.name, parent_id)
1334
2245
                    file_trans_id[file_id] = trans_id
1335
 
                    tt.version_file(entry.file_id, trans_id)
1336
 
                    executable = tree.is_executable(entry.file_id, tree_path)
1337
 
                    if executable is not None:
 
2246
                    tt.version_file(file_id, trans_id)
 
2247
                    executable = tree.is_executable(file_id, tree_path)
 
2248
                    if executable:
1338
2249
                        tt.set_executability(executable, trans_id)
1339
 
                    deferred_contents.append((entry.file_id, trans_id))
 
2250
                    trans_data = (trans_id, tree_path)
 
2251
                    deferred_contents.append((file_id, trans_data))
1340
2252
                else:
1341
2253
                    file_trans_id[file_id] = new_by_entry(tt, entry, parent_id,
1342
2254
                                                          tree)
1344
2256
                    new_trans_id = file_trans_id[file_id]
1345
2257
                    old_parent = tt.trans_id_tree_path(tree_path)
1346
2258
                    _reparent_children(tt, old_parent, new_trans_id)
1347
 
            for num, (trans_id, bytes) in enumerate(
1348
 
                tree.iter_files_bytes(deferred_contents)):
1349
 
                tt.create_file(bytes, trans_id)
1350
 
                pb.update('Adding file contents',
1351
 
                          (num + len(tree.inventory) - len(deferred_contents)),
1352
 
                          len(tree.inventory))
 
2259
            offset = num + 1 - len(deferred_contents)
 
2260
            _create_files(tt, tree, deferred_contents, pb, offset,
 
2261
                          accelerator_tree, hardlink)
1353
2262
        finally:
1354
2263
            pb.finished()
1355
2264
        pp.next_phase()
1356
2265
        divert_trans = set(file_trans_id[f] for f in divert)
1357
2266
        resolver = lambda t, c: resolve_checkout(t, c, divert_trans)
1358
2267
        raw_conflicts = resolve_conflicts(tt, pass_func=resolver)
 
2268
        if len(raw_conflicts) > 0:
 
2269
            precomputed_delta = None
1359
2270
        conflicts = cook_conflicts(raw_conflicts, tt)
1360
2271
        for conflict in conflicts:
1361
2272
            warning(conflict)
1363
2274
            wt.add_conflicts(conflicts)
1364
2275
        except errors.UnsupportedOperation:
1365
2276
            pass
1366
 
        result = tt.apply()
 
2277
        result = tt.apply(no_conflicts=True,
 
2278
                          precomputed_delta=precomputed_delta)
1367
2279
    finally:
1368
2280
        tt.finalize()
1369
2281
        top_pb.finished()
1370
2282
    return result
1371
2283
 
1372
2284
 
 
2285
def _create_files(tt, tree, desired_files, pb, offset, accelerator_tree,
 
2286
                  hardlink):
 
2287
    total = len(desired_files) + offset
 
2288
    wt = tt._tree
 
2289
    if accelerator_tree is None:
 
2290
        new_desired_files = desired_files
 
2291
    else:
 
2292
        iter = accelerator_tree.iter_changes(tree, include_unchanged=True)
 
2293
        unchanged = dict((f, p[1]) for (f, p, c, v, d, n, k, e)
 
2294
                         in iter if not (c or e[0] != e[1]))
 
2295
        new_desired_files = []
 
2296
        count = 0
 
2297
        for file_id, (trans_id, tree_path) in desired_files:
 
2298
            accelerator_path = unchanged.get(file_id)
 
2299
            if accelerator_path is None:
 
2300
                new_desired_files.append((file_id, (trans_id, tree_path)))
 
2301
                continue
 
2302
            pb.update('Adding file contents', count + offset, total)
 
2303
            if hardlink:
 
2304
                tt.create_hardlink(accelerator_tree.abspath(accelerator_path),
 
2305
                                   trans_id)
 
2306
            else:
 
2307
                contents = accelerator_tree.get_file(file_id, accelerator_path)
 
2308
                if wt.supports_content_filtering():
 
2309
                    filters = wt._content_filter_stack(tree_path)
 
2310
                    contents = filtered_output_bytes(contents, filters,
 
2311
                        ContentFilterContext(tree_path, tree))
 
2312
                try:
 
2313
                    tt.create_file(contents, trans_id)
 
2314
                finally:
 
2315
                    try:
 
2316
                        contents.close()
 
2317
                    except AttributeError:
 
2318
                        # after filtering, contents may no longer be file-like
 
2319
                        pass
 
2320
            count += 1
 
2321
        offset += count
 
2322
    for count, ((trans_id, tree_path), contents) in enumerate(
 
2323
            tree.iter_files_bytes(new_desired_files)):
 
2324
        if wt.supports_content_filtering():
 
2325
            filters = wt._content_filter_stack(tree_path)
 
2326
            contents = filtered_output_bytes(contents, filters,
 
2327
                ContentFilterContext(tree_path, tree))
 
2328
        tt.create_file(contents, trans_id)
 
2329
        pb.update('Adding file contents', count + offset, total)
 
2330
 
 
2331
 
1373
2332
def _reparent_children(tt, old_parent, new_parent):
1374
2333
    for child in tt.iter_tree_children(old_parent):
1375
2334
        tt.adjust_path(tt.final_name(child), new_parent, child)
1376
2335
 
 
2336
def _reparent_transform_children(tt, old_parent, new_parent):
 
2337
    by_parent = tt.by_parent()
 
2338
    for child in by_parent[old_parent]:
 
2339
        tt.adjust_path(tt.final_name(child), new_parent, child)
 
2340
    return by_parent[old_parent]
1377
2341
 
1378
2342
def _content_match(tree, entry, file_id, kind, target_path):
1379
2343
    if entry.kind != kind:
1393
2357
    new_conflicts = set()
1394
2358
    for c_type, conflict in ((c[0], c) for c in conflicts):
1395
2359
        # Anything but a 'duplicate' would indicate programmer error
1396
 
        assert c_type == 'duplicate', c_type
 
2360
        if c_type != 'duplicate':
 
2361
            raise AssertionError(c_type)
1397
2362
        # Now figure out which is new and which is old
1398
2363
        if tt.new_contents(conflict[1]):
1399
2364
            new_file = conflict[1]
1425
2390
    if kind == 'file':
1426
2391
        contents = tree.get_file(entry.file_id).readlines()
1427
2392
        executable = tree.is_executable(entry.file_id)
1428
 
        return tt.new_file(name, parent_id, contents, entry.file_id, 
 
2393
        return tt.new_file(name, parent_id, contents, entry.file_id,
1429
2394
                           executable)
1430
2395
    elif kind in ('directory', 'tree-reference'):
1431
2396
        trans_id = tt.new_directory(name, parent_id, entry.file_id)
1432
2397
        if kind == 'tree-reference':
1433
2398
            tt.set_tree_reference(entry.reference_revision, trans_id)
1434
 
        return trans_id 
 
2399
        return trans_id
1435
2400
    elif kind == 'symlink':
1436
2401
        target = tree.get_symlink_target(entry.file_id)
1437
2402
        return tt.new_symlink(name, parent_id, target, entry.file_id)
1438
2403
    else:
1439
2404
        raise errors.BadFileKindError(name, kind)
1440
2405
 
 
2406
 
 
2407
@deprecated_function(deprecated_in((1, 9, 0)))
1441
2408
def create_by_entry(tt, entry, tree, trans_id, lines=None, mode_id=None):
1442
 
    """Create new file contents according to an inventory entry."""
 
2409
    """Create new file contents according to an inventory entry.
 
2410
 
 
2411
    DEPRECATED.  Use create_from_tree instead.
 
2412
    """
1443
2413
    if entry.kind == "file":
1444
2414
        if lines is None:
1445
2415
            lines = tree.get_file(entry.file_id).readlines()
1449
2419
    elif entry.kind == "directory":
1450
2420
        tt.create_directory(trans_id)
1451
2421
 
 
2422
 
 
2423
def create_from_tree(tt, trans_id, tree, file_id, bytes=None):
 
2424
    """Create new file contents according to tree contents."""
 
2425
    kind = tree.kind(file_id)
 
2426
    if kind == 'directory':
 
2427
        tt.create_directory(trans_id)
 
2428
    elif kind == "file":
 
2429
        if bytes is None:
 
2430
            tree_file = tree.get_file(file_id)
 
2431
            try:
 
2432
                bytes = tree_file.readlines()
 
2433
            finally:
 
2434
                tree_file.close()
 
2435
        tt.create_file(bytes, trans_id)
 
2436
    elif kind == "symlink":
 
2437
        tt.create_symlink(tree.get_symlink_target(file_id), trans_id)
 
2438
    else:
 
2439
        raise AssertionError('Unknown kind %r' % kind)
 
2440
 
 
2441
 
1452
2442
def create_entry_executability(tt, entry, trans_id):
1453
2443
    """Set the executability of a trans_id according to an inventory entry"""
1454
2444
    if entry.kind == "file":
1455
2445
        tt.set_executability(entry.executable, trans_id)
1456
2446
 
1457
2447
 
1458
 
@deprecated_function(zero_fifteen)
1459
 
def find_interesting(working_tree, target_tree, filenames):
1460
 
    """Find the ids corresponding to specified filenames.
1461
 
    
1462
 
    Deprecated: Please use tree1.paths2ids(filenames, [tree2]).
1463
 
    """
1464
 
    working_tree.lock_read()
1465
 
    try:
1466
 
        target_tree.lock_read()
1467
 
        try:
1468
 
            return working_tree.paths2ids(filenames, [target_tree])
1469
 
        finally:
1470
 
            target_tree.unlock()
1471
 
    finally:
1472
 
        working_tree.unlock()
1473
 
 
1474
 
 
1475
 
@deprecated_function(zero_ninety)
1476
 
def change_entry(tt, file_id, working_tree, target_tree, 
1477
 
                 trans_id_file_id, backups, trans_id, by_parent):
1478
 
    """Replace a file_id's contents with those from a target tree."""
1479
 
    if file_id is None and target_tree is None:
1480
 
        # skip the logic altogether in the deprecation test
1481
 
        return
1482
 
    e_trans_id = trans_id_file_id(file_id)
1483
 
    entry = target_tree.inventory[file_id]
1484
 
    has_contents, contents_mod, meta_mod, = _entry_changes(file_id, entry, 
1485
 
                                                           working_tree)
1486
 
    if contents_mod:
1487
 
        mode_id = e_trans_id
1488
 
        if has_contents:
1489
 
            if not backups:
1490
 
                tt.delete_contents(e_trans_id)
1491
 
            else:
1492
 
                parent_trans_id = trans_id_file_id(entry.parent_id)
1493
 
                backup_name = get_backup_name(entry, by_parent,
1494
 
                                              parent_trans_id, tt)
1495
 
                tt.adjust_path(backup_name, parent_trans_id, e_trans_id)
1496
 
                tt.unversion_file(e_trans_id)
1497
 
                e_trans_id = tt.create_path(entry.name, parent_trans_id)
1498
 
                tt.version_file(file_id, e_trans_id)
1499
 
                trans_id[file_id] = e_trans_id
1500
 
        create_by_entry(tt, entry, target_tree, e_trans_id, mode_id=mode_id)
1501
 
        create_entry_executability(tt, entry, e_trans_id)
1502
 
 
1503
 
    elif meta_mod:
1504
 
        tt.set_executability(entry.executable, e_trans_id)
1505
 
    if tt.final_name(e_trans_id) != entry.name:
1506
 
        adjust_path  = True
1507
 
    else:
1508
 
        parent_id = tt.final_parent(e_trans_id)
1509
 
        parent_file_id = tt.final_file_id(parent_id)
1510
 
        if parent_file_id != entry.parent_id:
1511
 
            adjust_path = True
1512
 
        else:
1513
 
            adjust_path = False
1514
 
    if adjust_path:
1515
 
        parent_trans_id = trans_id_file_id(entry.parent_id)
1516
 
        tt.adjust_path(entry.name, parent_trans_id, e_trans_id)
1517
 
 
1518
 
 
1519
2448
def get_backup_name(entry, by_parent, parent_trans_id, tt):
1520
2449
    return _get_backup_name(entry.name, by_parent, parent_trans_id, tt)
1521
2450
 
1552
2481
        if entry.kind != working_kind:
1553
2482
            contents_mod, meta_mod = True, False
1554
2483
        else:
1555
 
            cur_entry._read_tree_state(working_tree.id2path(file_id), 
 
2484
            cur_entry._read_tree_state(working_tree.id2path(file_id),
1556
2485
                                       working_tree)
1557
2486
            contents_mod, meta_mod = entry.detect_changes(cur_entry)
1558
2487
            cur_entry._forget_tree_state()
1566
2495
    tt = TreeTransform(working_tree, pb)
1567
2496
    try:
1568
2497
        pp = ProgressPhase("Revert phase", 3, pb)
1569
 
        pp.next_phase()
1570
 
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1571
 
        try:
1572
 
            merge_modified = _alter_files(working_tree, target_tree, tt,
1573
 
                                          child_pb, filenames, backups)
1574
 
        finally:
1575
 
            child_pb.finished()
1576
 
        pp.next_phase()
1577
 
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1578
 
        try:
1579
 
            raw_conflicts = resolve_conflicts(tt, child_pb)
1580
 
        finally:
1581
 
            child_pb.finished()
1582
 
        conflicts = cook_conflicts(raw_conflicts, tt)
 
2498
        conflicts, merge_modified = _prepare_revert_transform(
 
2499
            working_tree, target_tree, tt, filenames, backups, pp)
1583
2500
        if change_reporter:
1584
2501
            change_reporter = delta._ChangeReporter(
1585
2502
                unversioned_filter=working_tree.is_ignored)
1586
 
            delta.report_changes(tt._iter_changes(), change_reporter)
 
2503
            delta.report_changes(tt.iter_changes(), change_reporter)
1587
2504
        for conflict in conflicts:
1588
2505
            warning(conflict)
1589
2506
        pp.next_phase()
1596
2513
    return conflicts
1597
2514
 
1598
2515
 
 
2516
def _prepare_revert_transform(working_tree, target_tree, tt, filenames,
 
2517
                              backups, pp, basis_tree=None,
 
2518
                              merge_modified=None):
 
2519
    pp.next_phase()
 
2520
    child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
2521
    try:
 
2522
        if merge_modified is None:
 
2523
            merge_modified = working_tree.merge_modified()
 
2524
        merge_modified = _alter_files(working_tree, target_tree, tt,
 
2525
                                      child_pb, filenames, backups,
 
2526
                                      merge_modified, basis_tree)
 
2527
    finally:
 
2528
        child_pb.finished()
 
2529
    pp.next_phase()
 
2530
    child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
2531
    try:
 
2532
        raw_conflicts = resolve_conflicts(tt, child_pb,
 
2533
            lambda t, c: conflict_pass(t, c, target_tree))
 
2534
    finally:
 
2535
        child_pb.finished()
 
2536
    conflicts = cook_conflicts(raw_conflicts, tt)
 
2537
    return conflicts, merge_modified
 
2538
 
 
2539
 
1599
2540
def _alter_files(working_tree, target_tree, tt, pb, specific_files,
1600
 
                 backups):
1601
 
    merge_modified = working_tree.merge_modified()
1602
 
    change_list = target_tree._iter_changes(working_tree,
 
2541
                 backups, merge_modified, basis_tree=None):
 
2542
    if basis_tree is not None:
 
2543
        basis_tree.lock_read()
 
2544
    change_list = target_tree.iter_changes(working_tree,
1603
2545
        specific_files=specific_files, pb=pb)
1604
 
    if target_tree.inventory.root is None:
 
2546
    if target_tree.get_root_id() is None:
1605
2547
        skip_root = True
1606
2548
    else:
1607
2549
        skip_root = False
1608
 
    basis_tree = None
1609
2550
    try:
1610
2551
        deferred_files = []
1611
2552
        for id_num, (file_id, path, changed_content, versioned, parent, name,
1647
2588
                        # contents
1648
2589
                        mode_id = trans_id
1649
2590
                        trans_id = new_trans_id
1650
 
                if kind[1] == 'directory':
 
2591
                if kind[1] in ('directory', 'tree-reference'):
1651
2592
                    tt.create_directory(trans_id)
 
2593
                    if kind[1] == 'tree-reference':
 
2594
                        revision = target_tree.get_reference_revision(file_id,
 
2595
                                                                      path[1])
 
2596
                        tt.set_tree_reference(revision, trans_id)
1652
2597
                elif kind[1] == 'symlink':
1653
2598
                    tt.create_symlink(target_tree.get_symlink_target(file_id),
1654
2599
                                      trans_id)
1668
2613
                    # preserve the execute bit when backing up
1669
2614
                    if keep_content and executable[0] == executable[1]:
1670
2615
                        tt.set_executability(executable[1], trans_id)
1671
 
                else:
1672
 
                    assert kind[1] is None
 
2616
                elif kind[1] is not None:
 
2617
                    raise AssertionError(kind[1])
1673
2618
            if versioned == (False, True):
1674
2619
                tt.version_file(file_id, trans_id)
1675
2620
            if versioned == (True, False):
1676
2621
                tt.unversion_file(trans_id)
1677
 
            if (name[1] is not None and 
 
2622
            if (name[1] is not None and
1678
2623
                (name[0] != name[1] or parent[0] != parent[1])):
1679
 
                tt.adjust_path(
1680
 
                    name[1], tt.trans_id_file_id(parent[1]), trans_id)
 
2624
                if name[1] == '' and parent[1] is None:
 
2625
                    parent_trans = ROOT_PARENT
 
2626
                else:
 
2627
                    parent_trans = tt.trans_id_file_id(parent[1])
 
2628
                tt.adjust_path(name[1], parent_trans, trans_id)
1681
2629
            if executable[0] != executable[1] and kind[1] == "file":
1682
2630
                tt.set_executability(executable[1], trans_id)
1683
 
        for (trans_id, mode_id), bytes in target_tree.iter_files_bytes(
1684
 
            deferred_files):
1685
 
            tt.create_file(bytes, trans_id, mode_id)
 
2631
        if working_tree.supports_content_filtering():
 
2632
            for index, ((trans_id, mode_id), bytes) in enumerate(
 
2633
                target_tree.iter_files_bytes(deferred_files)):
 
2634
                file_id = deferred_files[index][0]
 
2635
                # We're reverting a tree to the target tree so using the
 
2636
                # target tree to find the file path seems the best choice
 
2637
                # here IMO - Ian C 27/Oct/2009
 
2638
                filter_tree_path = target_tree.id2path(file_id)
 
2639
                filters = working_tree._content_filter_stack(filter_tree_path)
 
2640
                bytes = filtered_output_bytes(bytes, filters,
 
2641
                    ContentFilterContext(filter_tree_path, working_tree))
 
2642
                tt.create_file(bytes, trans_id, mode_id)
 
2643
        else:
 
2644
            for (trans_id, mode_id), bytes in target_tree.iter_files_bytes(
 
2645
                deferred_files):
 
2646
                tt.create_file(bytes, trans_id, mode_id)
1686
2647
    finally:
1687
2648
        if basis_tree is not None:
1688
2649
            basis_tree.unlock()
1721
2682
                               conflict[1], conflict[2], ))
1722
2683
        elif c_type == 'duplicate':
1723
2684
            # files that were renamed take precedence
1724
 
            new_name = tt.final_name(conflict[1])+'.moved'
1725
2685
            final_parent = tt.final_parent(conflict[1])
1726
2686
            if tt.path_changed(conflict[1]):
1727
 
                tt.adjust_path(new_name, final_parent, conflict[2])
1728
 
                new_conflicts.add((c_type, 'Moved existing file to', 
1729
 
                                   conflict[2], conflict[1]))
 
2687
                existing_file, new_file = conflict[2], conflict[1]
1730
2688
            else:
1731
 
                tt.adjust_path(new_name, final_parent, conflict[1])
1732
 
                new_conflicts.add((c_type, 'Moved existing file to', 
1733
 
                                  conflict[1], conflict[2]))
 
2689
                existing_file, new_file = conflict[1], conflict[2]
 
2690
            new_name = tt.final_name(existing_file)+'.moved'
 
2691
            tt.adjust_path(new_name, final_parent, existing_file)
 
2692
            new_conflicts.add((c_type, 'Moved existing file to',
 
2693
                               existing_file, new_file))
1734
2694
        elif c_type == 'parent loop':
1735
2695
            # break the loop by undoing one of the ops that caused the loop
1736
2696
            cur = conflict[1]
1739
2699
            new_conflicts.add((c_type, 'Cancelled move', cur,
1740
2700
                               tt.final_parent(cur),))
1741
2701
            tt.adjust_path(tt.final_name(cur), tt.get_tree_parent(cur), cur)
1742
 
            
 
2702
 
1743
2703
        elif c_type == 'missing parent':
1744
2704
            trans_id = conflict[1]
1745
2705
            try:
1746
2706
                tt.cancel_deletion(trans_id)
1747
 
                new_conflicts.add(('deleting parent', 'Not deleting', 
 
2707
                new_conflicts.add(('deleting parent', 'Not deleting',
1748
2708
                                   trans_id))
1749
2709
            except KeyError:
1750
 
                tt.create_directory(trans_id)
1751
 
                new_conflicts.add((c_type, 'Created directory', trans_id))
 
2710
                create = True
1752
2711
                try:
1753
2712
                    tt.final_name(trans_id)
1754
2713
                except NoFinalPath:
1755
 
                    file_id = tt.final_file_id(trans_id)
1756
 
                    entry = path_tree.inventory[file_id]
1757
 
                    parent_trans_id = tt.trans_id_file_id(entry.parent_id)
1758
 
                    tt.adjust_path(entry.name, parent_trans_id, trans_id)
 
2714
                    if path_tree is not None:
 
2715
                        file_id = tt.final_file_id(trans_id)
 
2716
                        if file_id is None:
 
2717
                            file_id = tt.inactive_file_id(trans_id)
 
2718
                        entry = path_tree.inventory[file_id]
 
2719
                        # special-case the other tree root (move its
 
2720
                        # children to current root)
 
2721
                        if entry.parent_id is None:
 
2722
                            create=False
 
2723
                            moved = _reparent_transform_children(
 
2724
                                tt, trans_id, tt.root)
 
2725
                            for child in moved:
 
2726
                                new_conflicts.add((c_type, 'Moved to root',
 
2727
                                                   child))
 
2728
                        else:
 
2729
                            parent_trans_id = tt.trans_id_file_id(
 
2730
                                entry.parent_id)
 
2731
                            tt.adjust_path(entry.name, parent_trans_id,
 
2732
                                           trans_id)
 
2733
                if create:
 
2734
                    tt.create_directory(trans_id)
 
2735
                    new_conflicts.add((c_type, 'Created directory', trans_id))
1759
2736
        elif c_type == 'unversioned parent':
1760
 
            tt.version_file(tt.inactive_file_id(conflict[1]), conflict[1])
 
2737
            file_id = tt.inactive_file_id(conflict[1])
 
2738
            # special-case the other tree root (move its children instead)
 
2739
            if path_tree and file_id in path_tree:
 
2740
                if path_tree.inventory[file_id].parent_id is None:
 
2741
                    continue
 
2742
            tt.version_file(file_id, conflict[1])
1761
2743
            new_conflicts.add((c_type, 'Versioned directory', conflict[1]))
 
2744
        elif c_type == 'non-directory parent':
 
2745
            parent_id = conflict[1]
 
2746
            parent_parent = tt.final_parent(parent_id)
 
2747
            parent_name = tt.final_name(parent_id)
 
2748
            parent_file_id = tt.final_file_id(parent_id)
 
2749
            new_parent_id = tt.new_directory(parent_name + '.new',
 
2750
                parent_parent, parent_file_id)
 
2751
            _reparent_transform_children(tt, parent_id, new_parent_id)
 
2752
            if parent_file_id is not None:
 
2753
                tt.unversion_file(parent_id)
 
2754
            new_conflicts.add((c_type, 'Created directory', new_parent_id))
 
2755
        elif c_type == 'versioning no contents':
 
2756
            tt.cancel_versioning(conflict[1])
1762
2757
    return new_conflicts
1763
2758
 
1764
2759
 
1780
2775
        if len(conflict) == 3:
1781
2776
            yield Conflict.factory(c_type, action=action, path=modified_path,
1782
2777
                                     file_id=modified_id)
1783
 
             
 
2778
 
1784
2779
        else:
1785
2780
            conflicting_path = fp.get_path(conflict[3])
1786
2781
            conflicting_id = tt.final_file_id(conflict[3])
1787
2782
            yield Conflict.factory(c_type, action=action, path=modified_path,
1788
 
                                   file_id=modified_id, 
 
2783
                                   file_id=modified_id,
1789
2784
                                   conflict_path=conflicting_path,
1790
2785
                                   conflict_file_id=conflicting_id)
1791
2786
 
1799
2794
 
1800
2795
    def rename(self, from_, to):
1801
2796
        """Rename a file from one path to another.  Functions like os.rename"""
1802
 
        os.rename(from_, to)
 
2797
        try:
 
2798
            os.rename(from_, to)
 
2799
        except OSError, e:
 
2800
            if e.errno in (errno.EEXIST, errno.ENOTEMPTY):
 
2801
                raise errors.FileExists(to, str(e))
 
2802
            raise
1803
2803
        self.past_renames.append((from_, to))
1804
2804
 
1805
2805
    def pre_delete(self, from_, to):