/brz/remove-bazaar

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

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

  • Committer: John Arbash Meinel
  • Date: 2008-08-13 17:35:34 UTC
  • mto: (3606.2.4 1.6)
  • mto: This revision was merged to the branch mainline in revision 3625.
  • Revision ID: john@arbash-meinel.com-20080813173534-0kb0kr70q505ihph
Fix up NEWS and version info to prepare 1.6rc2

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006, 2007, 2008 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
import os
18
18
import errno
19
19
from stat import S_ISREG, S_IEXEC
20
 
import time
 
20
import tempfile
21
21
 
22
22
from bzrlib.lazy_import import lazy_import
23
23
lazy_import(globals(), """
24
24
from bzrlib import (
25
25
    annotate,
26
 
    bencode,
27
26
    bzrdir,
28
27
    delta,
29
28
    errors,
30
29
    inventory,
31
 
    multiparent,
32
 
    osutils,
33
30
    revision as _mod_revision,
34
 
    ui,
35
31
    )
36
32
""")
37
33
from bzrlib.errors import (DuplicateKey, MalformedTransform, NoSuchFile,
38
 
                           ReusingTransform, CantMoveRoot,
 
34
                           ReusingTransform, NotVersionedError, CantMoveRoot,
39
35
                           ExistingLimbo, ImmortalLimbo, NoFinalPath,
40
36
                           UnableCreateSymlink)
41
 
from bzrlib.filters import filtered_output_bytes, ContentFilterContext
42
37
from bzrlib.inventory import InventoryEntry
43
38
from bzrlib.osutils import (
44
39
    delete_any,
46
41
    has_symlinks,
47
42
    lexists,
48
43
    pathjoin,
49
 
    sha_file,
50
44
    splitpath,
51
45
    supports_executable,
52
46
)
53
 
from bzrlib.progress import ProgressPhase
 
47
from bzrlib.progress import DummyProgress, ProgressPhase
54
48
from bzrlib.symbol_versioning import (
55
49
        deprecated_function,
56
 
        deprecated_in,
57
50
        )
58
51
from bzrlib.trace import mutter, warning
59
52
from bzrlib import tree
78
71
 
79
72
 
80
73
class TreeTransformBase(object):
81
 
    """The base class for TreeTransform and its kin."""
 
74
    """The base class for TreeTransform and TreeTransformBase"""
82
75
 
83
 
    def __init__(self, tree, pb=None,
 
76
    def __init__(self, tree, limbodir, pb=DummyProgress(),
84
77
                 case_sensitive=True):
85
78
        """Constructor.
86
79
 
87
80
        :param tree: The tree that will be transformed, but not necessarily
88
81
            the output tree.
89
 
        :param pb: ignored
 
82
        :param limbodir: A directory where new files can be stored until
 
83
            they are installed in their proper places
 
84
        :param pb: A ProgressBar indicating how much progress is being made
90
85
        :param case_sensitive: If True, the target of the transform is
91
86
            case sensitive, not just case preserving.
92
87
        """
93
88
        object.__init__(self)
94
89
        self._tree = tree
 
90
        self._limbodir = limbodir
 
91
        self._deletiondir = None
95
92
        self._id_number = 0
96
93
        # mapping of trans_id -> new basename
97
94
        self._new_name = {}
99
96
        self._new_parent = {}
100
97
        # mapping of trans_id with new contents -> new file_kind
101
98
        self._new_contents = {}
 
99
        # A mapping of transform ids to their limbo filename
 
100
        self._limbo_files = {}
 
101
        # A mapping of transform ids to a set of the transform ids of children
 
102
        # that their limbo directory has
 
103
        self._limbo_children = {}
 
104
        # Map transform ids to maps of child filename to child transform id
 
105
        self._limbo_children_names = {}
 
106
        # List of transform ids that need to be renamed from limbo into place
 
107
        self._needs_rename = set()
102
108
        # Set of trans_ids whose contents will be removed
103
109
        self._removed_contents = set()
104
110
        # Mapping of trans_id -> new execute-bit value
111
117
        self._non_present_ids = {}
112
118
        # Mapping of new file_id -> trans_id
113
119
        self._r_new_id = {}
114
 
        # Set of trans_ids that will be removed
 
120
        # Set of file_ids that will be removed
115
121
        self._removed_id = set()
116
122
        # Mapping of path in old tree -> trans_id
117
123
        self._tree_path_ids = {}
118
124
        # Mapping trans_id -> path in old tree
119
125
        self._tree_id_paths = {}
 
126
        # Cache of realpath results, to speed up canonical_path
 
127
        self._realpaths = {}
 
128
        # Cache of relpath results, to speed up canonical_path
 
129
        self._relpaths = {}
120
130
        # 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
 
131
        self._new_root = self.trans_id_tree_file_id(tree.get_root_id())
126
132
        # Indictor of whether the transform has been applied
127
133
        self._done = False
128
134
        # A progress bar
132
138
        # A counter of how many files have been renamed
133
139
        self.rename_count = 0
134
140
 
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
 
 
146
141
    def __get_root(self):
147
142
        return self._new_root
148
143
 
149
144
    root = property(__get_root)
150
145
 
 
146
    def finalize(self):
 
147
        """Release the working tree lock, if held, clean up limbo dir.
 
148
 
 
149
        This is required if apply has not been invoked, but can be invoked
 
150
        even after apply.
 
151
        """
 
152
        if self._tree is None:
 
153
            return
 
154
        try:
 
155
            entries = [(self._limbo_name(t), t, k) for t, k in
 
156
                       self._new_contents.iteritems()]
 
157
            entries.sort(reverse=True)
 
158
            for path, trans_id, kind in entries:
 
159
                if kind == "directory":
 
160
                    os.rmdir(path)
 
161
                else:
 
162
                    os.unlink(path)
 
163
            try:
 
164
                os.rmdir(self._limbodir)
 
165
            except OSError:
 
166
                # We don't especially care *why* the dir is immortal.
 
167
                raise ImmortalLimbo(self._limbodir)
 
168
            try:
 
169
                if self._deletiondir is not None:
 
170
                    os.rmdir(self._deletiondir)
 
171
            except OSError:
 
172
                raise errors.ImmortalPendingDeletion(self._deletiondir)
 
173
        finally:
 
174
            self._tree.unlock()
 
175
            self._tree = None
 
176
 
151
177
    def _assign_id(self):
152
178
        """Produce a new tranform id"""
153
179
        new_id = "new-%s" % self._id_number
163
189
 
164
190
    def adjust_path(self, name, parent, trans_id):
165
191
        """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")
168
192
        if trans_id == self._new_root:
169
193
            raise CantMoveRoot
 
194
        previous_parent = self._new_parent.get(trans_id)
 
195
        previous_name = self._new_name.get(trans_id)
170
196
        self._new_name[trans_id] = name
171
197
        self._new_parent[trans_id] = parent
 
198
        if (trans_id in self._limbo_files and
 
199
            trans_id not in self._needs_rename):
 
200
            self._rename_in_limbo([trans_id])
 
201
            self._limbo_children[previous_parent].remove(trans_id)
 
202
            del self._limbo_children_names[previous_parent][previous_name]
 
203
 
 
204
    def _rename_in_limbo(self, trans_ids):
 
205
        """Fix limbo names so that the right final path is produced.
 
206
 
 
207
        This means we outsmarted ourselves-- we tried to avoid renaming
 
208
        these files later by creating them with their final names in their
 
209
        final parents.  But now the previous name or parent is no longer
 
210
        suitable, so we have to rename them.
 
211
 
 
212
        Even for trans_ids that have no new contents, we must remove their
 
213
        entries from _limbo_files, because they are now stale.
 
214
        """
 
215
        for trans_id in trans_ids:
 
216
            old_path = self._limbo_files.pop(trans_id)
 
217
            if trans_id not in self._new_contents:
 
218
                continue
 
219
            new_path = self._limbo_name(trans_id)
 
220
            os.rename(old_path, new_path)
172
221
 
173
222
    def adjust_root_path(self, name, parent):
174
223
        """Emulate moving the root by moving all children, instead.
175
 
 
 
224
        
176
225
        We do this by undoing the association of root's transaction id with the
177
226
        current tree.  This allows us to create a new directory with that
178
 
        transaction id.  We unversion the root directory and version the
 
227
        transaction id.  We unversion the root directory and version the 
179
228
        physically new directory, and hope someone versions the tree root
180
229
        later.
181
230
        """
184
233
        # force moving all children of root
185
234
        for child_id in self.iter_tree_children(old_root):
186
235
            if child_id != parent:
187
 
                self.adjust_path(self.final_name(child_id),
 
236
                self.adjust_path(self.final_name(child_id), 
188
237
                                 self.final_parent(child_id), child_id)
189
238
            file_id = self.final_file_id(child_id)
190
239
            if file_id is not None:
191
240
                self.unversion_file(child_id)
192
241
            self.version_file(file_id, child_id)
193
 
 
 
242
        
194
243
        # the physical root needs a new transaction id
195
244
        self._tree_path_ids.pop("")
196
245
        self._tree_id_paths.pop(old_root)
202
251
        self.version_file(old_root_file_id, old_root)
203
252
        self.unversion_file(self._new_root)
204
253
 
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
254
    def trans_id_tree_file_id(self, inventory_id):
267
255
        """Determine the transaction id of a working tree file.
268
 
 
 
256
        
269
257
        This reflects only files that already exist, not ones that will be
270
258
        added by transactions.
271
259
        """
272
 
        if inventory_id is None:
273
 
            raise ValueError('None is not a valid file id')
274
260
        path = self._tree.id2path(inventory_id)
275
261
        return self.trans_id_tree_path(path)
276
262
 
280
266
        a transaction has been unversioned, it is deliberately still returned.
281
267
        (this will likely lead to an unversioned parent conflict.)
282
268
        """
283
 
        if file_id is None:
284
 
            raise ValueError('None is not a valid file id')
285
269
        if file_id in self._r_new_id and self._r_new_id[file_id] is not None:
286
270
            return self._r_new_id[file_id]
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)
 
271
        elif file_id in self._tree.inventory:
 
272
            return self.trans_id_tree_file_id(file_id)
 
273
        elif file_id in self._non_present_ids:
 
274
            return self._non_present_ids[file_id]
 
275
        else:
 
276
            trans_id = self._assign_id()
 
277
            self._non_present_ids[file_id] = trans_id
 
278
            return trans_id
 
279
 
 
280
    def canonical_path(self, path):
 
281
        """Get the canonical tree-relative path"""
 
282
        # don't follow final symlinks
 
283
        abs = self._tree.abspath(path)
 
284
        if abs in self._relpaths:
 
285
            return self._relpaths[abs]
 
286
        dirname, basename = os.path.split(abs)
 
287
        if dirname not in self._realpaths:
 
288
            self._realpaths[dirname] = os.path.realpath(dirname)
 
289
        dirname = self._realpaths[dirname]
 
290
        abs = pathjoin(dirname, basename)
 
291
        if dirname in self._relpaths:
 
292
            relpath = pathjoin(self._relpaths[dirname], basename)
 
293
            relpath = relpath.rstrip('/\\')
 
294
        else:
 
295
            relpath = self._tree.relpath(abs)
 
296
        self._relpaths[abs] = relpath
 
297
        return relpath
299
298
 
300
299
    def trans_id_tree_path(self, path):
301
300
        """Determine (and maybe set) the transaction ID for a tree path."""
312
311
            return ROOT_PARENT
313
312
        return self.trans_id_tree_path(os.path.dirname(path))
314
313
 
 
314
    def create_file(self, contents, trans_id, mode_id=None):
 
315
        """Schedule creation of a new file.
 
316
 
 
317
        See also new_file.
 
318
        
 
319
        Contents is an iterator of strings, all of which will be written
 
320
        to the target destination.
 
321
 
 
322
        New file takes the permissions of any existing file with that id,
 
323
        unless mode_id is specified.
 
324
        """
 
325
        name = self._limbo_name(trans_id)
 
326
        f = open(name, 'wb')
 
327
        try:
 
328
            try:
 
329
                unique_add(self._new_contents, trans_id, 'file')
 
330
            except:
 
331
                # Clean up the file, it never got registered so
 
332
                # TreeTransform.finalize() won't clean it up.
 
333
                f.close()
 
334
                os.unlink(name)
 
335
                raise
 
336
 
 
337
            f.writelines(contents)
 
338
        finally:
 
339
            f.close()
 
340
        self._set_mode(trans_id, mode_id, S_ISREG)
 
341
 
 
342
    def _set_mode(self, trans_id, mode_id, typefunc):
 
343
        """Set the mode of new file contents.
 
344
        The mode_id is the existing file to get the mode from (often the same
 
345
        as trans_id).  The operation is only performed if there's a mode match
 
346
        according to typefunc.
 
347
        """
 
348
        if mode_id is None:
 
349
            mode_id = trans_id
 
350
        try:
 
351
            old_path = self._tree_id_paths[mode_id]
 
352
        except KeyError:
 
353
            return
 
354
        try:
 
355
            mode = os.stat(self._tree.abspath(old_path)).st_mode
 
356
        except OSError, e:
 
357
            if e.errno in (errno.ENOENT, errno.ENOTDIR):
 
358
                # Either old_path doesn't exist, or the parent of the
 
359
                # target is not a directory (but will be one eventually)
 
360
                # Either way, we know it doesn't exist *right now*
 
361
                # See also bug #248448
 
362
                return
 
363
            else:
 
364
                raise
 
365
        if typefunc(mode):
 
366
            os.chmod(self._limbo_name(trans_id), mode)
 
367
 
 
368
    def create_hardlink(self, path, trans_id):
 
369
        """Schedule creation of a hard link"""
 
370
        name = self._limbo_name(trans_id)
 
371
        try:
 
372
            os.link(path, name)
 
373
        except OSError, e:
 
374
            if e.errno != errno.EPERM:
 
375
                raise
 
376
            raise errors.HardLinkNotSupported(path)
 
377
        try:
 
378
            unique_add(self._new_contents, trans_id, 'file')
 
379
        except:
 
380
            # Clean up the file, it never got registered so
 
381
            # TreeTransform.finalize() won't clean it up.
 
382
            os.unlink(name)
 
383
            raise
 
384
 
 
385
    def create_directory(self, trans_id):
 
386
        """Schedule creation of a new directory.
 
387
        
 
388
        See also new_directory.
 
389
        """
 
390
        os.mkdir(self._limbo_name(trans_id))
 
391
        unique_add(self._new_contents, trans_id, 'directory')
 
392
 
 
393
    def create_symlink(self, target, trans_id):
 
394
        """Schedule creation of a new symbolic link.
 
395
 
 
396
        target is a bytestring.
 
397
        See also new_symlink.
 
398
        """
 
399
        if has_symlinks():
 
400
            os.symlink(target, self._limbo_name(trans_id))
 
401
            unique_add(self._new_contents, trans_id, 'symlink')
 
402
        else:
 
403
            try:
 
404
                path = FinalPaths(self).get_path(trans_id)
 
405
            except KeyError:
 
406
                path = None
 
407
            raise UnableCreateSymlink(path=path)
 
408
 
 
409
    def cancel_creation(self, trans_id):
 
410
        """Cancel the creation of new file contents."""
 
411
        del self._new_contents[trans_id]
 
412
        children = self._limbo_children.get(trans_id)
 
413
        # if this is a limbo directory with children, move them before removing
 
414
        # the directory
 
415
        if children is not None:
 
416
            self._rename_in_limbo(children)
 
417
            del self._limbo_children[trans_id]
 
418
            del self._limbo_children_names[trans_id]
 
419
        delete_any(self._limbo_name(trans_id))
 
420
 
315
421
    def delete_contents(self, trans_id):
316
422
        """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
319
423
        self.tree_kind(trans_id)
320
424
        self._removed_contents.add(trans_id)
321
425
 
366
470
        """
367
471
        new_ids = set()
368
472
        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)
 
473
            id_sets = (self._needs_rename, self._new_executability)
375
474
        else:
376
475
            id_sets = (self._new_name, self._new_parent, self._new_contents,
377
476
                       self._new_id, self._new_executability)
379
478
            new_ids.update(id_set)
380
479
        return sorted(FinalPaths(self).get_paths(new_ids))
381
480
 
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))
 
481
    def tree_kind(self, trans_id):
 
482
        """Determine the file kind in the working tree.
 
483
 
 
484
        Raises NoSuchFile if the file does not exist
 
485
        """
 
486
        path = self._tree_id_paths.get(trans_id)
 
487
        if path is None:
 
488
            raise NoSuchFile(None)
 
489
        try:
 
490
            return file_kind(self._tree.abspath(path))
 
491
        except OSError, e:
 
492
            if e.errno != errno.ENOENT:
 
493
                raise
 
494
            else:
 
495
                raise NoSuchFile(path)
395
496
 
396
497
    def final_kind(self, trans_id):
397
498
        """Determine the final file kind, after any changes applied.
398
 
 
 
499
        
399
500
        Raises NoSuchFile if the file does not exist/has no contents.
400
501
        (It is conceivable that a path would be created without the
401
502
        corresponding contents insertion command)
417
518
        # the file is old; the old id is still valid
418
519
        if self._new_root == trans_id:
419
520
            return self._tree.get_root_id()
420
 
        return self._tree.path2id(path)
 
521
        return self._tree.inventory.path2id(path)
421
522
 
422
523
    def final_file_id(self, trans_id):
423
524
        """Determine the file id after any changes are applied, or None.
424
 
 
 
525
        
425
526
        None indicates that the file will not be versioned after changes are
426
527
        applied.
427
528
        """
466
567
 
467
568
    def by_parent(self):
468
569
        """Return a map of parent: children for known parents.
469
 
 
 
570
        
470
571
        Only new paths and parents of tree files with assigned ids are used.
471
572
        """
472
573
        by_parent = {}
473
574
        items = list(self._new_parent.iteritems())
474
 
        items.extend((t, self.final_parent(t)) for t in
 
575
        items.extend((t, self.final_parent(t)) for t in 
475
576
                      self._tree_id_paths.keys())
476
577
        for trans_id, parent_id in items:
477
578
            if parent_id not in by_parent:
505
606
        conflicts.extend(self._overwrite_conflicts())
506
607
        return conflicts
507
608
 
508
 
    def _check_malformed(self):
509
 
        conflicts = self.find_conflicts()
510
 
        if len(conflicts) != 0:
511
 
            raise MalformedTransform(conflicts=conflicts)
512
 
 
513
609
    def _add_tree_children(self):
514
610
        """Add all the children of all active parents to the known paths.
515
611
 
517
613
        removed.  This is a necessary first step in detecting conflicts.
518
614
        """
519
615
        parents = self.by_parent().keys()
520
 
        parents.extend([t for t in self._removed_contents if
 
616
        parents.extend([t for t in self._removed_contents if 
521
617
                        self.tree_kind(t) == 'directory'])
522
618
        for trans_id in self._removed_id:
523
619
            file_id = self.tree_file_id(trans_id)
531
627
            # ensure that all children are registered with the transaction
532
628
            list(self.iter_tree_children(parent_id))
533
629
 
 
630
    def iter_tree_children(self, parent_id):
 
631
        """Iterate through the entry's tree children, if any"""
 
632
        try:
 
633
            path = self._tree_id_paths[parent_id]
 
634
        except KeyError:
 
635
            return
 
636
        try:
 
637
            children = os.listdir(self._tree.abspath(path))
 
638
        except OSError, e:
 
639
            if not (osutils._is_error_enotdir(e)
 
640
                    or e.errno in (errno.ENOENT, errno.ESRCH)):
 
641
                raise
 
642
            return
 
643
 
 
644
        for child in children:
 
645
            childpath = joinpath(path, child)
 
646
            if self._tree.is_control_filename(childpath):
 
647
                continue
 
648
            yield self.trans_id_tree_path(childpath)
 
649
 
534
650
    def has_named_child(self, by_parent, parent_id, name):
535
651
        try:
536
652
            children = by_parent[parent_id]
590
706
 
591
707
    def _improper_versioning(self):
592
708
        """Cannot version a file with no contents, or a bad type.
593
 
 
 
709
        
594
710
        However, existing entries with no contents are okay.
595
711
        """
596
712
        conflicts = []
606
722
 
607
723
    def _executability_conflicts(self):
608
724
        """Check for bad executability changes.
609
 
 
 
725
        
610
726
        Only versioned files may have their executability set, because
611
727
        1. only versioned entries can have executability under windows
612
728
        2. only files can be executable.  (The execute bit on a directory
711
827
            return True
712
828
        return False
713
829
 
714
 
    def _set_executability(self, path, trans_id):
 
830
    def _limbo_name(self, trans_id):
 
831
        """Generate the limbo name of a file"""
 
832
        limbo_name = self._limbo_files.get(trans_id)
 
833
        if limbo_name is not None:
 
834
            return limbo_name
 
835
        parent = self._new_parent.get(trans_id)
 
836
        # if the parent directory is already in limbo (e.g. when building a
 
837
        # tree), choose a limbo name inside the parent, to reduce further
 
838
        # renames.
 
839
        use_direct_path = False
 
840
        if self._new_contents.get(parent) == 'directory':
 
841
            filename = self._new_name.get(trans_id)
 
842
            if filename is not None:
 
843
                if parent not in self._limbo_children:
 
844
                    self._limbo_children[parent] = set()
 
845
                    self._limbo_children_names[parent] = {}
 
846
                    use_direct_path = True
 
847
                # the direct path can only be used if no other file has
 
848
                # already taken this pathname, i.e. if the name is unused, or
 
849
                # if it is already associated with this trans_id.
 
850
                elif self._case_sensitive_target:
 
851
                    if (self._limbo_children_names[parent].get(filename)
 
852
                        in (trans_id, None)):
 
853
                        use_direct_path = True
 
854
                else:
 
855
                    for l_filename, l_trans_id in\
 
856
                        self._limbo_children_names[parent].iteritems():
 
857
                        if l_trans_id == trans_id:
 
858
                            continue
 
859
                        if l_filename.lower() == filename.lower():
 
860
                            break
 
861
                    else:
 
862
                        use_direct_path = True
 
863
 
 
864
        if use_direct_path:
 
865
            limbo_name = pathjoin(self._limbo_files[parent], filename)
 
866
            self._limbo_children[parent].add(trans_id)
 
867
            self._limbo_children_names[parent][filename] = trans_id
 
868
        else:
 
869
            limbo_name = pathjoin(self._limbodir, trans_id)
 
870
            self._needs_rename.add(trans_id)
 
871
        self._limbo_files[trans_id] = limbo_name
 
872
        return limbo_name
 
873
 
 
874
    def _set_executability(self, path, entry, trans_id):
715
875
        """Set the executability of versioned files """
 
876
        new_executability = self._new_executability[trans_id]
 
877
        if entry is not None:
 
878
            entry.executable = new_executability
716
879
        if supports_executable():
717
 
            new_executability = self._new_executability[trans_id]
718
880
            abspath = self._tree.abspath(path)
719
881
            current_mode = os.stat(abspath).st_mode
720
882
            if new_executability:
737
899
            self.version_file(file_id, trans_id)
738
900
        return trans_id
739
901
 
740
 
    def new_file(self, name, parent_id, contents, file_id=None,
 
902
    def new_file(self, name, parent_id, contents, file_id=None, 
741
903
                 executable=None):
742
904
        """Convenience method to create files.
743
 
 
 
905
        
744
906
        name is the name of the file to create.
745
907
        parent_id is the transaction id of the parent directory of the file.
746
908
        contents is an iterator of bytestrings, which will be used to produce
766
928
        """
767
929
        trans_id = self._new_entry(name, parent_id, file_id)
768
930
        self.create_directory(trans_id)
769
 
        return trans_id
 
931
        return trans_id 
770
932
 
771
933
    def new_symlink(self, name, parent_id, target, file_id=None):
772
934
        """Convenience method to create symbolic link.
773
 
 
 
935
        
774
936
        name is the name of the symlink to create.
775
937
        parent_id is the transaction id of the parent directory of the symlink.
776
938
        target is a bytestring of the target of the symlink.
815
977
        from_path = self._tree_id_paths.get(from_trans_id)
816
978
        if from_versioned:
817
979
            # get data from working tree if versioned
818
 
            from_entry = self._tree.iter_entries_by_dir([file_id]).next()[1]
 
980
            from_entry = self._tree.inventory[file_id]
819
981
            from_name = from_entry.name
820
982
            from_parent = from_entry.parent_id
821
983
        else:
922
1084
    def get_preview_tree(self):
923
1085
        """Return a tree representing the result of the transform.
924
1086
 
925
 
        The tree is a snapshot, and altering the TreeTransform will invalidate
926
 
        it.
 
1087
        This tree only supports the subset of Tree functionality required
 
1088
        by show_diff_trees.  It must only be compared to tt._tree.
927
1089
        """
928
1090
        return _PreviewTree(self)
929
1091
 
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
 
            osutils.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):
 
1092
 
 
1093
class TreeTransform(TreeTransformBase):
1279
1094
    """Represent a tree transformation.
1280
1095
 
1281
1096
    This object is designed to support incremental generation of the transform,
1340
1155
    FileMover does not delete files until it is sure that a rollback will not
1341
1156
    happen.
1342
1157
    """
1343
 
    def __init__(self, tree, pb=None):
 
1158
    def __init__(self, tree, pb=DummyProgress()):
1344
1159
        """Note: a tree_write lock is taken on the tree.
1345
1160
 
1346
1161
        Use TreeTransform.finalize() to release the lock (can be omitted if
1367
1182
            tree.unlock()
1368
1183
            raise
1369
1184
 
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,
 
1185
        TreeTransformBase.__init__(self, tree, limbodir, pb,
1375
1186
                                   tree.case_sensitive)
1376
1187
        self._deletiondir = deletiondir
1377
1188
 
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
1189
    def apply(self, no_conflicts=False, precomputed_delta=None, _mover=None):
1508
1190
        """Apply all changes to the inventory and filesystem.
1509
1191
 
1519
1201
        :param _mover: Supply an alternate FileMover, for testing
1520
1202
        """
1521
1203
        if not no_conflicts:
1522
 
            self._check_malformed()
 
1204
            conflicts = self.find_conflicts()
 
1205
            if len(conflicts) != 0:
 
1206
                raise MalformedTransform(conflicts=conflicts)
 
1207
        if precomputed_delta is None:
 
1208
            new_inventory_delta = []
 
1209
            inventory_delta = new_inventory_delta
 
1210
        else:
 
1211
            new_inventory_delta = None
 
1212
            inventory_delta = precomputed_delta
1523
1213
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1524
1214
        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
1215
            if _mover is None:
1533
1216
                mover = _FileMover()
1534
1217
            else:
1535
1218
                mover = _mover
1536
1219
            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)
 
1220
                child_pb.update('Apply phase', 0, 2)
 
1221
                kind_changes = self._apply_removals(new_inventory_delta, mover)
 
1222
                child_pb.update('Apply phase', 1, 2)
 
1223
                modified_paths = self._apply_insertions(new_inventory_delta,
 
1224
                                                        mover, kind_changes)
1541
1225
            except:
1542
1226
                mover.rollback()
1543
1227
                raise
1550
1234
        self.finalize()
1551
1235
        return _TransformResults(modified_paths, self.rename_count)
1552
1236
 
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):
 
1237
    def _apply_removals(self, inventory_delta, mover):
1615
1238
        """Perform tree operations that remove directory/inventory names.
1616
1239
 
1617
1240
        That is, delete files that are to be deleted, and put any files that
1622
1245
        """
1623
1246
        tree_paths = list(self._tree_path_ids.iteritems())
1624
1247
        tree_paths.sort(reverse=True)
 
1248
        kind_changes = set()
1625
1249
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1626
1250
        try:
1627
1251
            for num, data in enumerate(tree_paths):
1629
1253
                child_pb.update('removing file', num, len(tree_paths))
1630
1254
                full_path = self._tree.abspath(path)
1631
1255
                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):
 
1256
                    try:
 
1257
                        if (self.tree_kind(trans_id)
 
1258
                                != self.final_kind(trans_id)):
 
1259
                            kind_changes.add(trans_id)
 
1260
                    except NoSuchFile:
 
1261
                        pass
 
1262
                    mover.pre_delete(full_path, os.path.join(self._deletiondir,
 
1263
                                     trans_id))
 
1264
                elif trans_id in self._new_name or trans_id in \
 
1265
                    self._new_parent:
1636
1266
                    try:
1637
1267
                        mover.rename(full_path, self._limbo_name(trans_id))
1638
1268
                    except OSError, e:
1640
1270
                            raise
1641
1271
                    else:
1642
1272
                        self.rename_count += 1
 
1273
                if (trans_id in self._removed_id
 
1274
                    and inventory_delta is not None):
 
1275
                    if trans_id == self._new_root:
 
1276
                        file_id = self._tree.get_root_id()
 
1277
                    else:
 
1278
                        file_id = self.tree_file_id(trans_id)
 
1279
                    # File-id isn't really being deleted, just moved
 
1280
                    if file_id in self._r_new_id:
 
1281
                        continue
 
1282
                    inventory_delta.append((path, None, file_id, None))
1643
1283
        finally:
1644
1284
            child_pb.finished()
 
1285
        return kind_changes
1645
1286
 
1646
 
    def _apply_insertions(self, mover):
 
1287
    def _apply_insertions(self, inventory_delta, mover, kind_changes):
1647
1288
        """Perform tree operations that insert directory/inventory names.
1648
1289
 
1649
1290
        That is, create any files that need to be created, and restore from
1652
1293
 
1653
1294
        If inventory_delta is None, no inventory delta is calculated, and
1654
1295
        no list of modified paths is returned.
 
1296
 
 
1297
        kind_changes is a set of trans ids where the entry has changed
 
1298
        kind, and so an inventory delta entry should be created for them.
1655
1299
        """
1656
 
        new_paths = self.new_paths(filesystem_only=True)
 
1300
        new_paths = self.new_paths(filesystem_only=(inventory_delta is None))
1657
1301
        modified_paths = []
 
1302
        completed_new = []
1658
1303
        new_path_file_ids = dict((t, self.final_file_id(t)) for p, t in
1659
1304
                                 new_paths)
 
1305
        if inventory_delta is not None:
 
1306
            entries = self._tree.iter_entries_by_dir(
 
1307
                new_path_file_ids.values())
 
1308
            old_paths = dict((e.file_id, p) for p, e in entries)
1660
1309
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1661
1310
        try:
1662
1311
            for num, (path, trans_id) in enumerate(new_paths):
 
1312
                new_entry = None
1663
1313
                if (num % 10) == 0:
1664
1314
                    child_pb.update('adding file', num, len(new_paths))
1665
1315
                full_path = self._tree.abspath(path)
1672
1322
                            raise
1673
1323
                    else:
1674
1324
                        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)
 
1325
                if inventory_delta is not None:
 
1326
                    if (trans_id in self._new_contents or
 
1327
                        self.path_changed(trans_id)):
 
1328
                        if trans_id in self._new_contents:
 
1329
                            modified_paths.append(full_path)
 
1330
                            completed_new.append(trans_id)
 
1331
                    file_id = new_path_file_ids[trans_id]
 
1332
                    if file_id is not None and (trans_id in self._new_id or
 
1333
                        trans_id in self._new_name or
 
1334
                        trans_id in self._new_parent
 
1335
                        or trans_id in self._new_executability
 
1336
                        or trans_id in kind_changes):
 
1337
                        try:
 
1338
                            kind = self.final_kind(trans_id)
 
1339
                        except NoSuchFile:
 
1340
                            kind = self._tree.stored_kind(file_id)
 
1341
                        parent_trans_id = self.final_parent(trans_id)
 
1342
                        parent_file_id = new_path_file_ids.get(parent_trans_id)
 
1343
                        if parent_file_id is None:
 
1344
                            parent_file_id = self.final_file_id(
 
1345
                                parent_trans_id)
 
1346
                        if trans_id in self._new_reference_revision:
 
1347
                            new_entry = inventory.TreeReference(
 
1348
                                file_id,
 
1349
                                self._new_name[trans_id],
 
1350
                                self.final_file_id(self._new_parent[trans_id]),
 
1351
                                None, self._new_reference_revision[trans_id])
 
1352
                        else:
 
1353
                            new_entry = inventory.make_entry(kind,
 
1354
                                self.final_name(trans_id),
 
1355
                                parent_file_id, file_id)
 
1356
                        old_path = old_paths.get(new_entry.file_id)
 
1357
                        inventory_delta.append(
 
1358
                            (old_path, path, new_entry.file_id, new_entry))
 
1359
 
1679
1360
                if trans_id in self._new_executability:
1680
 
                    self._set_executability(path, trans_id)
 
1361
                    self._set_executability(path, new_entry, trans_id)
1681
1362
        finally:
1682
1363
            child_pb.finished()
1683
 
        self._new_contents.clear()
 
1364
        if inventory_delta is None:
 
1365
            self._new_contents.clear()
 
1366
        else:
 
1367
            for trans_id in completed_new:
 
1368
                del self._new_contents[trans_id]
1684
1369
        return modified_paths
1685
1370
 
1686
1371
 
1687
 
class TransformPreview(DiskTreeTransform):
 
1372
class TransformPreview(TreeTransformBase):
1688
1373
    """A TreeTransform for generating preview trees.
1689
1374
 
1690
1375
    Unlike TreeTransform, this version works when the input tree is a
1692
1377
    unversioned files in the input tree.
1693
1378
    """
1694
1379
 
1695
 
    def __init__(self, tree, pb=None, case_sensitive=True):
 
1380
    def __init__(self, tree, pb=DummyProgress(), case_sensitive=True):
1696
1381
        tree.lock_read()
1697
 
        limbodir = osutils.mkdtemp(prefix='bzr-limbo-')
1698
 
        DiskTreeTransform.__init__(self, tree, limbodir, pb, case_sensitive)
 
1382
        limbodir = tempfile.mkdtemp(prefix='bzr-limbo-')
 
1383
        TreeTransformBase.__init__(self, tree, limbodir, pb, case_sensitive)
1699
1384
 
1700
1385
    def canonical_path(self, path):
1701
1386
        return path
1725
1410
        file_id = self.tree_file_id(parent_id)
1726
1411
        if file_id is None:
1727
1412
            return
1728
 
        entry = self._tree.iter_entries_by_dir([file_id]).next()[1]
1729
 
        children = getattr(entry, 'children', {})
 
1413
        children = getattr(self._tree.inventory[file_id], 'children', {})
1730
1414
        for child in children:
1731
1415
            childpath = joinpath(path, child)
1732
1416
            yield self.trans_id_tree_path(childpath)
1740
1424
        self._final_paths = FinalPaths(transform)
1741
1425
        self.__by_parent = None
1742
1426
        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())
 
1427
 
 
1428
    def _changes(self, file_id):
 
1429
        for changes in self._transform.iter_changes():
 
1430
            if changes[0] == file_id:
 
1431
                return changes
1748
1432
 
1749
1433
    def _content_change(self, file_id):
1750
1434
        """Return True if the content of this file changed"""
1751
 
        changes = self._iter_changes_cache.get(file_id)
 
1435
        changes = self._changes(file_id)
1752
1436
        # changes[2] is true if the file content changed.  See
1753
1437
        # InterTree.iter_changes.
1754
1438
        return (changes is not None and changes[2])
1788
1472
            self.__by_parent = self._transform.by_parent()
1789
1473
        return self.__by_parent
1790
1474
 
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
1475
    def lock_read(self):
1802
1476
        # Perhaps in theory, this should lock the TreeTransform?
1803
1477
        pass
1823
1497
    def __iter__(self):
1824
1498
        return iter(self.all_file_ids())
1825
1499
 
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)
 
1500
    def paths2ids(self, specific_files, trees=None, require_versioned=False):
 
1501
        """See Tree.paths2ids"""
 
1502
        to_find = set(specific_files)
 
1503
        result = set()
 
1504
        for (file_id, paths, changed, versioned, parent, name, kind,
 
1505
             executable) in self._transform.iter_changes():
 
1506
            if paths[1] in to_find:
 
1507
                result.append(file_id)
 
1508
                to_find.remove(paths[1])
 
1509
        result.update(self._transform._tree.paths2ids(to_find,
 
1510
                      trees=[], require_versioned=require_versioned))
 
1511
        return result
1840
1512
 
1841
1513
    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
1514
        segments = splitpath(path)
1847
1515
        cur_parent = self._transform.root
1848
1516
        for cur_segment in segments:
1849
1517
            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:
 
1518
                if self._transform.final_name(child) == cur_segment:
1855
1519
                    cur_parent = child
1856
1520
                    break
1857
1521
            else:
1858
 
                self._path2trans_id_cache[path] = None
1859
1522
                return None
1860
 
        self._path2trans_id_cache[path] = cur_parent
1861
1523
        return cur_parent
1862
1524
 
1863
1525
    def path2id(self, path):
1871
1533
            raise errors.NoSuchId(self, file_id)
1872
1534
 
1873
1535
    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
1536
        children = set(self._transform.iter_tree_children(trans_id))
1878
1537
        # children in the _new_parent set are provided by _by_parent.
1879
1538
        children.difference_update(self._transform._new_parent.keys())
1880
1539
        children.update(self._by_parent.get(trans_id, []))
1881
 
        self._all_children_cache[trans_id] = children
1882
1540
        return children
1883
1541
 
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):
 
1542
    def _make_inv_entries(self, ordered_entries, specific_file_ids):
1900
1543
        for trans_id, parent_file_id in ordered_entries:
1901
1544
            file_id = self._transform.final_file_id(trans_id)
1902
1545
            if file_id is None:
1914
1557
                parent_file_id, file_id)
1915
1558
            yield new_entry, trans_id
1916
1559
 
1917
 
    def _list_files_by_dir(self):
 
1560
    def iter_entries_by_dir(self, specific_file_ids=None):
 
1561
        # This may not be a maximally efficient implementation, but it is
 
1562
        # reasonably straightforward.  An implementation that grafts the
 
1563
        # TreeTransform changes onto the tree's iter_entries_by_dir results
 
1564
        # might be more efficient, but requires tricky inferences about stack
 
1565
        # position.
1918
1566
        todo = [ROOT_PARENT]
1919
1567
        ordered_ids = []
1920
1568
        while len(todo) > 0:
1926
1574
            todo.extend(reversed(children))
1927
1575
            for trans_id in children:
1928
1576
                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
1577
        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
 
1578
                                                      specific_file_ids):
 
1579
            yield unicode(self._final_paths.get_path(trans_id)), entry
1977
1580
 
1978
1581
    def kind(self, file_id):
1979
1582
        trans_id = self._transform.trans_id_file_id(file_id)
1989
1592
    def get_file_mtime(self, file_id, path=None):
1990
1593
        """See Tree.get_file_mtime"""
1991
1594
        if not self._content_change(file_id):
1992
 
            return self._transform._tree.get_file_mtime(file_id)
 
1595
            return self._transform._tree.get_file_mtime(file_id, path)
1993
1596
        return self._stat_limbo_file(file_id).st_mtime
1994
1597
 
1995
 
    def _file_size(self, entry, stat_value):
1996
 
        return self.get_file_size(entry.file_id)
1997
 
 
1998
1598
    def get_file_size(self, file_id):
1999
1599
        """See Tree.get_file_size"""
2000
1600
        if self.kind(file_id) == 'file':
2003
1603
            return None
2004
1604
 
2005
1605
    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()
 
1606
        return self._transform._tree.get_file_sha1(file_id)
2016
1607
 
2017
1608
    def is_executable(self, file_id, path=None):
2018
 
        if file_id is None:
2019
 
            return False
2020
1609
        trans_id = self._transform.trans_id_file_id(file_id)
2021
1610
        try:
2022
1611
            return self._transform._new_executability[trans_id]
2023
1612
        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
 
1613
            return self._transform._tree.is_executable(file_id, path)
2032
1614
 
2033
1615
    def path_content_summary(self, path):
2034
1616
        trans_id = self._path2trans_id(path)
2049
1631
                statval = os.lstat(limbo_name)
2050
1632
                size = statval.st_size
2051
1633
                if not supports_executable():
2052
 
                    executable = False
 
1634
                    executable = None
2053
1635
                else:
2054
1636
                    executable = statval.st_mode & S_IEXEC
2055
1637
            else:
2056
1638
                size = None
2057
1639
                executable = None
2058
1640
            if kind == 'symlink':
2059
 
                link_or_sha1 = os.readlink(limbo_name).decode(osutils._fs_enc)
2060
 
        executable = tt._new_executability.get(trans_id, executable)
 
1641
                link_or_sha1 = os.readlink(limbo_name)
 
1642
        if supports_executable():
 
1643
            executable = tt._new_executability.get(trans_id, executable)
2061
1644
        return kind, size, executable, link_or_sha1
2062
1645
 
2063
1646
    def iter_changes(self, from_tree, include_unchanged=False,
2065
1648
                      require_versioned=True, want_unversioned=False):
2066
1649
        """See InterTree.iter_changes.
2067
1650
 
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.
 
1651
        This implementation does not support include_unchanged, specific_files,
 
1652
        or want_unversioned.  extra_trees, require_versioned, and pb are
 
1653
        ignored.
2070
1654
        """
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)
 
1655
        if from_tree is not self._transform._tree:
 
1656
            raise ValueError('from_tree must be transform source tree.')
 
1657
        if include_unchanged:
 
1658
            raise ValueError('include_unchanged is not supported')
 
1659
        if specific_files is not None:
 
1660
            raise ValueError('specific_files is not supported')
2080
1661
        if want_unversioned:
2081
1662
            raise ValueError('want_unversioned is not supported')
2082
1663
        return self._transform.iter_changes()
2089
1670
        name = self._transform._limbo_name(trans_id)
2090
1671
        return open(name, 'rb')
2091
1672
 
2092
 
    def get_file_with_stat(self, file_id, path=None):
2093
 
        return self.get_file(file_id, path), None
 
1673
    def get_file_text(self, file_id):
 
1674
        text_file = self.get_file(file_id)
 
1675
        try:
 
1676
            return text_file.read()
 
1677
        finally:
 
1678
            text_file.close()
2094
1679
 
2095
1680
    def annotate_iter(self, file_id,
2096
1681
                      default_revision=_mod_revision.CURRENT_REVISION):
2097
 
        changes = self._iter_changes_cache.get(file_id)
 
1682
        changes = self._changes(file_id)
2098
1683
        if changes is None:
2099
1684
            get_old = True
2100
1685
        else:
2112
1697
            return old_annotation
2113
1698
        if not changed_content:
2114
1699
            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
1700
        return annotate.reannotate([old_annotation],
2123
1701
                                   self.get_file(file_id).readlines(),
2124
1702
                                   default_revision)
2129
1707
            return self._transform._tree.get_symlink_target(file_id)
2130
1708
        trans_id = self._transform.trans_id_file_id(file_id)
2131
1709
        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))
 
1710
        return os.readlink(name)
 
1711
 
 
1712
    def list_files(self, include_root=False):
 
1713
        return self._transform._tree.list_files(include_root)
 
1714
 
 
1715
    def walkdirs(self, prefix=""):
 
1716
        return self._transform._tree.walkdirs(prefix)
2162
1717
 
2163
1718
    def get_parent_ids(self):
2164
1719
        return self._parent_ids
2190
1745
        self.transform = transform
2191
1746
 
2192
1747
    def _determine_path(self, trans_id):
2193
 
        if (trans_id == self.transform.root or trans_id == ROOT_PARENT):
 
1748
        if trans_id == self.transform.root:
2194
1749
            return ""
2195
1750
        name = self.transform.final_name(trans_id)
2196
1751
        parent_id = self.transform.final_parent(trans_id)
2220
1775
def build_tree(tree, wt, accelerator_tree=None, hardlink=False,
2221
1776
               delta_from_tree=False):
2222
1777
    """Create working tree for a branch, using a TreeTransform.
2223
 
 
 
1778
    
2224
1779
    This function should be used on empty trees, having a tree root at most.
2225
1780
    (see merge and revert functionality for working with existing trees)
2226
1781
 
2227
1782
    Existing files are handled like so:
2228
 
 
 
1783
    
2229
1784
    - Existing bzrdirs take precedence over creating new items.  They are
2230
1785
      created as '%s.diverted' % name.
2231
1786
    - Otherwise, if the content on disk matches the content we are building,
2333
1888
                    executable = tree.is_executable(file_id, tree_path)
2334
1889
                    if executable:
2335
1890
                        tt.set_executability(executable, trans_id)
2336
 
                    trans_data = (trans_id, tree_path)
2337
 
                    deferred_contents.append((file_id, trans_data))
 
1891
                    deferred_contents.append((file_id, trans_id))
2338
1892
                else:
2339
1893
                    file_trans_id[file_id] = new_by_entry(tt, entry, parent_id,
2340
1894
                                                          tree)
2371
1925
def _create_files(tt, tree, desired_files, pb, offset, accelerator_tree,
2372
1926
                  hardlink):
2373
1927
    total = len(desired_files) + offset
2374
 
    wt = tt._tree
2375
1928
    if accelerator_tree is None:
2376
1929
        new_desired_files = desired_files
2377
1930
    else:
2378
1931
        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)
 
1932
        unchanged = dict((f, p[1]) for (f, p, c, v, d, n, k, e)
 
1933
                         in iter if not (c or e[0] != e[1]))
2385
1934
        new_desired_files = []
2386
1935
        count = 0
2387
 
        for file_id, (trans_id, tree_path) in desired_files:
 
1936
        for file_id, trans_id in desired_files:
2388
1937
            accelerator_path = unchanged.get(file_id)
2389
1938
            if accelerator_path is None:
2390
 
                new_desired_files.append((file_id, (trans_id, tree_path)))
 
1939
                new_desired_files.append((file_id, trans_id))
2391
1940
                continue
2392
1941
            pb.update('Adding file contents', count + offset, total)
2393
1942
            if hardlink:
2395
1944
                                   trans_id)
2396
1945
            else:
2397
1946
                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
1947
                try:
2403
1948
                    tt.create_file(contents, trans_id)
2404
1949
                finally:
2405
 
                    try:
2406
 
                        contents.close()
2407
 
                    except AttributeError:
2408
 
                        # after filtering, contents may no longer be file-like
2409
 
                        pass
 
1950
                    contents.close()
2410
1951
            count += 1
2411
1952
        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))
 
1953
    for count, (trans_id, contents) in enumerate(tree.iter_files_bytes(
 
1954
                                                 new_desired_files)):
2418
1955
        tt.create_file(contents, trans_id)
2419
1956
        pb.update('Adding file contents', count + offset, total)
2420
1957
 
2480
2017
    if kind == 'file':
2481
2018
        contents = tree.get_file(entry.file_id).readlines()
2482
2019
        executable = tree.is_executable(entry.file_id)
2483
 
        return tt.new_file(name, parent_id, contents, entry.file_id,
 
2020
        return tt.new_file(name, parent_id, contents, entry.file_id, 
2484
2021
                           executable)
2485
2022
    elif kind in ('directory', 'tree-reference'):
2486
2023
        trans_id = tt.new_directory(name, parent_id, entry.file_id)
2487
2024
        if kind == 'tree-reference':
2488
2025
            tt.set_tree_reference(entry.reference_revision, trans_id)
2489
 
        return trans_id
 
2026
        return trans_id 
2490
2027
    elif kind == 'symlink':
2491
2028
        target = tree.get_symlink_target(entry.file_id)
2492
2029
        return tt.new_symlink(name, parent_id, target, entry.file_id)
2494
2031
        raise errors.BadFileKindError(name, kind)
2495
2032
 
2496
2033
 
2497
 
@deprecated_function(deprecated_in((1, 9, 0)))
2498
2034
def create_by_entry(tt, entry, tree, trans_id, lines=None, mode_id=None):
2499
 
    """Create new file contents according to an inventory entry.
2500
 
 
2501
 
    DEPRECATED.  Use create_from_tree instead.
2502
 
    """
 
2035
    """Create new file contents according to an inventory entry."""
2503
2036
    if entry.kind == "file":
2504
2037
        if lines is None:
2505
2038
            lines = tree.get_file(entry.file_id).readlines()
2510
2043
        tt.create_directory(trans_id)
2511
2044
 
2512
2045
 
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
 
 
2543
2046
def create_entry_executability(tt, entry, trans_id):
2544
2047
    """Set the executability of a trans_id according to an inventory entry"""
2545
2048
    if entry.kind == "file":
2582
2085
        if entry.kind != working_kind:
2583
2086
            contents_mod, meta_mod = True, False
2584
2087
        else:
2585
 
            cur_entry._read_tree_state(working_tree.id2path(file_id),
 
2088
            cur_entry._read_tree_state(working_tree.id2path(file_id), 
2586
2089
                                       working_tree)
2587
2090
            contents_mod, meta_mod = entry.detect_changes(cur_entry)
2588
2091
            cur_entry._forget_tree_state()
2590
2093
 
2591
2094
 
2592
2095
def revert(working_tree, target_tree, filenames, backups=False,
2593
 
           pb=None, change_reporter=None):
 
2096
           pb=DummyProgress(), change_reporter=None):
2594
2097
    """Revert a working tree's contents to those of a target tree."""
2595
2098
    target_tree.lock_read()
2596
 
    pb = ui.ui_factory.nested_progress_bar()
2597
2099
    tt = TreeTransform(working_tree, pb)
2598
2100
    try:
2599
2101
        pp = ProgressPhase("Revert phase", 3, pb)
2600
 
        conflicts, merge_modified = _prepare_revert_transform(
2601
 
            working_tree, target_tree, tt, filenames, backups, pp)
 
2102
        pp.next_phase()
 
2103
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
2104
        try:
 
2105
            merge_modified = _alter_files(working_tree, target_tree, tt,
 
2106
                                          child_pb, filenames, backups)
 
2107
        finally:
 
2108
            child_pb.finished()
 
2109
        pp.next_phase()
 
2110
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
2111
        try:
 
2112
            raw_conflicts = resolve_conflicts(tt, child_pb,
 
2113
                lambda t, c: conflict_pass(t, c, target_tree))
 
2114
        finally:
 
2115
            child_pb.finished()
 
2116
        conflicts = cook_conflicts(raw_conflicts, tt)
2602
2117
        if change_reporter:
2603
2118
            change_reporter = delta._ChangeReporter(
2604
2119
                unversioned_filter=working_tree.is_ignored)
2615
2130
    return conflicts
2616
2131
 
2617
2132
 
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
 
 
2640
2133
def _alter_files(working_tree, target_tree, tt, pb, specific_files,
2641
 
                 backups, merge_modified, basis_tree=None):
2642
 
    if basis_tree is not None:
2643
 
        basis_tree.lock_read()
 
2134
                 backups):
 
2135
    merge_modified = working_tree.merge_modified()
2644
2136
    change_list = target_tree.iter_changes(working_tree,
2645
2137
        specific_files=specific_files, pb=pb)
2646
 
    if target_tree.get_root_id() is None:
 
2138
    if target_tree.inventory.root is None:
2647
2139
        skip_root = True
2648
2140
    else:
2649
2141
        skip_root = False
 
2142
    basis_tree = None
2650
2143
    try:
2651
2144
        deferred_files = []
2652
2145
        for id_num, (file_id, path, changed_content, versioned, parent, name,
2688
2181
                        # contents
2689
2182
                        mode_id = trans_id
2690
2183
                        trans_id = new_trans_id
2691
 
                if kind[1] in ('directory', 'tree-reference'):
 
2184
                if kind[1] == 'directory':
2692
2185
                    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)
2697
2186
                elif kind[1] == 'symlink':
2698
2187
                    tt.create_symlink(target_tree.get_symlink_target(file_id),
2699
2188
                                      trans_id)
2719
2208
                tt.version_file(file_id, trans_id)
2720
2209
            if versioned == (True, False):
2721
2210
                tt.unversion_file(trans_id)
2722
 
            if (name[1] is not None and
 
2211
            if (name[1] is not None and 
2723
2212
                (name[0] != name[1] or parent[0] != parent[1])):
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)
 
2213
                tt.adjust_path(
 
2214
                    name[1], tt.trans_id_file_id(parent[1]), trans_id)
2732
2215
            if executable[0] != executable[1] and kind[1] == "file":
2733
2216
                tt.set_executability(executable[1], trans_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()
 
2217
        for (trans_id, mode_id), bytes in target_tree.iter_files_bytes(
 
2218
            deferred_files):
 
2219
            tt.create_file(bytes, trans_id, mode_id)
2751
2220
    finally:
2752
2221
        if basis_tree is not None:
2753
2222
            basis_tree.unlock()
2754
2223
    return merge_modified
2755
2224
 
2756
2225
 
2757
 
def resolve_conflicts(tt, pb=None, pass_func=None):
 
2226
def resolve_conflicts(tt, pb=DummyProgress(), pass_func=None):
2758
2227
    """Make many conflict-resolution attempts, but die if they fail"""
2759
2228
    if pass_func is None:
2760
2229
        pass_func = conflict_pass
2761
2230
    new_conflicts = set()
2762
 
    pb = ui.ui_factory.nested_progress_bar()
2763
2231
    try:
2764
2232
        for n in range(10):
2765
2233
            pb.update('Resolution pass', n+1, 10)
2769
2237
            new_conflicts.update(pass_func(tt, conflicts))
2770
2238
        raise MalformedTransform(conflicts=conflicts)
2771
2239
    finally:
2772
 
        pb.finished()
 
2240
        pb.clear()
2773
2241
 
2774
2242
 
2775
2243
def conflict_pass(tt, conflicts, path_tree=None):
2794
2262
                existing_file, new_file = conflict[1], conflict[2]
2795
2263
            new_name = tt.final_name(existing_file)+'.moved'
2796
2264
            tt.adjust_path(new_name, final_parent, existing_file)
2797
 
            new_conflicts.add((c_type, 'Moved existing file to',
 
2265
            new_conflicts.add((c_type, 'Moved existing file to', 
2798
2266
                               existing_file, new_file))
2799
2267
        elif c_type == 'parent loop':
2800
2268
            # break the loop by undoing one of the ops that caused the loop
2804
2272
            new_conflicts.add((c_type, 'Cancelled move', cur,
2805
2273
                               tt.final_parent(cur),))
2806
2274
            tt.adjust_path(tt.final_name(cur), tt.get_tree_parent(cur), cur)
2807
 
 
 
2275
            
2808
2276
        elif c_type == 'missing parent':
2809
2277
            trans_id = conflict[1]
2810
2278
            try:
2811
2279
                tt.cancel_deletion(trans_id)
2812
 
                new_conflicts.add(('deleting parent', 'Not deleting',
 
2280
                new_conflicts.add(('deleting parent', 'Not deleting', 
2813
2281
                                   trans_id))
2814
2282
            except KeyError:
2815
2283
                create = True
2824
2292
                        # special-case the other tree root (move its
2825
2293
                        # children to current root)
2826
2294
                        if entry.parent_id is None:
2827
 
                            create = False
 
2295
                            create=False
2828
2296
                            moved = _reparent_transform_children(
2829
2297
                                tt, trans_id, tt.root)
2830
2298
                            for child in moved:
2857
2325
            if parent_file_id is not None:
2858
2326
                tt.unversion_file(parent_id)
2859
2327
            new_conflicts.add((c_type, 'Created directory', new_parent_id))
2860
 
        elif c_type == 'versioning no contents':
2861
 
            tt.cancel_versioning(conflict[1])
2862
2328
    return new_conflicts
2863
2329
 
2864
2330
 
2880
2346
        if len(conflict) == 3:
2881
2347
            yield Conflict.factory(c_type, action=action, path=modified_path,
2882
2348
                                     file_id=modified_id)
2883
 
 
 
2349
             
2884
2350
        else:
2885
2351
            conflicting_path = fp.get_path(conflict[3])
2886
2352
            conflicting_id = tt.final_file_id(conflict[3])
2887
2353
            yield Conflict.factory(c_type, action=action, path=modified_path,
2888
 
                                   file_id=modified_id,
 
2354
                                   file_id=modified_id, 
2889
2355
                                   conflict_path=conflicting_path,
2890
2356
                                   conflict_file_id=conflicting_id)
2891
2357
 
2898
2364
        self.pending_deletions = []
2899
2365
 
2900
2366
    def rename(self, from_, to):
2901
 
        """Rename a file from one path to another."""
 
2367
        """Rename a file from one path to another.  Functions like os.rename"""
2902
2368
        try:
2903
 
            osutils.rename(from_, to)
 
2369
            os.rename(from_, to)
2904
2370
        except OSError, e:
2905
2371
            if e.errno in (errno.EEXIST, errno.ENOTEMPTY):
2906
2372
                raise errors.FileExists(to, str(e))
2920
2386
    def rollback(self):
2921
2387
        """Reverse all renames that have been performed"""
2922
2388
        for from_, to in reversed(self.past_renames):
2923
 
            osutils.rename(to, from_)
 
2389
            os.rename(to, from_)
2924
2390
        # after rollback, don't reuse _FileMover
2925
2391
        past_renames = None
2926
2392
        pending_deletions = None