/brz/remove-bazaar

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

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

  • Committer: Ian Clatworthy
  • Date: 2007-12-04 12:56:31 UTC
  • mto: (3075.1.1 ianc-integration)
  • mto: This revision was merged to the branch mainline in revision 3076.
  • Revision ID: ian.clatworthy@internode.on.net-20071204125631-9xnjwum1nbkd1zhp
more feedback from jameinel

Show diffs side-by-side

added added

removed removed

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