/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: Jelmer Vernooij
  • Date: 2008-07-08 15:58:12 UTC
  • mfrom: (3353.1.4 paramiko-1.7.2-compat)
  • mto: This revision was merged to the branch mainline in revision 3531.
  • Revision ID: jelmer@samba.org-20080708155812-gacwrgs7d7n48a0d
Merge bashprompt script that prints the bzr branch nick.

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
 
    commit,
29
27
    delta,
30
28
    errors,
31
29
    inventory,
32
 
    multiparent,
33
 
    osutils,
34
30
    revision as _mod_revision,
35
 
    ui,
36
31
    )
37
32
""")
38
33
from bzrlib.errors import (DuplicateKey, MalformedTransform, NoSuchFile,
39
 
                           ReusingTransform, CantMoveRoot,
 
34
                           ReusingTransform, NotVersionedError, CantMoveRoot,
40
35
                           ExistingLimbo, ImmortalLimbo, NoFinalPath,
41
36
                           UnableCreateSymlink)
42
 
from bzrlib.filters import filtered_output_bytes, ContentFilterContext
43
37
from bzrlib.inventory import InventoryEntry
44
38
from bzrlib.osutils import (
45
39
    delete_any,
47
41
    has_symlinks,
48
42
    lexists,
49
43
    pathjoin,
50
 
    sha_file,
51
44
    splitpath,
52
45
    supports_executable,
53
46
)
54
 
from bzrlib.progress import ProgressPhase
 
47
from bzrlib.progress import DummyProgress, ProgressPhase
55
48
from bzrlib.symbol_versioning import (
56
49
        deprecated_function,
57
 
        deprecated_in,
58
50
        )
59
51
from bzrlib.trace import mutter, warning
60
52
from bzrlib import tree
79
71
 
80
72
 
81
73
class TreeTransformBase(object):
82
 
    """The base class for TreeTransform and its kin."""
 
74
    """The base class for TreeTransform and TreeTransformBase"""
83
75
 
84
 
    def __init__(self, tree, pb=None,
 
76
    def __init__(self, tree, limbodir, pb=DummyProgress(),
85
77
                 case_sensitive=True):
86
78
        """Constructor.
87
79
 
88
80
        :param tree: The tree that will be transformed, but not necessarily
89
81
            the output tree.
90
 
        :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
91
85
        :param case_sensitive: If True, the target of the transform is
92
86
            case sensitive, not just case preserving.
93
87
        """
94
88
        object.__init__(self)
95
89
        self._tree = tree
 
90
        self._limbodir = limbodir
 
91
        self._deletiondir = None
96
92
        self._id_number = 0
97
93
        # mapping of trans_id -> new basename
98
94
        self._new_name = {}
100
96
        self._new_parent = {}
101
97
        # mapping of trans_id with new contents -> new file_kind
102
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()
103
108
        # Set of trans_ids whose contents will be removed
104
109
        self._removed_contents = set()
105
110
        # Mapping of trans_id -> new execute-bit value
112
117
        self._non_present_ids = {}
113
118
        # Mapping of new file_id -> trans_id
114
119
        self._r_new_id = {}
115
 
        # Set of trans_ids that will be removed
 
120
        # Set of file_ids that will be removed
116
121
        self._removed_id = set()
117
122
        # Mapping of path in old tree -> trans_id
118
123
        self._tree_path_ids = {}
119
124
        # Mapping trans_id -> path in old tree
120
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 = {}
121
130
        # The trans_id that will be used as the tree root
122
 
        root_id = tree.get_root_id()
123
 
        if root_id is not None:
124
 
            self._new_root = self.trans_id_tree_file_id(root_id)
125
 
        else:
126
 
            self._new_root = None
 
131
        self._new_root = self.trans_id_tree_file_id(tree.get_root_id())
127
132
        # Indictor of whether the transform has been applied
128
133
        self._done = False
129
134
        # A progress bar
133
138
        # A counter of how many files have been renamed
134
139
        self.rename_count = 0
135
140
 
136
 
    def finalize(self):
137
 
        """Release the working tree lock, if held.
138
 
 
139
 
        This is required if apply has not been invoked, but can be invoked
140
 
        even after apply.
141
 
        """
142
 
        if self._tree is None:
143
 
            return
144
 
        self._tree.unlock()
145
 
        self._tree = None
146
 
 
147
141
    def __get_root(self):
148
142
        return self._new_root
149
143
 
150
144
    root = property(__get_root)
151
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
 
152
177
    def _assign_id(self):
153
178
        """Produce a new tranform id"""
154
179
        new_id = "new-%s" % self._id_number
164
189
 
165
190
    def adjust_path(self, name, parent, trans_id):
166
191
        """Change the path that is assigned to a transaction id."""
167
 
        if parent is None:
168
 
            raise ValueError("Parent trans-id may not be None")
169
192
        if trans_id == self._new_root:
170
193
            raise CantMoveRoot
 
194
        previous_parent = self._new_parent.get(trans_id)
 
195
        previous_name = self._new_name.get(trans_id)
171
196
        self._new_name[trans_id] = name
172
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)
173
221
 
174
222
    def adjust_root_path(self, name, parent):
175
223
        """Emulate moving the root by moving all children, instead.
176
 
 
 
224
        
177
225
        We do this by undoing the association of root's transaction id with the
178
226
        current tree.  This allows us to create a new directory with that
179
 
        transaction id.  We unversion the root directory and version the
 
227
        transaction id.  We unversion the root directory and version the 
180
228
        physically new directory, and hope someone versions the tree root
181
229
        later.
182
230
        """
185
233
        # force moving all children of root
186
234
        for child_id in self.iter_tree_children(old_root):
187
235
            if child_id != parent:
188
 
                self.adjust_path(self.final_name(child_id),
 
236
                self.adjust_path(self.final_name(child_id), 
189
237
                                 self.final_parent(child_id), child_id)
190
238
            file_id = self.final_file_id(child_id)
191
239
            if file_id is not None:
192
240
                self.unversion_file(child_id)
193
241
            self.version_file(file_id, child_id)
194
 
 
 
242
        
195
243
        # the physical root needs a new transaction id
196
244
        self._tree_path_ids.pop("")
197
245
        self._tree_id_paths.pop(old_root)
203
251
        self.version_file(old_root_file_id, old_root)
204
252
        self.unversion_file(self._new_root)
205
253
 
206
 
    def fixup_new_roots(self):
207
 
        """Reinterpret requests to change the root directory
208
 
 
209
 
        Instead of creating a root directory, or moving an existing directory,
210
 
        all the attributes and children of the new root are applied to the
211
 
        existing root directory.
212
 
 
213
 
        This means that the old root trans-id becomes obsolete, so it is
214
 
        recommended only to invoke this after the root trans-id has become
215
 
        irrelevant.
216
 
        """
217
 
        new_roots = [k for k, v in self._new_parent.iteritems() if v is
218
 
                     ROOT_PARENT]
219
 
        if len(new_roots) < 1:
220
 
            return
221
 
        if len(new_roots) != 1:
222
 
            raise ValueError('A tree cannot have two roots!')
223
 
        if self._new_root is None:
224
 
            self._new_root = new_roots[0]
225
 
            return
226
 
        old_new_root = new_roots[0]
227
 
        # TODO: What to do if a old_new_root is present, but self._new_root is
228
 
        #       not listed as being removed? This code explicitly unversions
229
 
        #       the old root and versions it with the new file_id. Though that
230
 
        #       seems like an incomplete delta
231
 
 
232
 
        # unversion the new root's directory.
233
 
        file_id = self.final_file_id(old_new_root)
234
 
        if old_new_root in self._new_id:
235
 
            self.cancel_versioning(old_new_root)
236
 
        else:
237
 
            self.unversion_file(old_new_root)
238
 
        # if, at this stage, root still has an old file_id, zap it so we can
239
 
        # stick a new one in.
240
 
        if (self.tree_file_id(self._new_root) is not None and
241
 
            self._new_root not in self._removed_id):
242
 
            self.unversion_file(self._new_root)
243
 
        self.version_file(file_id, self._new_root)
244
 
 
245
 
        # Now move children of new root into old root directory.
246
 
        # Ensure all children are registered with the transaction, but don't
247
 
        # use directly-- some tree children have new parents
248
 
        list(self.iter_tree_children(old_new_root))
249
 
        # Move all children of new root into old root directory.
250
 
        for child in self.by_parent().get(old_new_root, []):
251
 
            self.adjust_path(self.final_name(child), self._new_root, child)
252
 
 
253
 
        # Ensure old_new_root has no directory.
254
 
        if old_new_root in self._new_contents:
255
 
            self.cancel_creation(old_new_root)
256
 
        else:
257
 
            self.delete_contents(old_new_root)
258
 
 
259
 
        # prevent deletion of root directory.
260
 
        if self._new_root in self._removed_contents:
261
 
            self.cancel_deletion(self._new_root)
262
 
 
263
 
        # destroy path info for old_new_root.
264
 
        del self._new_parent[old_new_root]
265
 
        del self._new_name[old_new_root]
266
 
 
267
254
    def trans_id_tree_file_id(self, inventory_id):
268
255
        """Determine the transaction id of a working tree file.
269
 
 
 
256
        
270
257
        This reflects only files that already exist, not ones that will be
271
258
        added by transactions.
272
259
        """
273
 
        if inventory_id is None:
274
 
            raise ValueError('None is not a valid file id')
275
260
        path = self._tree.id2path(inventory_id)
276
261
        return self.trans_id_tree_path(path)
277
262
 
281
266
        a transaction has been unversioned, it is deliberately still returned.
282
267
        (this will likely lead to an unversioned parent conflict.)
283
268
        """
284
 
        if file_id is None:
285
 
            raise ValueError('None is not a valid file id')
286
269
        if file_id in self._r_new_id and self._r_new_id[file_id] is not None:
287
270
            return self._r_new_id[file_id]
288
 
        else:
289
 
            try:
290
 
                self._tree.iter_entries_by_dir([file_id]).next()
291
 
            except StopIteration:
292
 
                if file_id in self._non_present_ids:
293
 
                    return self._non_present_ids[file_id]
294
 
                else:
295
 
                    trans_id = self._assign_id()
296
 
                    self._non_present_ids[file_id] = trans_id
297
 
                    return trans_id
298
 
            else:
299
 
                return self.trans_id_tree_file_id(file_id)
 
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
300
298
 
301
299
    def trans_id_tree_path(self, path):
302
300
        """Determine (and maybe set) the transaction ID for a tree path."""
313
311
            return ROOT_PARENT
314
312
        return self.trans_id_tree_path(os.path.dirname(path))
315
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 == errno.ENOENT:
 
358
                return
 
359
            else:
 
360
                raise
 
361
        if typefunc(mode):
 
362
            os.chmod(self._limbo_name(trans_id), mode)
 
363
 
 
364
    def create_hardlink(self, path, trans_id):
 
365
        """Schedule creation of a hard link"""
 
366
        name = self._limbo_name(trans_id)
 
367
        try:
 
368
            os.link(path, name)
 
369
        except OSError, e:
 
370
            if e.errno != errno.EPERM:
 
371
                raise
 
372
            raise errors.HardLinkNotSupported(path)
 
373
        try:
 
374
            unique_add(self._new_contents, trans_id, 'file')
 
375
        except:
 
376
            # Clean up the file, it never got registered so
 
377
            # TreeTransform.finalize() won't clean it up.
 
378
            os.unlink(name)
 
379
            raise
 
380
 
 
381
    def create_directory(self, trans_id):
 
382
        """Schedule creation of a new directory.
 
383
        
 
384
        See also new_directory.
 
385
        """
 
386
        os.mkdir(self._limbo_name(trans_id))
 
387
        unique_add(self._new_contents, trans_id, 'directory')
 
388
 
 
389
    def create_symlink(self, target, trans_id):
 
390
        """Schedule creation of a new symbolic link.
 
391
 
 
392
        target is a bytestring.
 
393
        See also new_symlink.
 
394
        """
 
395
        if has_symlinks():
 
396
            os.symlink(target, self._limbo_name(trans_id))
 
397
            unique_add(self._new_contents, trans_id, 'symlink')
 
398
        else:
 
399
            try:
 
400
                path = FinalPaths(self).get_path(trans_id)
 
401
            except KeyError:
 
402
                path = None
 
403
            raise UnableCreateSymlink(path=path)
 
404
 
 
405
    def cancel_creation(self, trans_id):
 
406
        """Cancel the creation of new file contents."""
 
407
        del self._new_contents[trans_id]
 
408
        children = self._limbo_children.get(trans_id)
 
409
        # if this is a limbo directory with children, move them before removing
 
410
        # the directory
 
411
        if children is not None:
 
412
            self._rename_in_limbo(children)
 
413
            del self._limbo_children[trans_id]
 
414
            del self._limbo_children_names[trans_id]
 
415
        delete_any(self._limbo_name(trans_id))
 
416
 
316
417
    def delete_contents(self, trans_id):
317
418
        """Schedule the contents of a path entry for deletion"""
318
 
        # Ensure that the object exists in the WorkingTree, this will raise an
319
 
        # exception if there is a problem
320
419
        self.tree_kind(trans_id)
321
420
        self._removed_contents.add(trans_id)
322
421
 
367
466
        """
368
467
        new_ids = set()
369
468
        if filesystem_only:
370
 
            stale_ids = self._needs_rename.difference(self._new_name)
371
 
            stale_ids.difference_update(self._new_parent)
372
 
            stale_ids.difference_update(self._new_contents)
373
 
            stale_ids.difference_update(self._new_id)
374
 
            needs_rename = self._needs_rename.difference(stale_ids)
375
 
            id_sets = (needs_rename, self._new_executability)
 
469
            id_sets = (self._needs_rename, self._new_executability)
376
470
        else:
377
471
            id_sets = (self._new_name, self._new_parent, self._new_contents,
378
472
                       self._new_id, self._new_executability)
380
474
            new_ids.update(id_set)
381
475
        return sorted(FinalPaths(self).get_paths(new_ids))
382
476
 
383
 
    def _inventory_altered(self):
384
 
        """Get the trans_ids and paths of files needing new inv entries."""
385
 
        new_ids = set()
386
 
        for id_set in [self._new_name, self._new_parent, self._new_id,
387
 
                       self._new_executability]:
388
 
            new_ids.update(id_set)
389
 
        changed_kind = set(self._removed_contents)
390
 
        changed_kind.intersection_update(self._new_contents)
391
 
        changed_kind.difference_update(new_ids)
392
 
        changed_kind = (t for t in changed_kind if self.tree_kind(t) !=
393
 
                        self.final_kind(t))
394
 
        new_ids.update(changed_kind)
395
 
        return sorted(FinalPaths(self).get_paths(new_ids))
 
477
    def tree_kind(self, trans_id):
 
478
        """Determine the file kind in the working tree.
 
479
 
 
480
        Raises NoSuchFile if the file does not exist
 
481
        """
 
482
        path = self._tree_id_paths.get(trans_id)
 
483
        if path is None:
 
484
            raise NoSuchFile(None)
 
485
        try:
 
486
            return file_kind(self._tree.abspath(path))
 
487
        except OSError, e:
 
488
            if e.errno != errno.ENOENT:
 
489
                raise
 
490
            else:
 
491
                raise NoSuchFile(path)
396
492
 
397
493
    def final_kind(self, trans_id):
398
494
        """Determine the final file kind, after any changes applied.
399
 
 
 
495
        
400
496
        Raises NoSuchFile if the file does not exist/has no contents.
401
497
        (It is conceivable that a path would be created without the
402
498
        corresponding contents insertion command)
418
514
        # the file is old; the old id is still valid
419
515
        if self._new_root == trans_id:
420
516
            return self._tree.get_root_id()
421
 
        return self._tree.path2id(path)
 
517
        return self._tree.inventory.path2id(path)
422
518
 
423
519
    def final_file_id(self, trans_id):
424
520
        """Determine the file id after any changes are applied, or None.
425
 
 
 
521
        
426
522
        None indicates that the file will not be versioned after changes are
427
523
        applied.
428
524
        """
467
563
 
468
564
    def by_parent(self):
469
565
        """Return a map of parent: children for known parents.
470
 
 
 
566
        
471
567
        Only new paths and parents of tree files with assigned ids are used.
472
568
        """
473
569
        by_parent = {}
474
570
        items = list(self._new_parent.iteritems())
475
 
        items.extend((t, self.final_parent(t)) for t in
 
571
        items.extend((t, self.final_parent(t)) for t in 
476
572
                      self._tree_id_paths.keys())
477
573
        for trans_id, parent_id in items:
478
574
            if parent_id not in by_parent:
506
602
        conflicts.extend(self._overwrite_conflicts())
507
603
        return conflicts
508
604
 
509
 
    def _check_malformed(self):
510
 
        conflicts = self.find_conflicts()
511
 
        if len(conflicts) != 0:
512
 
            raise MalformedTransform(conflicts=conflicts)
513
 
 
514
605
    def _add_tree_children(self):
515
606
        """Add all the children of all active parents to the known paths.
516
607
 
518
609
        removed.  This is a necessary first step in detecting conflicts.
519
610
        """
520
611
        parents = self.by_parent().keys()
521
 
        parents.extend([t for t in self._removed_contents if
 
612
        parents.extend([t for t in self._removed_contents if 
522
613
                        self.tree_kind(t) == 'directory'])
523
614
        for trans_id in self._removed_id:
524
615
            file_id = self.tree_file_id(trans_id)
532
623
            # ensure that all children are registered with the transaction
533
624
            list(self.iter_tree_children(parent_id))
534
625
 
 
626
    def iter_tree_children(self, parent_id):
 
627
        """Iterate through the entry's tree children, if any"""
 
628
        try:
 
629
            path = self._tree_id_paths[parent_id]
 
630
        except KeyError:
 
631
            return
 
632
        try:
 
633
            children = os.listdir(self._tree.abspath(path))
 
634
        except OSError, e:
 
635
            if e.errno not in (errno.ENOENT, errno.ESRCH, errno.ENOTDIR):
 
636
                raise
 
637
            return
 
638
            
 
639
        for child in children:
 
640
            childpath = joinpath(path, child)
 
641
            if self._tree.is_control_filename(childpath):
 
642
                continue
 
643
            yield self.trans_id_tree_path(childpath)
 
644
 
535
645
    def has_named_child(self, by_parent, parent_id, name):
536
646
        try:
537
647
            children = by_parent[parent_id]
591
701
 
592
702
    def _improper_versioning(self):
593
703
        """Cannot version a file with no contents, or a bad type.
594
 
 
 
704
        
595
705
        However, existing entries with no contents are okay.
596
706
        """
597
707
        conflicts = []
607
717
 
608
718
    def _executability_conflicts(self):
609
719
        """Check for bad executability changes.
610
 
 
 
720
        
611
721
        Only versioned files may have their executability set, because
612
722
        1. only versioned entries can have executability under windows
613
723
        2. only files can be executable.  (The execute bit on a directory
712
822
            return True
713
823
        return False
714
824
 
715
 
    def _set_executability(self, path, trans_id):
 
825
    def _limbo_name(self, trans_id):
 
826
        """Generate the limbo name of a file"""
 
827
        limbo_name = self._limbo_files.get(trans_id)
 
828
        if limbo_name is not None:
 
829
            return limbo_name
 
830
        parent = self._new_parent.get(trans_id)
 
831
        # if the parent directory is already in limbo (e.g. when building a
 
832
        # tree), choose a limbo name inside the parent, to reduce further
 
833
        # renames.
 
834
        use_direct_path = False
 
835
        if self._new_contents.get(parent) == 'directory':
 
836
            filename = self._new_name.get(trans_id)
 
837
            if filename is not None:
 
838
                if parent not in self._limbo_children:
 
839
                    self._limbo_children[parent] = set()
 
840
                    self._limbo_children_names[parent] = {}
 
841
                    use_direct_path = True
 
842
                # the direct path can only be used if no other file has
 
843
                # already taken this pathname, i.e. if the name is unused, or
 
844
                # if it is already associated with this trans_id.
 
845
                elif self._case_sensitive_target:
 
846
                    if (self._limbo_children_names[parent].get(filename)
 
847
                        in (trans_id, None)):
 
848
                        use_direct_path = True
 
849
                else:
 
850
                    for l_filename, l_trans_id in\
 
851
                        self._limbo_children_names[parent].iteritems():
 
852
                        if l_trans_id == trans_id:
 
853
                            continue
 
854
                        if l_filename.lower() == filename.lower():
 
855
                            break
 
856
                    else:
 
857
                        use_direct_path = True
 
858
 
 
859
        if use_direct_path:
 
860
            limbo_name = pathjoin(self._limbo_files[parent], filename)
 
861
            self._limbo_children[parent].add(trans_id)
 
862
            self._limbo_children_names[parent][filename] = trans_id
 
863
        else:
 
864
            limbo_name = pathjoin(self._limbodir, trans_id)
 
865
            self._needs_rename.add(trans_id)
 
866
        self._limbo_files[trans_id] = limbo_name
 
867
        return limbo_name
 
868
 
 
869
    def _set_executability(self, path, entry, trans_id):
716
870
        """Set the executability of versioned files """
 
871
        new_executability = self._new_executability[trans_id]
 
872
        if entry is not None:
 
873
            entry.executable = new_executability
717
874
        if supports_executable():
718
 
            new_executability = self._new_executability[trans_id]
719
875
            abspath = self._tree.abspath(path)
720
876
            current_mode = os.stat(abspath).st_mode
721
877
            if new_executability:
738
894
            self.version_file(file_id, trans_id)
739
895
        return trans_id
740
896
 
741
 
    def new_file(self, name, parent_id, contents, file_id=None,
 
897
    def new_file(self, name, parent_id, contents, file_id=None, 
742
898
                 executable=None):
743
899
        """Convenience method to create files.
744
 
 
 
900
        
745
901
        name is the name of the file to create.
746
902
        parent_id is the transaction id of the parent directory of the file.
747
903
        contents is an iterator of bytestrings, which will be used to produce
767
923
        """
768
924
        trans_id = self._new_entry(name, parent_id, file_id)
769
925
        self.create_directory(trans_id)
770
 
        return trans_id
 
926
        return trans_id 
771
927
 
772
928
    def new_symlink(self, name, parent_id, target, file_id=None):
773
929
        """Convenience method to create symbolic link.
774
 
 
 
930
        
775
931
        name is the name of the symlink to create.
776
932
        parent_id is the transaction id of the parent directory of the symlink.
777
933
        target is a bytestring of the target of the symlink.
816
972
        from_path = self._tree_id_paths.get(from_trans_id)
817
973
        if from_versioned:
818
974
            # get data from working tree if versioned
819
 
            from_entry = self._tree.iter_entries_by_dir([file_id]).next()[1]
 
975
            from_entry = self._tree.inventory[file_id]
820
976
            from_name = from_entry.name
821
977
            from_parent = from_entry.parent_id
822
978
        else:
923
1079
    def get_preview_tree(self):
924
1080
        """Return a tree representing the result of the transform.
925
1081
 
926
 
        The tree is a snapshot, and altering the TreeTransform will invalidate
927
 
        it.
 
1082
        This tree only supports the subset of Tree functionality required
 
1083
        by show_diff_trees.  It must only be compared to tt._tree.
928
1084
        """
929
1085
        return _PreviewTree(self)
930
1086
 
931
 
    def commit(self, branch, message, merge_parents=None, strict=False,
932
 
               timestamp=None, timezone=None, committer=None, authors=None,
933
 
               revprops=None, revision_id=None):
934
 
        """Commit the result of this TreeTransform to a branch.
935
 
 
936
 
        :param branch: The branch to commit to.
937
 
        :param message: The message to attach to the commit.
938
 
        :param merge_parents: Additional parent revision-ids specified by
939
 
            pending merges.
940
 
        :param strict: If True, abort the commit if there are unversioned
941
 
            files.
942
 
        :param timestamp: if not None, seconds-since-epoch for the time and
943
 
            date.  (May be a float.)
944
 
        :param timezone: Optional timezone for timestamp, as an offset in
945
 
            seconds.
946
 
        :param committer: Optional committer in email-id format.
947
 
            (e.g. "J Random Hacker <jrandom@example.com>")
948
 
        :param authors: Optional list of authors in email-id format.
949
 
        :param revprops: Optional dictionary of revision properties.
950
 
        :param revision_id: Optional revision id.  (Specifying a revision-id
951
 
            may reduce performance for some non-native formats.)
952
 
        :return: The revision_id of the revision committed.
953
 
        """
954
 
        self._check_malformed()
955
 
        if strict:
956
 
            unversioned = set(self._new_contents).difference(set(self._new_id))
957
 
            for trans_id in unversioned:
958
 
                if self.final_file_id(trans_id) is None:
959
 
                    raise errors.StrictCommitFailed()
960
 
 
961
 
        revno, last_rev_id = branch.last_revision_info()
962
 
        if last_rev_id == _mod_revision.NULL_REVISION:
963
 
            if merge_parents is not None:
964
 
                raise ValueError('Cannot supply merge parents for first'
965
 
                                 ' commit.')
966
 
            parent_ids = []
967
 
        else:
968
 
            parent_ids = [last_rev_id]
969
 
            if merge_parents is not None:
970
 
                parent_ids.extend(merge_parents)
971
 
        if self._tree.get_revision_id() != last_rev_id:
972
 
            raise ValueError('TreeTransform not based on branch basis: %s' %
973
 
                             self._tree.get_revision_id())
974
 
        revprops = commit.Commit.update_revprops(revprops, branch, authors)
975
 
        builder = branch.get_commit_builder(parent_ids,
976
 
                                            timestamp=timestamp,
977
 
                                            timezone=timezone,
978
 
                                            committer=committer,
979
 
                                            revprops=revprops,
980
 
                                            revision_id=revision_id)
981
 
        preview = self.get_preview_tree()
982
 
        list(builder.record_iter_changes(preview, last_rev_id,
983
 
                                         self.iter_changes()))
984
 
        builder.finish_inventory()
985
 
        revision_id = builder.commit(message)
986
 
        branch.set_last_revision_info(revno + 1, revision_id)
987
 
        return revision_id
988
 
 
989
 
    def _text_parent(self, trans_id):
990
 
        file_id = self.tree_file_id(trans_id)
991
 
        try:
992
 
            if file_id is None or self._tree.kind(file_id) != 'file':
993
 
                return None
994
 
        except errors.NoSuchFile:
995
 
            return None
996
 
        return file_id
997
 
 
998
 
    def _get_parents_texts(self, trans_id):
999
 
        """Get texts for compression parents of this file."""
1000
 
        file_id = self._text_parent(trans_id)
1001
 
        if file_id is None:
1002
 
            return ()
1003
 
        return (self._tree.get_file_text(file_id),)
1004
 
 
1005
 
    def _get_parents_lines(self, trans_id):
1006
 
        """Get lines for compression parents of this file."""
1007
 
        file_id = self._text_parent(trans_id)
1008
 
        if file_id is None:
1009
 
            return ()
1010
 
        return (self._tree.get_file_lines(file_id),)
1011
 
 
1012
 
    def serialize(self, serializer):
1013
 
        """Serialize this TreeTransform.
1014
 
 
1015
 
        :param serializer: A Serialiser like pack.ContainerSerializer.
1016
 
        """
1017
 
        new_name = dict((k, v.encode('utf-8')) for k, v in
1018
 
                        self._new_name.items())
1019
 
        new_executability = dict((k, int(v)) for k, v in
1020
 
                                 self._new_executability.items())
1021
 
        tree_path_ids = dict((k.encode('utf-8'), v)
1022
 
                             for k, v in self._tree_path_ids.items())
1023
 
        attribs = {
1024
 
            '_id_number': self._id_number,
1025
 
            '_new_name': new_name,
1026
 
            '_new_parent': self._new_parent,
1027
 
            '_new_executability': new_executability,
1028
 
            '_new_id': self._new_id,
1029
 
            '_tree_path_ids': tree_path_ids,
1030
 
            '_removed_id': list(self._removed_id),
1031
 
            '_removed_contents': list(self._removed_contents),
1032
 
            '_non_present_ids': self._non_present_ids,
1033
 
            }
1034
 
        yield serializer.bytes_record(bencode.bencode(attribs),
1035
 
                                      (('attribs',),))
1036
 
        for trans_id, kind in self._new_contents.items():
1037
 
            if kind == 'file':
1038
 
                lines = osutils.chunks_to_lines(
1039
 
                    self._read_file_chunks(trans_id))
1040
 
                parents = self._get_parents_lines(trans_id)
1041
 
                mpdiff = multiparent.MultiParent.from_lines(lines, parents)
1042
 
                content = ''.join(mpdiff.to_patch())
1043
 
            if kind == 'directory':
1044
 
                content = ''
1045
 
            if kind == 'symlink':
1046
 
                content = self._read_symlink_target(trans_id)
1047
 
            yield serializer.bytes_record(content, ((trans_id, kind),))
1048
 
 
1049
 
    def deserialize(self, records):
1050
 
        """Deserialize a stored TreeTransform.
1051
 
 
1052
 
        :param records: An iterable of (names, content) tuples, as per
1053
 
            pack.ContainerPushParser.
1054
 
        """
1055
 
        names, content = records.next()
1056
 
        attribs = bencode.bdecode(content)
1057
 
        self._id_number = attribs['_id_number']
1058
 
        self._new_name = dict((k, v.decode('utf-8'))
1059
 
                            for k, v in attribs['_new_name'].items())
1060
 
        self._new_parent = attribs['_new_parent']
1061
 
        self._new_executability = dict((k, bool(v)) for k, v in
1062
 
            attribs['_new_executability'].items())
1063
 
        self._new_id = attribs['_new_id']
1064
 
        self._r_new_id = dict((v, k) for k, v in self._new_id.items())
1065
 
        self._tree_path_ids = {}
1066
 
        self._tree_id_paths = {}
1067
 
        for bytepath, trans_id in attribs['_tree_path_ids'].items():
1068
 
            path = bytepath.decode('utf-8')
1069
 
            self._tree_path_ids[path] = trans_id
1070
 
            self._tree_id_paths[trans_id] = path
1071
 
        self._removed_id = set(attribs['_removed_id'])
1072
 
        self._removed_contents = set(attribs['_removed_contents'])
1073
 
        self._non_present_ids = attribs['_non_present_ids']
1074
 
        for ((trans_id, kind),), content in records:
1075
 
            if kind == 'file':
1076
 
                mpdiff = multiparent.MultiParent.from_patch(content)
1077
 
                lines = mpdiff.to_lines(self._get_parents_texts(trans_id))
1078
 
                self.create_file(lines, trans_id)
1079
 
            if kind == 'directory':
1080
 
                self.create_directory(trans_id)
1081
 
            if kind == 'symlink':
1082
 
                self.create_symlink(content.decode('utf-8'), trans_id)
1083
 
 
1084
 
 
1085
 
class DiskTreeTransform(TreeTransformBase):
1086
 
    """Tree transform storing its contents on disk."""
1087
 
 
1088
 
    def __init__(self, tree, limbodir, pb=None,
1089
 
                 case_sensitive=True):
1090
 
        """Constructor.
1091
 
        :param tree: The tree that will be transformed, but not necessarily
1092
 
            the output tree.
1093
 
        :param limbodir: A directory where new files can be stored until
1094
 
            they are installed in their proper places
1095
 
        :param pb: ignored
1096
 
        :param case_sensitive: If True, the target of the transform is
1097
 
            case sensitive, not just case preserving.
1098
 
        """
1099
 
        TreeTransformBase.__init__(self, tree, pb, case_sensitive)
1100
 
        self._limbodir = limbodir
1101
 
        self._deletiondir = None
1102
 
        # A mapping of transform ids to their limbo filename
1103
 
        self._limbo_files = {}
1104
 
        # A mapping of transform ids to a set of the transform ids of children
1105
 
        # that their limbo directory has
1106
 
        self._limbo_children = {}
1107
 
        # Map transform ids to maps of child filename to child transform id
1108
 
        self._limbo_children_names = {}
1109
 
        # List of transform ids that need to be renamed from limbo into place
1110
 
        self._needs_rename = set()
1111
 
        self._creation_mtime = None
1112
 
 
1113
 
    def finalize(self):
1114
 
        """Release the working tree lock, if held, clean up limbo dir.
1115
 
 
1116
 
        This is required if apply has not been invoked, but can be invoked
1117
 
        even after apply.
1118
 
        """
1119
 
        if self._tree is None:
1120
 
            return
1121
 
        try:
1122
 
            entries = [(self._limbo_name(t), t, k) for t, k in
1123
 
                       self._new_contents.iteritems()]
1124
 
            entries.sort(reverse=True)
1125
 
            for path, trans_id, kind in entries:
1126
 
                delete_any(path)
1127
 
            try:
1128
 
                delete_any(self._limbodir)
1129
 
            except OSError:
1130
 
                # We don't especially care *why* the dir is immortal.
1131
 
                raise ImmortalLimbo(self._limbodir)
1132
 
            try:
1133
 
                if self._deletiondir is not None:
1134
 
                    delete_any(self._deletiondir)
1135
 
            except OSError:
1136
 
                raise errors.ImmortalPendingDeletion(self._deletiondir)
1137
 
        finally:
1138
 
            TreeTransformBase.finalize(self)
1139
 
 
1140
 
    def _limbo_name(self, trans_id):
1141
 
        """Generate the limbo name of a file"""
1142
 
        limbo_name = self._limbo_files.get(trans_id)
1143
 
        if limbo_name is None:
1144
 
            limbo_name = self._generate_limbo_path(trans_id)
1145
 
            self._limbo_files[trans_id] = limbo_name
1146
 
        return limbo_name
1147
 
 
1148
 
    def _generate_limbo_path(self, trans_id):
1149
 
        """Generate a limbo path using the trans_id as the relative path.
1150
 
 
1151
 
        This is suitable as a fallback, and when the transform should not be
1152
 
        sensitive to the path encoding of the limbo directory.
1153
 
        """
1154
 
        self._needs_rename.add(trans_id)
1155
 
        return pathjoin(self._limbodir, trans_id)
1156
 
 
1157
 
    def adjust_path(self, name, parent, trans_id):
1158
 
        previous_parent = self._new_parent.get(trans_id)
1159
 
        previous_name = self._new_name.get(trans_id)
1160
 
        TreeTransformBase.adjust_path(self, name, parent, trans_id)
1161
 
        if (trans_id in self._limbo_files and
1162
 
            trans_id not in self._needs_rename):
1163
 
            self._rename_in_limbo([trans_id])
1164
 
            if previous_parent != parent:
1165
 
                self._limbo_children[previous_parent].remove(trans_id)
1166
 
            if previous_parent != parent or previous_name != name:
1167
 
                del self._limbo_children_names[previous_parent][previous_name]
1168
 
 
1169
 
    def _rename_in_limbo(self, trans_ids):
1170
 
        """Fix limbo names so that the right final path is produced.
1171
 
 
1172
 
        This means we outsmarted ourselves-- we tried to avoid renaming
1173
 
        these files later by creating them with their final names in their
1174
 
        final parents.  But now the previous name or parent is no longer
1175
 
        suitable, so we have to rename them.
1176
 
 
1177
 
        Even for trans_ids that have no new contents, we must remove their
1178
 
        entries from _limbo_files, because they are now stale.
1179
 
        """
1180
 
        for trans_id in trans_ids:
1181
 
            old_path = self._limbo_files.pop(trans_id)
1182
 
            if trans_id not in self._new_contents:
1183
 
                continue
1184
 
            new_path = self._limbo_name(trans_id)
1185
 
            osutils.rename(old_path, new_path)
1186
 
            for descendant in self._limbo_descendants(trans_id):
1187
 
                desc_path = self._limbo_files[descendant]
1188
 
                desc_path = new_path + desc_path[len(old_path):]
1189
 
                self._limbo_files[descendant] = desc_path
1190
 
 
1191
 
    def _limbo_descendants(self, trans_id):
1192
 
        """Return the set of trans_ids whose limbo paths descend from this."""
1193
 
        descendants = set(self._limbo_children.get(trans_id, []))
1194
 
        for descendant in list(descendants):
1195
 
            descendants.update(self._limbo_descendants(descendant))
1196
 
        return descendants
1197
 
 
1198
 
    def create_file(self, contents, trans_id, mode_id=None):
1199
 
        """Schedule creation of a new file.
1200
 
 
1201
 
        See also new_file.
1202
 
 
1203
 
        Contents is an iterator of strings, all of which will be written
1204
 
        to the target destination.
1205
 
 
1206
 
        New file takes the permissions of any existing file with that id,
1207
 
        unless mode_id is specified.
1208
 
        """
1209
 
        name = self._limbo_name(trans_id)
1210
 
        f = open(name, 'wb')
1211
 
        try:
1212
 
            try:
1213
 
                unique_add(self._new_contents, trans_id, 'file')
1214
 
            except:
1215
 
                # Clean up the file, it never got registered so
1216
 
                # TreeTransform.finalize() won't clean it up.
1217
 
                f.close()
1218
 
                os.unlink(name)
1219
 
                raise
1220
 
 
1221
 
            f.writelines(contents)
1222
 
        finally:
1223
 
            f.close()
1224
 
        self._set_mtime(name)
1225
 
        self._set_mode(trans_id, mode_id, S_ISREG)
1226
 
 
1227
 
    def _read_file_chunks(self, trans_id):
1228
 
        cur_file = open(self._limbo_name(trans_id), 'rb')
1229
 
        try:
1230
 
            return cur_file.readlines()
1231
 
        finally:
1232
 
            cur_file.close()
1233
 
 
1234
 
    def _read_symlink_target(self, trans_id):
1235
 
        return os.readlink(self._limbo_name(trans_id))
1236
 
 
1237
 
    def _set_mtime(self, path):
1238
 
        """All files that are created get the same mtime.
1239
 
 
1240
 
        This time is set by the first object to be created.
1241
 
        """
1242
 
        if self._creation_mtime is None:
1243
 
            self._creation_mtime = time.time()
1244
 
        os.utime(path, (self._creation_mtime, self._creation_mtime))
1245
 
 
1246
 
    def create_hardlink(self, path, trans_id):
1247
 
        """Schedule creation of a hard link"""
1248
 
        name = self._limbo_name(trans_id)
1249
 
        try:
1250
 
            os.link(path, name)
1251
 
        except OSError, e:
1252
 
            if e.errno != errno.EPERM:
1253
 
                raise
1254
 
            raise errors.HardLinkNotSupported(path)
1255
 
        try:
1256
 
            unique_add(self._new_contents, trans_id, 'file')
1257
 
        except:
1258
 
            # Clean up the file, it never got registered so
1259
 
            # TreeTransform.finalize() won't clean it up.
1260
 
            os.unlink(name)
1261
 
            raise
1262
 
 
1263
 
    def create_directory(self, trans_id):
1264
 
        """Schedule creation of a new directory.
1265
 
 
1266
 
        See also new_directory.
1267
 
        """
1268
 
        os.mkdir(self._limbo_name(trans_id))
1269
 
        unique_add(self._new_contents, trans_id, 'directory')
1270
 
 
1271
 
    def create_symlink(self, target, trans_id):
1272
 
        """Schedule creation of a new symbolic link.
1273
 
 
1274
 
        target is a bytestring.
1275
 
        See also new_symlink.
1276
 
        """
1277
 
        if has_symlinks():
1278
 
            os.symlink(target, self._limbo_name(trans_id))
1279
 
            unique_add(self._new_contents, trans_id, 'symlink')
1280
 
        else:
1281
 
            try:
1282
 
                path = FinalPaths(self).get_path(trans_id)
1283
 
            except KeyError:
1284
 
                path = None
1285
 
            raise UnableCreateSymlink(path=path)
1286
 
 
1287
 
    def cancel_creation(self, trans_id):
1288
 
        """Cancel the creation of new file contents."""
1289
 
        del self._new_contents[trans_id]
1290
 
        children = self._limbo_children.get(trans_id)
1291
 
        # if this is a limbo directory with children, move them before removing
1292
 
        # the directory
1293
 
        if children is not None:
1294
 
            self._rename_in_limbo(children)
1295
 
            del self._limbo_children[trans_id]
1296
 
            del self._limbo_children_names[trans_id]
1297
 
        delete_any(self._limbo_name(trans_id))
1298
 
 
1299
 
 
1300
 
class TreeTransform(DiskTreeTransform):
 
1087
 
 
1088
class TreeTransform(TreeTransformBase):
1301
1089
    """Represent a tree transformation.
1302
1090
 
1303
1091
    This object is designed to support incremental generation of the transform,
1362
1150
    FileMover does not delete files until it is sure that a rollback will not
1363
1151
    happen.
1364
1152
    """
1365
 
    def __init__(self, tree, pb=None):
 
1153
    def __init__(self, tree, pb=DummyProgress()):
1366
1154
        """Note: a tree_write lock is taken on the tree.
1367
1155
 
1368
1156
        Use TreeTransform.finalize() to release the lock (can be omitted if
1389
1177
            tree.unlock()
1390
1178
            raise
1391
1179
 
1392
 
        # Cache of realpath results, to speed up canonical_path
1393
 
        self._realpaths = {}
1394
 
        # Cache of relpath results, to speed up canonical_path
1395
 
        self._relpaths = {}
1396
 
        DiskTreeTransform.__init__(self, tree, limbodir, pb,
 
1180
        TreeTransformBase.__init__(self, tree, limbodir, pb,
1397
1181
                                   tree.case_sensitive)
1398
1182
        self._deletiondir = deletiondir
1399
1183
 
1400
 
    def canonical_path(self, path):
1401
 
        """Get the canonical tree-relative path"""
1402
 
        # don't follow final symlinks
1403
 
        abs = self._tree.abspath(path)
1404
 
        if abs in self._relpaths:
1405
 
            return self._relpaths[abs]
1406
 
        dirname, basename = os.path.split(abs)
1407
 
        if dirname not in self._realpaths:
1408
 
            self._realpaths[dirname] = os.path.realpath(dirname)
1409
 
        dirname = self._realpaths[dirname]
1410
 
        abs = pathjoin(dirname, basename)
1411
 
        if dirname in self._relpaths:
1412
 
            relpath = pathjoin(self._relpaths[dirname], basename)
1413
 
            relpath = relpath.rstrip('/\\')
1414
 
        else:
1415
 
            relpath = self._tree.relpath(abs)
1416
 
        self._relpaths[abs] = relpath
1417
 
        return relpath
1418
 
 
1419
 
    def tree_kind(self, trans_id):
1420
 
        """Determine the file kind in the working tree.
1421
 
 
1422
 
        Raises NoSuchFile if the file does not exist
1423
 
        """
1424
 
        path = self._tree_id_paths.get(trans_id)
1425
 
        if path is None:
1426
 
            raise NoSuchFile(None)
1427
 
        try:
1428
 
            return file_kind(self._tree.abspath(path))
1429
 
        except OSError, e:
1430
 
            if e.errno != errno.ENOENT:
1431
 
                raise
1432
 
            else:
1433
 
                raise NoSuchFile(path)
1434
 
 
1435
 
    def _set_mode(self, trans_id, mode_id, typefunc):
1436
 
        """Set the mode of new file contents.
1437
 
        The mode_id is the existing file to get the mode from (often the same
1438
 
        as trans_id).  The operation is only performed if there's a mode match
1439
 
        according to typefunc.
1440
 
        """
1441
 
        if mode_id is None:
1442
 
            mode_id = trans_id
1443
 
        try:
1444
 
            old_path = self._tree_id_paths[mode_id]
1445
 
        except KeyError:
1446
 
            return
1447
 
        try:
1448
 
            mode = os.stat(self._tree.abspath(old_path)).st_mode
1449
 
        except OSError, e:
1450
 
            if e.errno in (errno.ENOENT, errno.ENOTDIR):
1451
 
                # Either old_path doesn't exist, or the parent of the
1452
 
                # target is not a directory (but will be one eventually)
1453
 
                # Either way, we know it doesn't exist *right now*
1454
 
                # See also bug #248448
1455
 
                return
1456
 
            else:
1457
 
                raise
1458
 
        if typefunc(mode):
1459
 
            os.chmod(self._limbo_name(trans_id), mode)
1460
 
 
1461
 
    def iter_tree_children(self, parent_id):
1462
 
        """Iterate through the entry's tree children, if any"""
1463
 
        try:
1464
 
            path = self._tree_id_paths[parent_id]
1465
 
        except KeyError:
1466
 
            return
1467
 
        try:
1468
 
            children = os.listdir(self._tree.abspath(path))
1469
 
        except OSError, e:
1470
 
            if not (osutils._is_error_enotdir(e)
1471
 
                    or e.errno in (errno.ENOENT, errno.ESRCH)):
1472
 
                raise
1473
 
            return
1474
 
 
1475
 
        for child in children:
1476
 
            childpath = joinpath(path, child)
1477
 
            if self._tree.is_control_filename(childpath):
1478
 
                continue
1479
 
            yield self.trans_id_tree_path(childpath)
1480
 
 
1481
 
    def _generate_limbo_path(self, trans_id):
1482
 
        """Generate a limbo path using the final path if possible.
1483
 
 
1484
 
        This optimizes the performance of applying the tree transform by
1485
 
        avoiding renames.  These renames can be avoided only when the parent
1486
 
        directory is already scheduled for creation.
1487
 
 
1488
 
        If the final path cannot be used, falls back to using the trans_id as
1489
 
        the relpath.
1490
 
        """
1491
 
        parent = self._new_parent.get(trans_id)
1492
 
        # if the parent directory is already in limbo (e.g. when building a
1493
 
        # tree), choose a limbo name inside the parent, to reduce further
1494
 
        # renames.
1495
 
        use_direct_path = False
1496
 
        if self._new_contents.get(parent) == 'directory':
1497
 
            filename = self._new_name.get(trans_id)
1498
 
            if filename is not None:
1499
 
                if parent not in self._limbo_children:
1500
 
                    self._limbo_children[parent] = set()
1501
 
                    self._limbo_children_names[parent] = {}
1502
 
                    use_direct_path = True
1503
 
                # the direct path can only be used if no other file has
1504
 
                # already taken this pathname, i.e. if the name is unused, or
1505
 
                # if it is already associated with this trans_id.
1506
 
                elif self._case_sensitive_target:
1507
 
                    if (self._limbo_children_names[parent].get(filename)
1508
 
                        in (trans_id, None)):
1509
 
                        use_direct_path = True
1510
 
                else:
1511
 
                    for l_filename, l_trans_id in\
1512
 
                        self._limbo_children_names[parent].iteritems():
1513
 
                        if l_trans_id == trans_id:
1514
 
                            continue
1515
 
                        if l_filename.lower() == filename.lower():
1516
 
                            break
1517
 
                    else:
1518
 
                        use_direct_path = True
1519
 
 
1520
 
        if not use_direct_path:
1521
 
            return DiskTreeTransform._generate_limbo_path(self, trans_id)
1522
 
 
1523
 
        limbo_name = pathjoin(self._limbo_files[parent], filename)
1524
 
        self._limbo_children[parent].add(trans_id)
1525
 
        self._limbo_children_names[parent][filename] = trans_id
1526
 
        return limbo_name
1527
 
 
1528
 
 
1529
1184
    def apply(self, no_conflicts=False, precomputed_delta=None, _mover=None):
1530
1185
        """Apply all changes to the inventory and filesystem.
1531
1186
 
1541
1196
        :param _mover: Supply an alternate FileMover, for testing
1542
1197
        """
1543
1198
        if not no_conflicts:
1544
 
            self._check_malformed()
 
1199
            conflicts = self.find_conflicts()
 
1200
            if len(conflicts) != 0:
 
1201
                raise MalformedTransform(conflicts=conflicts)
 
1202
        if precomputed_delta is None:
 
1203
            new_inventory_delta = []
 
1204
            inventory_delta = new_inventory_delta
 
1205
        else:
 
1206
            new_inventory_delta = None
 
1207
            inventory_delta = precomputed_delta
1545
1208
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1546
1209
        try:
1547
 
            if precomputed_delta is None:
1548
 
                child_pb.update('Apply phase', 0, 2)
1549
 
                inventory_delta = self._generate_inventory_delta()
1550
 
                offset = 1
1551
 
            else:
1552
 
                inventory_delta = precomputed_delta
1553
 
                offset = 0
1554
1210
            if _mover is None:
1555
1211
                mover = _FileMover()
1556
1212
            else:
1557
1213
                mover = _mover
1558
1214
            try:
1559
 
                child_pb.update('Apply phase', 0 + offset, 2 + offset)
1560
 
                self._apply_removals(mover)
1561
 
                child_pb.update('Apply phase', 1 + offset, 2 + offset)
1562
 
                modified_paths = self._apply_insertions(mover)
 
1215
                child_pb.update('Apply phase', 0, 2)
 
1216
                self._apply_removals(new_inventory_delta, mover)
 
1217
                child_pb.update('Apply phase', 1, 2)
 
1218
                modified_paths = self._apply_insertions(new_inventory_delta,
 
1219
                                                        mover)
1563
1220
            except:
1564
1221
                mover.rollback()
1565
1222
                raise
1572
1229
        self.finalize()
1573
1230
        return _TransformResults(modified_paths, self.rename_count)
1574
1231
 
1575
 
    def _generate_inventory_delta(self):
1576
 
        """Generate an inventory delta for the current transform."""
1577
 
        inventory_delta = []
1578
 
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1579
 
        new_paths = self._inventory_altered()
1580
 
        total_entries = len(new_paths) + len(self._removed_id)
1581
 
        try:
1582
 
            for num, trans_id in enumerate(self._removed_id):
1583
 
                if (num % 10) == 0:
1584
 
                    child_pb.update('removing file', num, total_entries)
1585
 
                if trans_id == self._new_root:
1586
 
                    file_id = self._tree.get_root_id()
1587
 
                else:
1588
 
                    file_id = self.tree_file_id(trans_id)
1589
 
                # File-id isn't really being deleted, just moved
1590
 
                if file_id in self._r_new_id:
1591
 
                    continue
1592
 
                path = self._tree_id_paths[trans_id]
1593
 
                inventory_delta.append((path, None, file_id, None))
1594
 
            new_path_file_ids = dict((t, self.final_file_id(t)) for p, t in
1595
 
                                     new_paths)
1596
 
            entries = self._tree.iter_entries_by_dir(
1597
 
                new_path_file_ids.values())
1598
 
            old_paths = dict((e.file_id, p) for p, e in entries)
1599
 
            final_kinds = {}
1600
 
            for num, (path, trans_id) in enumerate(new_paths):
1601
 
                if (num % 10) == 0:
1602
 
                    child_pb.update('adding file',
1603
 
                                    num + len(self._removed_id), total_entries)
1604
 
                file_id = new_path_file_ids[trans_id]
1605
 
                if file_id is None:
1606
 
                    continue
1607
 
                needs_entry = False
1608
 
                try:
1609
 
                    kind = self.final_kind(trans_id)
1610
 
                except NoSuchFile:
1611
 
                    kind = self._tree.stored_kind(file_id)
1612
 
                parent_trans_id = self.final_parent(trans_id)
1613
 
                parent_file_id = new_path_file_ids.get(parent_trans_id)
1614
 
                if parent_file_id is None:
1615
 
                    parent_file_id = self.final_file_id(parent_trans_id)
1616
 
                if trans_id in self._new_reference_revision:
1617
 
                    new_entry = inventory.TreeReference(
1618
 
                        file_id,
1619
 
                        self._new_name[trans_id],
1620
 
                        self.final_file_id(self._new_parent[trans_id]),
1621
 
                        None, self._new_reference_revision[trans_id])
1622
 
                else:
1623
 
                    new_entry = inventory.make_entry(kind,
1624
 
                        self.final_name(trans_id),
1625
 
                        parent_file_id, file_id)
1626
 
                old_path = old_paths.get(new_entry.file_id)
1627
 
                new_executability = self._new_executability.get(trans_id)
1628
 
                if new_executability is not None:
1629
 
                    new_entry.executable = new_executability
1630
 
                inventory_delta.append(
1631
 
                    (old_path, path, new_entry.file_id, new_entry))
1632
 
        finally:
1633
 
            child_pb.finished()
1634
 
        return inventory_delta
1635
 
 
1636
 
    def _apply_removals(self, mover):
 
1232
    def _apply_removals(self, inventory_delta, mover):
1637
1233
        """Perform tree operations that remove directory/inventory names.
1638
1234
 
1639
1235
        That is, delete files that are to be deleted, and put any files that
1651
1247
                child_pb.update('removing file', num, len(tree_paths))
1652
1248
                full_path = self._tree.abspath(path)
1653
1249
                if trans_id in self._removed_contents:
1654
 
                    delete_path = os.path.join(self._deletiondir, trans_id)
1655
 
                    mover.pre_delete(full_path, delete_path)
1656
 
                elif (trans_id in self._new_name
1657
 
                      or trans_id in self._new_parent):
 
1250
                    mover.pre_delete(full_path, os.path.join(self._deletiondir,
 
1251
                                     trans_id))
 
1252
                elif trans_id in self._new_name or trans_id in \
 
1253
                    self._new_parent:
1658
1254
                    try:
1659
1255
                        mover.rename(full_path, self._limbo_name(trans_id))
1660
1256
                    except OSError, e:
1662
1258
                            raise
1663
1259
                    else:
1664
1260
                        self.rename_count += 1
 
1261
                if (trans_id in self._removed_id
 
1262
                    and inventory_delta is not None):
 
1263
                    if trans_id == self._new_root:
 
1264
                        file_id = self._tree.get_root_id()
 
1265
                    else:
 
1266
                        file_id = self.tree_file_id(trans_id)
 
1267
                    # File-id isn't really being deleted, just moved
 
1268
                    if file_id in self._r_new_id:
 
1269
                        continue
 
1270
                    inventory_delta.append((path, None, file_id, None))
1665
1271
        finally:
1666
1272
            child_pb.finished()
1667
1273
 
1668
 
    def _apply_insertions(self, mover):
 
1274
    def _apply_insertions(self, inventory_delta, mover):
1669
1275
        """Perform tree operations that insert directory/inventory names.
1670
1276
 
1671
1277
        That is, create any files that need to be created, and restore from
1675
1281
        If inventory_delta is None, no inventory delta is calculated, and
1676
1282
        no list of modified paths is returned.
1677
1283
        """
1678
 
        new_paths = self.new_paths(filesystem_only=True)
 
1284
        new_paths = self.new_paths(filesystem_only=(inventory_delta is None))
1679
1285
        modified_paths = []
 
1286
        completed_new = []
1680
1287
        new_path_file_ids = dict((t, self.final_file_id(t)) for p, t in
1681
1288
                                 new_paths)
 
1289
        if inventory_delta is not None:
 
1290
            entries = self._tree.iter_entries_by_dir(
 
1291
                new_path_file_ids.values())
 
1292
            old_paths = dict((e.file_id, p) for p, e in entries)
1682
1293
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1683
1294
        try:
1684
1295
            for num, (path, trans_id) in enumerate(new_paths):
 
1296
                new_entry = None
1685
1297
                if (num % 10) == 0:
1686
1298
                    child_pb.update('adding file', num, len(new_paths))
1687
1299
                full_path = self._tree.abspath(path)
1694
1306
                            raise
1695
1307
                    else:
1696
1308
                        self.rename_count += 1
1697
 
                if (trans_id in self._new_contents or
1698
 
                    self.path_changed(trans_id)):
1699
 
                    if trans_id in self._new_contents:
1700
 
                        modified_paths.append(full_path)
 
1309
                if inventory_delta is not None:
 
1310
                    if (trans_id in self._new_contents or
 
1311
                        self.path_changed(trans_id)):
 
1312
                        if trans_id in self._new_contents:
 
1313
                            modified_paths.append(full_path)
 
1314
                            completed_new.append(trans_id)
 
1315
                    file_id = new_path_file_ids[trans_id]
 
1316
                    if file_id is not None and (trans_id in self._new_id or
 
1317
                        trans_id in self._new_name or
 
1318
                        trans_id in self._new_parent
 
1319
                        or trans_id in self._new_executability):
 
1320
                        try:
 
1321
                            kind = self.final_kind(trans_id)
 
1322
                        except NoSuchFile:
 
1323
                            kind = self._tree.stored_kind(file_id)
 
1324
                        parent_trans_id = self.final_parent(trans_id)
 
1325
                        parent_file_id = new_path_file_ids.get(parent_trans_id)
 
1326
                        if parent_file_id is None:
 
1327
                            parent_file_id = self.final_file_id(
 
1328
                                parent_trans_id)
 
1329
                        if trans_id in self._new_reference_revision:
 
1330
                            new_entry = inventory.TreeReference(
 
1331
                                file_id,
 
1332
                                self._new_name[trans_id],
 
1333
                                self.final_file_id(self._new_parent[trans_id]),
 
1334
                                None, self._new_reference_revision[trans_id])
 
1335
                        else:
 
1336
                            new_entry = inventory.make_entry(kind,
 
1337
                                self.final_name(trans_id),
 
1338
                                parent_file_id, file_id)
 
1339
                        old_path = old_paths.get(new_entry.file_id)
 
1340
                        inventory_delta.append(
 
1341
                            (old_path, path, new_entry.file_id, new_entry))
 
1342
 
1701
1343
                if trans_id in self._new_executability:
1702
 
                    self._set_executability(path, trans_id)
 
1344
                    self._set_executability(path, new_entry, trans_id)
1703
1345
        finally:
1704
1346
            child_pb.finished()
1705
 
        self._new_contents.clear()
 
1347
        if inventory_delta is None:
 
1348
            self._new_contents.clear()
 
1349
        else:
 
1350
            for trans_id in completed_new:
 
1351
                del self._new_contents[trans_id]
1706
1352
        return modified_paths
1707
1353
 
1708
1354
 
1709
 
class TransformPreview(DiskTreeTransform):
 
1355
class TransformPreview(TreeTransformBase):
1710
1356
    """A TreeTransform for generating preview trees.
1711
1357
 
1712
1358
    Unlike TreeTransform, this version works when the input tree is a
1714
1360
    unversioned files in the input tree.
1715
1361
    """
1716
1362
 
1717
 
    def __init__(self, tree, pb=None, case_sensitive=True):
 
1363
    def __init__(self, tree, pb=DummyProgress(), case_sensitive=True):
1718
1364
        tree.lock_read()
1719
 
        limbodir = osutils.mkdtemp(prefix='bzr-limbo-')
1720
 
        DiskTreeTransform.__init__(self, tree, limbodir, pb, case_sensitive)
 
1365
        limbodir = tempfile.mkdtemp(prefix='bzr-limbo-')
 
1366
        TreeTransformBase.__init__(self, tree, limbodir, pb, case_sensitive)
1721
1367
 
1722
1368
    def canonical_path(self, path):
1723
1369
        return path
1747
1393
        file_id = self.tree_file_id(parent_id)
1748
1394
        if file_id is None:
1749
1395
            return
1750
 
        entry = self._tree.iter_entries_by_dir([file_id]).next()[1]
1751
 
        children = getattr(entry, 'children', {})
 
1396
        children = getattr(self._tree.inventory[file_id], 'children', {})
1752
1397
        for child in children:
1753
1398
            childpath = joinpath(path, child)
1754
1399
            yield self.trans_id_tree_path(childpath)
1761
1406
        self._transform = transform
1762
1407
        self._final_paths = FinalPaths(transform)
1763
1408
        self.__by_parent = None
1764
 
        self._parent_ids = []
1765
 
        self._all_children_cache = {}
1766
 
        self._path2trans_id_cache = {}
1767
 
        self._final_name_cache = {}
1768
 
        self._iter_changes_cache = dict((c[0], c) for c in
1769
 
                                        self._transform.iter_changes())
 
1409
 
 
1410
    def _changes(self, file_id):
 
1411
        for changes in self._transform.iter_changes():
 
1412
            if changes[0] == file_id:
 
1413
                return changes
1770
1414
 
1771
1415
    def _content_change(self, file_id):
1772
1416
        """Return True if the content of this file changed"""
1773
 
        changes = self._iter_changes_cache.get(file_id)
 
1417
        changes = self._changes(file_id)
1774
1418
        # changes[2] is true if the file content changed.  See
1775
1419
        # InterTree.iter_changes.
1776
1420
        return (changes is not None and changes[2])
1777
1421
 
1778
 
    def _get_repository(self):
1779
 
        repo = getattr(self._transform._tree, '_repository', None)
1780
 
        if repo is None:
1781
 
            repo = self._transform._tree.branch.repository
1782
 
        return repo
1783
 
 
1784
 
    def _iter_parent_trees(self):
1785
 
        for revision_id in self.get_parent_ids():
1786
 
            try:
1787
 
                yield self.revision_tree(revision_id)
1788
 
            except errors.NoSuchRevisionInTree:
1789
 
                yield self._get_repository().revision_tree(revision_id)
1790
 
 
1791
1422
    def _get_file_revision(self, file_id, vf, tree_revision):
1792
 
        parent_keys = [(file_id, self._file_revision(t, file_id)) for t in
1793
 
                       self._iter_parent_trees()]
1794
 
        vf.add_lines((file_id, tree_revision), parent_keys,
1795
 
                     self.get_file(file_id).readlines())
1796
 
        repo = self._get_repository()
1797
 
        base_vf = repo.texts
1798
 
        if base_vf not in vf.fallback_versionedfiles:
1799
 
            vf.fallback_versionedfiles.append(base_vf)
1800
 
        return tree_revision
 
1423
        return self._transform._tree._get_file_revision(file_id, vf,
 
1424
                                                        tree_revision)
1801
1425
 
1802
1426
    def _stat_limbo_file(self, file_id):
1803
1427
        trans_id = self._transform.trans_id_file_id(file_id)
1810
1434
            self.__by_parent = self._transform.by_parent()
1811
1435
        return self.__by_parent
1812
1436
 
1813
 
    def _comparison_data(self, entry, path):
1814
 
        kind, size, executable, link_or_sha1 = self.path_content_summary(path)
1815
 
        if kind == 'missing':
1816
 
            kind = None
1817
 
            executable = False
1818
 
        else:
1819
 
            file_id = self._transform.final_file_id(self._path2trans_id(path))
1820
 
            executable = self.is_executable(file_id, path)
1821
 
        return kind, executable, None
1822
 
 
1823
 
    def is_locked(self):
1824
 
        return False
1825
 
 
1826
1437
    def lock_read(self):
1827
1438
        # Perhaps in theory, this should lock the TreeTransform?
1828
 
        return self
 
1439
        pass
1829
1440
 
1830
1441
    def unlock(self):
1831
1442
        pass
1848
1459
    def __iter__(self):
1849
1460
        return iter(self.all_file_ids())
1850
1461
 
1851
 
    def _has_id(self, file_id, fallback_check):
1852
 
        if file_id in self._transform._r_new_id:
1853
 
            return True
1854
 
        elif file_id in set([self._transform.tree_file_id(trans_id) for
1855
 
            trans_id in self._transform._removed_id]):
1856
 
            return False
1857
 
        else:
1858
 
            return fallback_check(file_id)
1859
 
 
1860
 
    def has_id(self, file_id):
1861
 
        return self._has_id(file_id, self._transform._tree.has_id)
1862
 
 
1863
 
    def has_or_had_id(self, file_id):
1864
 
        return self._has_id(file_id, self._transform._tree.has_or_had_id)
 
1462
    def paths2ids(self, specific_files, trees=None, require_versioned=False):
 
1463
        """See Tree.paths2ids"""
 
1464
        to_find = set(specific_files)
 
1465
        result = set()
 
1466
        for (file_id, paths, changed, versioned, parent, name, kind,
 
1467
             executable) in self._transform.iter_changes():
 
1468
            if paths[1] in to_find:
 
1469
                result.append(file_id)
 
1470
                to_find.remove(paths[1])
 
1471
        result.update(self._transform._tree.paths2ids(to_find,
 
1472
                      trees=[], require_versioned=require_versioned))
 
1473
        return result
1865
1474
 
1866
1475
    def _path2trans_id(self, path):
1867
 
        # We must not use None here, because that is a valid value to store.
1868
 
        trans_id = self._path2trans_id_cache.get(path, object)
1869
 
        if trans_id is not object:
1870
 
            return trans_id
1871
1476
        segments = splitpath(path)
1872
1477
        cur_parent = self._transform.root
1873
1478
        for cur_segment in segments:
1874
1479
            for child in self._all_children(cur_parent):
1875
 
                final_name = self._final_name_cache.get(child)
1876
 
                if final_name is None:
1877
 
                    final_name = self._transform.final_name(child)
1878
 
                    self._final_name_cache[child] = final_name
1879
 
                if final_name == cur_segment:
 
1480
                if self._transform.final_name(child) == cur_segment:
1880
1481
                    cur_parent = child
1881
1482
                    break
1882
1483
            else:
1883
 
                self._path2trans_id_cache[path] = None
1884
1484
                return None
1885
 
        self._path2trans_id_cache[path] = cur_parent
1886
1485
        return cur_parent
1887
1486
 
1888
1487
    def path2id(self, path):
1896
1495
            raise errors.NoSuchId(self, file_id)
1897
1496
 
1898
1497
    def _all_children(self, trans_id):
1899
 
        children = self._all_children_cache.get(trans_id)
1900
 
        if children is not None:
1901
 
            return children
1902
1498
        children = set(self._transform.iter_tree_children(trans_id))
1903
1499
        # children in the _new_parent set are provided by _by_parent.
1904
1500
        children.difference_update(self._transform._new_parent.keys())
1905
1501
        children.update(self._by_parent.get(trans_id, []))
1906
 
        self._all_children_cache[trans_id] = children
1907
1502
        return children
1908
1503
 
1909
 
    def iter_children(self, file_id):
1910
 
        trans_id = self._transform.trans_id_file_id(file_id)
1911
 
        for child_trans_id in self._all_children(trans_id):
1912
 
            yield self._transform.final_file_id(child_trans_id)
1913
 
 
1914
 
    def extras(self):
1915
 
        possible_extras = set(self._transform.trans_id_tree_path(p) for p
1916
 
                              in self._transform._tree.extras())
1917
 
        possible_extras.update(self._transform._new_contents)
1918
 
        possible_extras.update(self._transform._removed_id)
1919
 
        for trans_id in possible_extras:
1920
 
            if self._transform.final_file_id(trans_id) is None:
1921
 
                yield self._final_paths._determine_path(trans_id)
1922
 
 
1923
 
    def _make_inv_entries(self, ordered_entries, specific_file_ids=None,
1924
 
        yield_parents=False):
 
1504
    def _make_inv_entries(self, ordered_entries, specific_file_ids):
1925
1505
        for trans_id, parent_file_id in ordered_entries:
1926
1506
            file_id = self._transform.final_file_id(trans_id)
1927
1507
            if file_id is None:
1939
1519
                parent_file_id, file_id)
1940
1520
            yield new_entry, trans_id
1941
1521
 
1942
 
    def _list_files_by_dir(self):
 
1522
    def iter_entries_by_dir(self, specific_file_ids=None):
 
1523
        # This may not be a maximally efficient implementation, but it is
 
1524
        # reasonably straightforward.  An implementation that grafts the
 
1525
        # TreeTransform changes onto the tree's iter_entries_by_dir results
 
1526
        # might be more efficient, but requires tricky inferences about stack
 
1527
        # position.
1943
1528
        todo = [ROOT_PARENT]
1944
1529
        ordered_ids = []
1945
1530
        while len(todo) > 0:
1951
1536
            todo.extend(reversed(children))
1952
1537
            for trans_id in children:
1953
1538
                ordered_ids.append((trans_id, parent_file_id))
1954
 
        return ordered_ids
1955
 
 
1956
 
    def iter_entries_by_dir(self, specific_file_ids=None, yield_parents=False):
1957
 
        # This may not be a maximally efficient implementation, but it is
1958
 
        # reasonably straightforward.  An implementation that grafts the
1959
 
        # TreeTransform changes onto the tree's iter_entries_by_dir results
1960
 
        # might be more efficient, but requires tricky inferences about stack
1961
 
        # position.
1962
 
        ordered_ids = self._list_files_by_dir()
1963
1539
        for entry, trans_id in self._make_inv_entries(ordered_ids,
1964
 
            specific_file_ids, yield_parents=yield_parents):
1965
 
            yield unicode(self._final_paths.get_path(trans_id)), entry
1966
 
 
1967
 
    def _iter_entries_for_dir(self, dir_path):
1968
 
        """Return path, entry for items in a directory without recursing down."""
1969
 
        dir_file_id = self.path2id(dir_path)
1970
 
        ordered_ids = []
1971
 
        for file_id in self.iter_children(dir_file_id):
1972
 
            trans_id = self._transform.trans_id_file_id(file_id)
1973
 
            ordered_ids.append((trans_id, file_id))
1974
 
        for entry, trans_id in self._make_inv_entries(ordered_ids):
1975
 
            yield unicode(self._final_paths.get_path(trans_id)), entry
1976
 
 
1977
 
    def list_files(self, include_root=False, from_dir=None, recursive=True):
1978
 
        """See WorkingTree.list_files."""
1979
 
        # XXX This should behave like WorkingTree.list_files, but is really
1980
 
        # more like RevisionTree.list_files.
1981
 
        if recursive:
1982
 
            prefix = None
1983
 
            if from_dir:
1984
 
                prefix = from_dir + '/'
1985
 
            entries = self.iter_entries_by_dir()
1986
 
            for path, entry in entries:
1987
 
                if entry.name == '' and not include_root:
1988
 
                    continue
1989
 
                if prefix:
1990
 
                    if not path.startswith(prefix):
1991
 
                        continue
1992
 
                    path = path[len(prefix):]
1993
 
                yield path, 'V', entry.kind, entry.file_id, entry
1994
 
        else:
1995
 
            if from_dir is None and include_root is True:
1996
 
                root_entry = inventory.make_entry('directory', '',
1997
 
                    ROOT_PARENT, self.get_root_id())
1998
 
                yield '', 'V', 'directory', root_entry.file_id, root_entry
1999
 
            entries = self._iter_entries_for_dir(from_dir or '')
2000
 
            for path, entry in entries:
2001
 
                yield path, 'V', entry.kind, entry.file_id, entry
 
1540
                                                      specific_file_ids):
 
1541
            yield unicode(self._final_paths.get_path(trans_id)), entry
2002
1542
 
2003
1543
    def kind(self, file_id):
2004
1544
        trans_id = self._transform.trans_id_file_id(file_id)
2014
1554
    def get_file_mtime(self, file_id, path=None):
2015
1555
        """See Tree.get_file_mtime"""
2016
1556
        if not self._content_change(file_id):
2017
 
            return self._transform._tree.get_file_mtime(file_id)
 
1557
            return self._transform._tree.get_file_mtime(file_id, path)
2018
1558
        return self._stat_limbo_file(file_id).st_mtime
2019
1559
 
2020
 
    def _file_size(self, entry, stat_value):
2021
 
        return self.get_file_size(entry.file_id)
2022
 
 
2023
1560
    def get_file_size(self, file_id):
2024
1561
        """See Tree.get_file_size"""
2025
1562
        if self.kind(file_id) == 'file':
2028
1565
            return None
2029
1566
 
2030
1567
    def get_file_sha1(self, file_id, path=None, stat_value=None):
2031
 
        trans_id = self._transform.trans_id_file_id(file_id)
2032
 
        kind = self._transform._new_contents.get(trans_id)
2033
 
        if kind is None:
2034
 
            return self._transform._tree.get_file_sha1(file_id)
2035
 
        if kind == 'file':
2036
 
            fileobj = self.get_file(file_id)
2037
 
            try:
2038
 
                return sha_file(fileobj)
2039
 
            finally:
2040
 
                fileobj.close()
 
1568
        return self._transform._tree.get_file_sha1(file_id)
2041
1569
 
2042
1570
    def is_executable(self, file_id, path=None):
2043
 
        if file_id is None:
2044
 
            return False
2045
1571
        trans_id = self._transform.trans_id_file_id(file_id)
2046
1572
        try:
2047
1573
            return self._transform._new_executability[trans_id]
2048
1574
        except KeyError:
2049
 
            try:
2050
 
                return self._transform._tree.is_executable(file_id, path)
2051
 
            except OSError, e:
2052
 
                if e.errno == errno.ENOENT:
2053
 
                    return False
2054
 
                raise
2055
 
            except errors.NoSuchId:
2056
 
                return False
 
1575
            return self._transform._tree.is_executable(file_id, path)
2057
1576
 
2058
1577
    def path_content_summary(self, path):
2059
1578
        trans_id = self._path2trans_id(path)
2074
1593
                statval = os.lstat(limbo_name)
2075
1594
                size = statval.st_size
2076
1595
                if not supports_executable():
2077
 
                    executable = False
 
1596
                    executable = None
2078
1597
                else:
2079
1598
                    executable = statval.st_mode & S_IEXEC
2080
1599
            else:
2081
1600
                size = None
2082
1601
                executable = None
2083
1602
            if kind == 'symlink':
2084
 
                link_or_sha1 = os.readlink(limbo_name).decode(osutils._fs_enc)
2085
 
        executable = tt._new_executability.get(trans_id, executable)
 
1603
                link_or_sha1 = os.readlink(limbo_name)
 
1604
        if supports_executable():
 
1605
            executable = tt._new_executability.get(trans_id, executable)
2086
1606
        return kind, size, executable, link_or_sha1
2087
1607
 
2088
1608
    def iter_changes(self, from_tree, include_unchanged=False,
2090
1610
                      require_versioned=True, want_unversioned=False):
2091
1611
        """See InterTree.iter_changes.
2092
1612
 
2093
 
        This has a fast path that is only used when the from_tree matches
2094
 
        the transform tree, and no fancy options are supplied.
 
1613
        This implementation does not support include_unchanged, specific_files,
 
1614
        or want_unversioned.  extra_trees, require_versioned, and pb are
 
1615
        ignored.
2095
1616
        """
2096
 
        if (from_tree is not self._transform._tree or include_unchanged or
2097
 
            specific_files or want_unversioned):
2098
 
            return tree.InterTree(from_tree, self).iter_changes(
2099
 
                include_unchanged=include_unchanged,
2100
 
                specific_files=specific_files,
2101
 
                pb=pb,
2102
 
                extra_trees=extra_trees,
2103
 
                require_versioned=require_versioned,
2104
 
                want_unversioned=want_unversioned)
 
1617
        if from_tree is not self._transform._tree:
 
1618
            raise ValueError('from_tree must be transform source tree.')
 
1619
        if include_unchanged:
 
1620
            raise ValueError('include_unchanged is not supported')
 
1621
        if specific_files is not None:
 
1622
            raise ValueError('specific_files is not supported')
2105
1623
        if want_unversioned:
2106
1624
            raise ValueError('want_unversioned is not supported')
2107
1625
        return self._transform.iter_changes()
2114
1632
        name = self._transform._limbo_name(trans_id)
2115
1633
        return open(name, 'rb')
2116
1634
 
2117
 
    def get_file_with_stat(self, file_id, path=None):
2118
 
        return self.get_file(file_id, path), None
 
1635
    def get_file_text(self, file_id):
 
1636
        text_file = self.get_file(file_id)
 
1637
        try:
 
1638
            return text_file.read()
 
1639
        finally:
 
1640
            text_file.close()
2119
1641
 
2120
1642
    def annotate_iter(self, file_id,
2121
1643
                      default_revision=_mod_revision.CURRENT_REVISION):
2122
 
        changes = self._iter_changes_cache.get(file_id)
 
1644
        changes = self._changes(file_id)
2123
1645
        if changes is None:
2124
1646
            get_old = True
2125
1647
        else:
2137
1659
            return old_annotation
2138
1660
        if not changed_content:
2139
1661
            return old_annotation
2140
 
        # TODO: This is doing something similar to what WT.annotate_iter is
2141
 
        #       doing, however it fails slightly because it doesn't know what
2142
 
        #       the *other* revision_id is, so it doesn't know how to give the
2143
 
        #       other as the origin for some lines, they all get
2144
 
        #       'default_revision'
2145
 
        #       It would be nice to be able to use the new Annotator based
2146
 
        #       approach, as well.
2147
1662
        return annotate.reannotate([old_annotation],
2148
1663
                                   self.get_file(file_id).readlines(),
2149
1664
                                   default_revision)
2154
1669
            return self._transform._tree.get_symlink_target(file_id)
2155
1670
        trans_id = self._transform.trans_id_file_id(file_id)
2156
1671
        name = self._transform._limbo_name(trans_id)
2157
 
        return osutils.readlink(name)
2158
 
 
2159
 
    def walkdirs(self, prefix=''):
2160
 
        pending = [self._transform.root]
2161
 
        while len(pending) > 0:
2162
 
            parent_id = pending.pop()
2163
 
            children = []
2164
 
            subdirs = []
2165
 
            prefix = prefix.rstrip('/')
2166
 
            parent_path = self._final_paths.get_path(parent_id)
2167
 
            parent_file_id = self._transform.final_file_id(parent_id)
2168
 
            for child_id in self._all_children(parent_id):
2169
 
                path_from_root = self._final_paths.get_path(child_id)
2170
 
                basename = self._transform.final_name(child_id)
2171
 
                file_id = self._transform.final_file_id(child_id)
2172
 
                try:
2173
 
                    kind = self._transform.final_kind(child_id)
2174
 
                    versioned_kind = kind
2175
 
                except NoSuchFile:
2176
 
                    kind = 'unknown'
2177
 
                    versioned_kind = self._transform._tree.stored_kind(file_id)
2178
 
                if versioned_kind == 'directory':
2179
 
                    subdirs.append(child_id)
2180
 
                children.append((path_from_root, basename, kind, None,
2181
 
                                 file_id, versioned_kind))
2182
 
            children.sort()
2183
 
            if parent_path.startswith(prefix):
2184
 
                yield (parent_path, parent_file_id), children
2185
 
            pending.extend(sorted(subdirs, key=self._final_paths.get_path,
2186
 
                                  reverse=True))
 
1672
        return os.readlink(name)
 
1673
 
 
1674
    def list_files(self, include_root=False):
 
1675
        return self._transform._tree.list_files(include_root)
 
1676
 
 
1677
    def walkdirs(self, prefix=""):
 
1678
        return self._transform._tree.walkdirs(prefix)
2187
1679
 
2188
1680
    def get_parent_ids(self):
2189
 
        return self._parent_ids
2190
 
 
2191
 
    def set_parent_ids(self, parent_ids):
2192
 
        self._parent_ids = parent_ids
 
1681
        return self._transform._tree.get_parent_ids()
2193
1682
 
2194
1683
    def get_revision_tree(self, revision_id):
2195
1684
        return self._transform._tree.get_revision_tree(revision_id)
2215
1704
        self.transform = transform
2216
1705
 
2217
1706
    def _determine_path(self, trans_id):
2218
 
        if (trans_id == self.transform.root or trans_id == ROOT_PARENT):
 
1707
        if trans_id == self.transform.root:
2219
1708
            return ""
2220
1709
        name = self.transform.final_name(trans_id)
2221
1710
        parent_id = self.transform.final_parent(trans_id)
2245
1734
def build_tree(tree, wt, accelerator_tree=None, hardlink=False,
2246
1735
               delta_from_tree=False):
2247
1736
    """Create working tree for a branch, using a TreeTransform.
2248
 
 
 
1737
    
2249
1738
    This function should be used on empty trees, having a tree root at most.
2250
1739
    (see merge and revert functionality for working with existing trees)
2251
1740
 
2252
1741
    Existing files are handled like so:
2253
 
 
 
1742
    
2254
1743
    - Existing bzrdirs take precedence over creating new items.  They are
2255
1744
      created as '%s.diverted' % name.
2256
1745
    - Otherwise, if the content on disk matches the content we are building,
2358
1847
                    executable = tree.is_executable(file_id, tree_path)
2359
1848
                    if executable:
2360
1849
                        tt.set_executability(executable, trans_id)
2361
 
                    trans_data = (trans_id, tree_path)
2362
 
                    deferred_contents.append((file_id, trans_data))
 
1850
                    deferred_contents.append((file_id, trans_id))
2363
1851
                else:
2364
1852
                    file_trans_id[file_id] = new_by_entry(tt, entry, parent_id,
2365
1853
                                                          tree)
2396
1884
def _create_files(tt, tree, desired_files, pb, offset, accelerator_tree,
2397
1885
                  hardlink):
2398
1886
    total = len(desired_files) + offset
2399
 
    wt = tt._tree
2400
1887
    if accelerator_tree is None:
2401
1888
        new_desired_files = desired_files
2402
1889
    else:
2403
1890
        iter = accelerator_tree.iter_changes(tree, include_unchanged=True)
2404
 
        unchanged = [(f, p[1]) for (f, p, c, v, d, n, k, e)
2405
 
                     in iter if not (c or e[0] != e[1])]
2406
 
        if accelerator_tree.supports_content_filtering():
2407
 
            unchanged = [(f, p) for (f, p) in unchanged
2408
 
                         if not accelerator_tree.iter_search_rules([p]).next()]
2409
 
        unchanged = dict(unchanged)
 
1891
        unchanged = dict((f, p[1]) for (f, p, c, v, d, n, k, e)
 
1892
                         in iter if not (c or e[0] != e[1]))
2410
1893
        new_desired_files = []
2411
1894
        count = 0
2412
 
        for file_id, (trans_id, tree_path) in desired_files:
 
1895
        for file_id, trans_id in desired_files:
2413
1896
            accelerator_path = unchanged.get(file_id)
2414
1897
            if accelerator_path is None:
2415
 
                new_desired_files.append((file_id, (trans_id, tree_path)))
 
1898
                new_desired_files.append((file_id, trans_id))
2416
1899
                continue
2417
1900
            pb.update('Adding file contents', count + offset, total)
2418
1901
            if hardlink:
2420
1903
                                   trans_id)
2421
1904
            else:
2422
1905
                contents = accelerator_tree.get_file(file_id, accelerator_path)
2423
 
                if wt.supports_content_filtering():
2424
 
                    filters = wt._content_filter_stack(tree_path)
2425
 
                    contents = filtered_output_bytes(contents, filters,
2426
 
                        ContentFilterContext(tree_path, tree))
2427
1906
                try:
2428
1907
                    tt.create_file(contents, trans_id)
2429
1908
                finally:
2430
 
                    try:
2431
 
                        contents.close()
2432
 
                    except AttributeError:
2433
 
                        # after filtering, contents may no longer be file-like
2434
 
                        pass
 
1909
                    contents.close()
2435
1910
            count += 1
2436
1911
        offset += count
2437
 
    for count, ((trans_id, tree_path), contents) in enumerate(
2438
 
            tree.iter_files_bytes(new_desired_files)):
2439
 
        if wt.supports_content_filtering():
2440
 
            filters = wt._content_filter_stack(tree_path)
2441
 
            contents = filtered_output_bytes(contents, filters,
2442
 
                ContentFilterContext(tree_path, tree))
 
1912
    for count, (trans_id, contents) in enumerate(tree.iter_files_bytes(
 
1913
                                                 new_desired_files)):
2443
1914
        tt.create_file(contents, trans_id)
2444
1915
        pb.update('Adding file contents', count + offset, total)
2445
1916
 
2505
1976
    if kind == 'file':
2506
1977
        contents = tree.get_file(entry.file_id).readlines()
2507
1978
        executable = tree.is_executable(entry.file_id)
2508
 
        return tt.new_file(name, parent_id, contents, entry.file_id,
 
1979
        return tt.new_file(name, parent_id, contents, entry.file_id, 
2509
1980
                           executable)
2510
1981
    elif kind in ('directory', 'tree-reference'):
2511
1982
        trans_id = tt.new_directory(name, parent_id, entry.file_id)
2512
1983
        if kind == 'tree-reference':
2513
1984
            tt.set_tree_reference(entry.reference_revision, trans_id)
2514
 
        return trans_id
 
1985
        return trans_id 
2515
1986
    elif kind == 'symlink':
2516
1987
        target = tree.get_symlink_target(entry.file_id)
2517
1988
        return tt.new_symlink(name, parent_id, target, entry.file_id)
2519
1990
        raise errors.BadFileKindError(name, kind)
2520
1991
 
2521
1992
 
2522
 
@deprecated_function(deprecated_in((1, 9, 0)))
2523
1993
def create_by_entry(tt, entry, tree, trans_id, lines=None, mode_id=None):
2524
 
    """Create new file contents according to an inventory entry.
2525
 
 
2526
 
    DEPRECATED.  Use create_from_tree instead.
2527
 
    """
 
1994
    """Create new file contents according to an inventory entry."""
2528
1995
    if entry.kind == "file":
2529
1996
        if lines is None:
2530
1997
            lines = tree.get_file(entry.file_id).readlines()
2535
2002
        tt.create_directory(trans_id)
2536
2003
 
2537
2004
 
2538
 
def create_from_tree(tt, trans_id, tree, file_id, bytes=None,
2539
 
    filter_tree_path=None):
2540
 
    """Create new file contents according to tree contents.
2541
 
    
2542
 
    :param filter_tree_path: the tree path to use to lookup
2543
 
      content filters to apply to the bytes output in the working tree.
2544
 
      This only applies if the working tree supports content filtering.
2545
 
    """
2546
 
    kind = tree.kind(file_id)
2547
 
    if kind == 'directory':
2548
 
        tt.create_directory(trans_id)
2549
 
    elif kind == "file":
2550
 
        if bytes is None:
2551
 
            tree_file = tree.get_file(file_id)
2552
 
            try:
2553
 
                bytes = tree_file.readlines()
2554
 
            finally:
2555
 
                tree_file.close()
2556
 
        wt = tt._tree
2557
 
        if wt.supports_content_filtering() and filter_tree_path is not None:
2558
 
            filters = wt._content_filter_stack(filter_tree_path)
2559
 
            bytes = filtered_output_bytes(bytes, filters,
2560
 
                ContentFilterContext(filter_tree_path, tree))
2561
 
        tt.create_file(bytes, trans_id)
2562
 
    elif kind == "symlink":
2563
 
        tt.create_symlink(tree.get_symlink_target(file_id), trans_id)
2564
 
    else:
2565
 
        raise AssertionError('Unknown kind %r' % kind)
2566
 
 
2567
 
 
2568
2005
def create_entry_executability(tt, entry, trans_id):
2569
2006
    """Set the executability of a trans_id according to an inventory entry"""
2570
2007
    if entry.kind == "file":
2607
2044
        if entry.kind != working_kind:
2608
2045
            contents_mod, meta_mod = True, False
2609
2046
        else:
2610
 
            cur_entry._read_tree_state(working_tree.id2path(file_id),
 
2047
            cur_entry._read_tree_state(working_tree.id2path(file_id), 
2611
2048
                                       working_tree)
2612
2049
            contents_mod, meta_mod = entry.detect_changes(cur_entry)
2613
2050
            cur_entry._forget_tree_state()
2615
2052
 
2616
2053
 
2617
2054
def revert(working_tree, target_tree, filenames, backups=False,
2618
 
           pb=None, change_reporter=None):
 
2055
           pb=DummyProgress(), change_reporter=None):
2619
2056
    """Revert a working tree's contents to those of a target tree."""
2620
2057
    target_tree.lock_read()
2621
 
    pb = ui.ui_factory.nested_progress_bar()
2622
2058
    tt = TreeTransform(working_tree, pb)
2623
2059
    try:
2624
2060
        pp = ProgressPhase("Revert phase", 3, pb)
2625
 
        conflicts, merge_modified = _prepare_revert_transform(
2626
 
            working_tree, target_tree, tt, filenames, backups, pp)
 
2061
        pp.next_phase()
 
2062
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
2063
        try:
 
2064
            merge_modified = _alter_files(working_tree, target_tree, tt,
 
2065
                                          child_pb, filenames, backups)
 
2066
        finally:
 
2067
            child_pb.finished()
 
2068
        pp.next_phase()
 
2069
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
2070
        try:
 
2071
            raw_conflicts = resolve_conflicts(tt, child_pb,
 
2072
                lambda t, c: conflict_pass(t, c, target_tree))
 
2073
        finally:
 
2074
            child_pb.finished()
 
2075
        conflicts = cook_conflicts(raw_conflicts, tt)
2627
2076
        if change_reporter:
2628
2077
            change_reporter = delta._ChangeReporter(
2629
2078
                unversioned_filter=working_tree.is_ignored)
2640
2089
    return conflicts
2641
2090
 
2642
2091
 
2643
 
def _prepare_revert_transform(working_tree, target_tree, tt, filenames,
2644
 
                              backups, pp, basis_tree=None,
2645
 
                              merge_modified=None):
2646
 
    child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2647
 
    try:
2648
 
        if merge_modified is None:
2649
 
            merge_modified = working_tree.merge_modified()
2650
 
        merge_modified = _alter_files(working_tree, target_tree, tt,
2651
 
                                      child_pb, filenames, backups,
2652
 
                                      merge_modified, basis_tree)
2653
 
    finally:
2654
 
        child_pb.finished()
2655
 
    child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2656
 
    try:
2657
 
        raw_conflicts = resolve_conflicts(tt, child_pb,
2658
 
            lambda t, c: conflict_pass(t, c, target_tree))
2659
 
    finally:
2660
 
        child_pb.finished()
2661
 
    conflicts = cook_conflicts(raw_conflicts, tt)
2662
 
    return conflicts, merge_modified
2663
 
 
2664
 
 
2665
2092
def _alter_files(working_tree, target_tree, tt, pb, specific_files,
2666
 
                 backups, merge_modified, basis_tree=None):
2667
 
    if basis_tree is not None:
2668
 
        basis_tree.lock_read()
 
2093
                 backups):
 
2094
    merge_modified = working_tree.merge_modified()
2669
2095
    change_list = target_tree.iter_changes(working_tree,
2670
2096
        specific_files=specific_files, pb=pb)
2671
 
    if target_tree.get_root_id() is None:
 
2097
    if target_tree.inventory.root is None:
2672
2098
        skip_root = True
2673
2099
    else:
2674
2100
        skip_root = False
 
2101
    basis_tree = None
2675
2102
    try:
2676
2103
        deferred_files = []
2677
2104
        for id_num, (file_id, path, changed_content, versioned, parent, name,
2713
2140
                        # contents
2714
2141
                        mode_id = trans_id
2715
2142
                        trans_id = new_trans_id
2716
 
                if kind[1] in ('directory', 'tree-reference'):
 
2143
                if kind[1] == 'directory':
2717
2144
                    tt.create_directory(trans_id)
2718
 
                    if kind[1] == 'tree-reference':
2719
 
                        revision = target_tree.get_reference_revision(file_id,
2720
 
                                                                      path[1])
2721
 
                        tt.set_tree_reference(revision, trans_id)
2722
2145
                elif kind[1] == 'symlink':
2723
2146
                    tt.create_symlink(target_tree.get_symlink_target(file_id),
2724
2147
                                      trans_id)
2744
2167
                tt.version_file(file_id, trans_id)
2745
2168
            if versioned == (True, False):
2746
2169
                tt.unversion_file(trans_id)
2747
 
            if (name[1] is not None and
 
2170
            if (name[1] is not None and 
2748
2171
                (name[0] != name[1] or parent[0] != parent[1])):
2749
 
                if name[1] == '' and parent[1] is None:
2750
 
                    parent_trans = ROOT_PARENT
2751
 
                else:
2752
 
                    parent_trans = tt.trans_id_file_id(parent[1])
2753
 
                if parent[0] is None and versioned[0]:
2754
 
                    tt.adjust_root_path(name[1], parent_trans)
2755
 
                else:
2756
 
                    tt.adjust_path(name[1], parent_trans, trans_id)
 
2172
                tt.adjust_path(
 
2173
                    name[1], tt.trans_id_file_id(parent[1]), trans_id)
2757
2174
            if executable[0] != executable[1] and kind[1] == "file":
2758
2175
                tt.set_executability(executable[1], trans_id)
2759
 
        if working_tree.supports_content_filtering():
2760
 
            for index, ((trans_id, mode_id), bytes) in enumerate(
2761
 
                target_tree.iter_files_bytes(deferred_files)):
2762
 
                file_id = deferred_files[index][0]
2763
 
                # We're reverting a tree to the target tree so using the
2764
 
                # target tree to find the file path seems the best choice
2765
 
                # here IMO - Ian C 27/Oct/2009
2766
 
                filter_tree_path = target_tree.id2path(file_id)
2767
 
                filters = working_tree._content_filter_stack(filter_tree_path)
2768
 
                bytes = filtered_output_bytes(bytes, filters,
2769
 
                    ContentFilterContext(filter_tree_path, working_tree))
2770
 
                tt.create_file(bytes, trans_id, mode_id)
2771
 
        else:
2772
 
            for (trans_id, mode_id), bytes in target_tree.iter_files_bytes(
2773
 
                deferred_files):
2774
 
                tt.create_file(bytes, trans_id, mode_id)
2775
 
        tt.fixup_new_roots()
 
2176
        for (trans_id, mode_id), bytes in target_tree.iter_files_bytes(
 
2177
            deferred_files):
 
2178
            tt.create_file(bytes, trans_id, mode_id)
2776
2179
    finally:
2777
2180
        if basis_tree is not None:
2778
2181
            basis_tree.unlock()
2779
2182
    return merge_modified
2780
2183
 
2781
2184
 
2782
 
def resolve_conflicts(tt, pb=None, pass_func=None):
 
2185
def resolve_conflicts(tt, pb=DummyProgress(), pass_func=None):
2783
2186
    """Make many conflict-resolution attempts, but die if they fail"""
2784
2187
    if pass_func is None:
2785
2188
        pass_func = conflict_pass
2786
2189
    new_conflicts = set()
2787
 
    pb = ui.ui_factory.nested_progress_bar()
2788
2190
    try:
2789
2191
        for n in range(10):
2790
2192
            pb.update('Resolution pass', n+1, 10)
2794
2196
            new_conflicts.update(pass_func(tt, conflicts))
2795
2197
        raise MalformedTransform(conflicts=conflicts)
2796
2198
    finally:
2797
 
        pb.finished()
 
2199
        pb.clear()
2798
2200
 
2799
2201
 
2800
2202
def conflict_pass(tt, conflicts, path_tree=None):
2819
2221
                existing_file, new_file = conflict[1], conflict[2]
2820
2222
            new_name = tt.final_name(existing_file)+'.moved'
2821
2223
            tt.adjust_path(new_name, final_parent, existing_file)
2822
 
            new_conflicts.add((c_type, 'Moved existing file to',
 
2224
            new_conflicts.add((c_type, 'Moved existing file to', 
2823
2225
                               existing_file, new_file))
2824
2226
        elif c_type == 'parent loop':
2825
2227
            # break the loop by undoing one of the ops that caused the loop
2829
2231
            new_conflicts.add((c_type, 'Cancelled move', cur,
2830
2232
                               tt.final_parent(cur),))
2831
2233
            tt.adjust_path(tt.final_name(cur), tt.get_tree_parent(cur), cur)
2832
 
 
 
2234
            
2833
2235
        elif c_type == 'missing parent':
2834
2236
            trans_id = conflict[1]
2835
2237
            try:
2836
2238
                tt.cancel_deletion(trans_id)
2837
 
                new_conflicts.add(('deleting parent', 'Not deleting',
 
2239
                new_conflicts.add(('deleting parent', 'Not deleting', 
2838
2240
                                   trans_id))
2839
2241
            except KeyError:
2840
2242
                create = True
2849
2251
                        # special-case the other tree root (move its
2850
2252
                        # children to current root)
2851
2253
                        if entry.parent_id is None:
2852
 
                            create = False
 
2254
                            create=False
2853
2255
                            moved = _reparent_transform_children(
2854
2256
                                tt, trans_id, tt.root)
2855
2257
                            for child in moved:
2882
2284
            if parent_file_id is not None:
2883
2285
                tt.unversion_file(parent_id)
2884
2286
            new_conflicts.add((c_type, 'Created directory', new_parent_id))
2885
 
        elif c_type == 'versioning no contents':
2886
 
            tt.cancel_versioning(conflict[1])
2887
2287
    return new_conflicts
2888
2288
 
2889
2289
 
2905
2305
        if len(conflict) == 3:
2906
2306
            yield Conflict.factory(c_type, action=action, path=modified_path,
2907
2307
                                     file_id=modified_id)
2908
 
 
 
2308
             
2909
2309
        else:
2910
2310
            conflicting_path = fp.get_path(conflict[3])
2911
2311
            conflicting_id = tt.final_file_id(conflict[3])
2912
2312
            yield Conflict.factory(c_type, action=action, path=modified_path,
2913
 
                                   file_id=modified_id,
 
2313
                                   file_id=modified_id, 
2914
2314
                                   conflict_path=conflicting_path,
2915
2315
                                   conflict_file_id=conflicting_id)
2916
2316
 
2923
2323
        self.pending_deletions = []
2924
2324
 
2925
2325
    def rename(self, from_, to):
2926
 
        """Rename a file from one path to another."""
 
2326
        """Rename a file from one path to another.  Functions like os.rename"""
2927
2327
        try:
2928
 
            osutils.rename(from_, to)
 
2328
            os.rename(from_, to)
2929
2329
        except OSError, e:
2930
2330
            if e.errno in (errno.EEXIST, errno.ENOTEMPTY):
2931
2331
                raise errors.FileExists(to, str(e))
2945
2345
    def rollback(self):
2946
2346
        """Reverse all renames that have been performed"""
2947
2347
        for from_, to in reversed(self.past_renames):
2948
 
            osutils.rename(to, from_)
 
2348
            os.rename(to, from_)
2949
2349
        # after rollback, don't reuse _FileMover
2950
2350
        past_renames = None
2951
2351
        pending_deletions = None