← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

  • Committer: Vincent Ladeuil
  • Date: 2010-03-02 10:21:39 UTC
  • mfrom: (4797.2.24 2.1)
  • mto: This revision was merged to the branch mainline in revision 5069.
  • Revision ID: v.ladeuil+lp@free.fr-20100302102139-b5cba7h6xu13mekg
Merge 2.1 into trunk including fixes for #331095, #507557, #185103, #524184 and #369501

Show diffs side-by-side

added added

removed removed

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