← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-04-10 19:37:20 UTC
  • mfrom: (4222.3.15 username)
  • Revision ID: pqm@pqm.ubuntu.com-20090410193720-nyej7ft1k2yoyhui
(Jelmer) Prompt for user names for http if they are not in the
        configuration.

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
17
17
import os
18
18
import errno
19
19
from stat import S_ISREG, S_IEXEC
20
 
import time
21
20
 
22
21
from bzrlib.lazy_import import lazy_import
23
22
lazy_import(globals(), """
24
23
from bzrlib import (
25
24
    annotate,
26
 
    bencode,
27
25
    bzrdir,
28
26
    delta,
29
27
    errors,
31
29
    multiparent,
32
30
    osutils,
33
31
    revision as _mod_revision,
34
 
    ui,
35
32
    )
 
33
from bzrlib.util import bencode
36
34
""")
37
35
from bzrlib.errors import (DuplicateKey, MalformedTransform, NoSuchFile,
38
 
                           ReusingTransform, CantMoveRoot,
 
36
                           ReusingTransform, NotVersionedError, CantMoveRoot,
39
37
                           ExistingLimbo, ImmortalLimbo, NoFinalPath,
40
38
                           UnableCreateSymlink)
41
39
from bzrlib.filters import filtered_output_bytes, ContentFilterContext
50
48
    splitpath,
51
49
    supports_executable,
52
50
)
53
 
from bzrlib.progress import ProgressPhase
 
51
from bzrlib.progress import DummyProgress, ProgressPhase
54
52
from bzrlib.symbol_versioning import (
55
53
        deprecated_function,
56
54
        deprecated_in,
78
76
 
79
77
 
80
78
class TreeTransformBase(object):
81
 
    """The base class for TreeTransform and its kin."""
 
79
    """The base class for TreeTransform and TreeTransformBase"""
82
80
 
83
 
    def __init__(self, tree, pb=None,
 
81
    def __init__(self, tree, limbodir, pb=DummyProgress(),
84
82
                 case_sensitive=True):
85
83
        """Constructor.
86
84
 
87
85
        :param tree: The tree that will be transformed, but not necessarily
88
86
            the output tree.
89
 
        :param pb: ignored
 
87
        :param limbodir: A directory where new files can be stored until
 
88
            they are installed in their proper places
 
89
        :param pb: A ProgressBar indicating how much progress is being made
90
90
        :param case_sensitive: If True, the target of the transform is
91
91
            case sensitive, not just case preserving.
92
92
        """
93
93
        object.__init__(self)
94
94
        self._tree = tree
 
95
        self._limbodir = limbodir
 
96
        self._deletiondir = None
95
97
        self._id_number = 0
96
98
        # mapping of trans_id -> new basename
97
99
        self._new_name = {}
99
101
        self._new_parent = {}
100
102
        # mapping of trans_id with new contents -> new file_kind
101
103
        self._new_contents = {}
 
104
        # A mapping of transform ids to their limbo filename
 
105
        self._limbo_files = {}
 
106
        # A mapping of transform ids to a set of the transform ids of children
 
107
        # that their limbo directory has
 
108
        self._limbo_children = {}
 
109
        # Map transform ids to maps of child filename to child transform id
 
110
        self._limbo_children_names = {}
 
111
        # List of transform ids that need to be renamed from limbo into place
 
112
        self._needs_rename = set()
102
113
        # Set of trans_ids whose contents will be removed
103
114
        self._removed_contents = set()
104
115
        # Mapping of trans_id -> new execute-bit value
117
128
        self._tree_path_ids = {}
118
129
        # Mapping trans_id -> path in old tree
119
130
        self._tree_id_paths = {}
 
131
        # Cache of realpath results, to speed up canonical_path
 
132
        self._realpaths = {}
 
133
        # Cache of relpath results, to speed up canonical_path
 
134
        self._relpaths = {}
120
135
        # The trans_id that will be used as the tree root
121
136
        root_id = tree.get_root_id()
122
137
        if root_id is not None:
132
147
        # A counter of how many files have been renamed
133
148
        self.rename_count = 0
134
149
 
135
 
    def finalize(self):
136
 
        """Release the working tree lock, if held.
137
 
 
138
 
        This is required if apply has not been invoked, but can be invoked
139
 
        even after apply.
140
 
        """
141
 
        if self._tree is None:
142
 
            return
143
 
        self._tree.unlock()
144
 
        self._tree = None
145
 
 
146
150
    def __get_root(self):
147
151
        return self._new_root
148
152
 
149
153
    root = property(__get_root)
150
154
 
 
155
    def finalize(self):
 
156
        """Release the working tree lock, if held, clean up limbo dir.
 
157
 
 
158
        This is required if apply has not been invoked, but can be invoked
 
159
        even after apply.
 
160
        """
 
161
        if self._tree is None:
 
162
            return
 
163
        try:
 
164
            entries = [(self._limbo_name(t), t, k) for t, k in
 
165
                       self._new_contents.iteritems()]
 
166
            entries.sort(reverse=True)
 
167
            for path, trans_id, kind in entries:
 
168
                if kind == "directory":
 
169
                    os.rmdir(path)
 
170
                else:
 
171
                    os.unlink(path)
 
172
            try:
 
173
                os.rmdir(self._limbodir)
 
174
            except OSError:
 
175
                # We don't especially care *why* the dir is immortal.
 
176
                raise ImmortalLimbo(self._limbodir)
 
177
            try:
 
178
                if self._deletiondir is not None:
 
179
                    os.rmdir(self._deletiondir)
 
180
            except OSError:
 
181
                raise errors.ImmortalPendingDeletion(self._deletiondir)
 
182
        finally:
 
183
            self._tree.unlock()
 
184
            self._tree = None
 
185
 
151
186
    def _assign_id(self):
152
187
        """Produce a new tranform id"""
153
188
        new_id = "new-%s" % self._id_number
163
198
 
164
199
    def adjust_path(self, name, parent, trans_id):
165
200
        """Change the path that is assigned to a transaction id."""
166
 
        if parent is None:
167
 
            raise ValueError("Parent trans-id may not be None")
168
201
        if trans_id == self._new_root:
169
202
            raise CantMoveRoot
 
203
        previous_parent = self._new_parent.get(trans_id)
 
204
        previous_name = self._new_name.get(trans_id)
170
205
        self._new_name[trans_id] = name
171
206
        self._new_parent[trans_id] = parent
 
207
        if parent == ROOT_PARENT:
 
208
            if self._new_root is not None:
 
209
                raise ValueError("Cannot have multiple roots.")
 
210
            self._new_root = trans_id
 
211
        if (trans_id in self._limbo_files and
 
212
            trans_id not in self._needs_rename):
 
213
            self._rename_in_limbo([trans_id])
 
214
            self._limbo_children[previous_parent].remove(trans_id)
 
215
            del self._limbo_children_names[previous_parent][previous_name]
 
216
 
 
217
    def _rename_in_limbo(self, trans_ids):
 
218
        """Fix limbo names so that the right final path is produced.
 
219
 
 
220
        This means we outsmarted ourselves-- we tried to avoid renaming
 
221
        these files later by creating them with their final names in their
 
222
        final parents.  But now the previous name or parent is no longer
 
223
        suitable, so we have to rename them.
 
224
 
 
225
        Even for trans_ids that have no new contents, we must remove their
 
226
        entries from _limbo_files, because they are now stale.
 
227
        """
 
228
        for trans_id in trans_ids:
 
229
            old_path = self._limbo_files.pop(trans_id)
 
230
            if trans_id not in self._new_contents:
 
231
                continue
 
232
            new_path = self._limbo_name(trans_id)
 
233
            os.rename(old_path, new_path)
172
234
 
173
235
    def adjust_root_path(self, name, parent):
174
236
        """Emulate moving the root by moving all children, instead.
202
264
        self.version_file(old_root_file_id, old_root)
203
265
        self.unversion_file(self._new_root)
204
266
 
205
 
    def fixup_new_roots(self):
206
 
        """Reinterpret requests to change the root directory
207
 
 
208
 
        Instead of creating a root directory, or moving an existing directory,
209
 
        all the attributes and children of the new root are applied to the
210
 
        existing root directory.
211
 
 
212
 
        This means that the old root trans-id becomes obsolete, so it is
213
 
        recommended only to invoke this after the root trans-id has become
214
 
        irrelevant.
215
 
        """
216
 
        new_roots = [k for k, v in self._new_parent.iteritems() if v is
217
 
                     ROOT_PARENT]
218
 
        if len(new_roots) < 1:
219
 
            return
220
 
        if len(new_roots) != 1:
221
 
            raise ValueError('A tree cannot have two roots!')
222
 
        if self._new_root is None:
223
 
            self._new_root = new_roots[0]
224
 
            return
225
 
        old_new_root = new_roots[0]
226
 
        # TODO: What to do if a old_new_root is present, but self._new_root is
227
 
        #       not listed as being removed? This code explicitly unversions
228
 
        #       the old root and versions it with the new file_id. Though that
229
 
        #       seems like an incomplete delta
230
 
 
231
 
        # unversion the new root's directory.
232
 
        file_id = self.final_file_id(old_new_root)
233
 
        if old_new_root in self._new_id:
234
 
            self.cancel_versioning(old_new_root)
235
 
        else:
236
 
            self.unversion_file(old_new_root)
237
 
        # if, at this stage, root still has an old file_id, zap it so we can
238
 
        # stick a new one in.
239
 
        if (self.tree_file_id(self._new_root) is not None and
240
 
            self._new_root not in self._removed_id):
241
 
            self.unversion_file(self._new_root)
242
 
        self.version_file(file_id, self._new_root)
243
 
 
244
 
        # Now move children of new root into old root directory.
245
 
        # Ensure all children are registered with the transaction, but don't
246
 
        # use directly-- some tree children have new parents
247
 
        list(self.iter_tree_children(old_new_root))
248
 
        # Move all children of new root into old root directory.
249
 
        for child in self.by_parent().get(old_new_root, []):
250
 
            self.adjust_path(self.final_name(child), self._new_root, child)
251
 
 
252
 
        # Ensure old_new_root has no directory.
253
 
        if old_new_root in self._new_contents:
254
 
            self.cancel_creation(old_new_root)
255
 
        else:
256
 
            self.delete_contents(old_new_root)
257
 
 
258
 
        # prevent deletion of root directory.
259
 
        if self._new_root in self._removed_contents:
260
 
            self.cancel_deletion(self._new_root)
261
 
 
262
 
        # destroy path info for old_new_root.
263
 
        del self._new_parent[old_new_root]
264
 
        del self._new_name[old_new_root]
265
 
 
266
267
    def trans_id_tree_file_id(self, inventory_id):
267
268
        """Determine the transaction id of a working tree file.
268
269
 
297
298
            else:
298
299
                return self.trans_id_tree_file_id(file_id)
299
300
 
 
301
    def canonical_path(self, path):
 
302
        """Get the canonical tree-relative path"""
 
303
        # don't follow final symlinks
 
304
        abs = self._tree.abspath(path)
 
305
        if abs in self._relpaths:
 
306
            return self._relpaths[abs]
 
307
        dirname, basename = os.path.split(abs)
 
308
        if dirname not in self._realpaths:
 
309
            self._realpaths[dirname] = os.path.realpath(dirname)
 
310
        dirname = self._realpaths[dirname]
 
311
        abs = pathjoin(dirname, basename)
 
312
        if dirname in self._relpaths:
 
313
            relpath = pathjoin(self._relpaths[dirname], basename)
 
314
            relpath = relpath.rstrip('/\\')
 
315
        else:
 
316
            relpath = self._tree.relpath(abs)
 
317
        self._relpaths[abs] = relpath
 
318
        return relpath
 
319
 
300
320
    def trans_id_tree_path(self, path):
301
321
        """Determine (and maybe set) the transaction ID for a tree path."""
302
322
        path = self.canonical_path(path)
312
332
            return ROOT_PARENT
313
333
        return self.trans_id_tree_path(os.path.dirname(path))
314
334
 
 
335
    def create_file(self, contents, trans_id, mode_id=None):
 
336
        """Schedule creation of a new file.
 
337
 
 
338
        See also new_file.
 
339
 
 
340
        Contents is an iterator of strings, all of which will be written
 
341
        to the target destination.
 
342
 
 
343
        New file takes the permissions of any existing file with that id,
 
344
        unless mode_id is specified.
 
345
        """
 
346
        name = self._limbo_name(trans_id)
 
347
        f = open(name, 'wb')
 
348
        try:
 
349
            try:
 
350
                unique_add(self._new_contents, trans_id, 'file')
 
351
            except:
 
352
                # Clean up the file, it never got registered so
 
353
                # TreeTransform.finalize() won't clean it up.
 
354
                f.close()
 
355
                os.unlink(name)
 
356
                raise
 
357
 
 
358
            f.writelines(contents)
 
359
        finally:
 
360
            f.close()
 
361
        self._set_mode(trans_id, mode_id, S_ISREG)
 
362
 
 
363
    def _set_mode(self, trans_id, mode_id, typefunc):
 
364
        """Set the mode of new file contents.
 
365
        The mode_id is the existing file to get the mode from (often the same
 
366
        as trans_id).  The operation is only performed if there's a mode match
 
367
        according to typefunc.
 
368
        """
 
369
        if mode_id is None:
 
370
            mode_id = trans_id
 
371
        try:
 
372
            old_path = self._tree_id_paths[mode_id]
 
373
        except KeyError:
 
374
            return
 
375
        try:
 
376
            mode = os.stat(self._tree.abspath(old_path)).st_mode
 
377
        except OSError, e:
 
378
            if e.errno in (errno.ENOENT, errno.ENOTDIR):
 
379
                # Either old_path doesn't exist, or the parent of the
 
380
                # target is not a directory (but will be one eventually)
 
381
                # Either way, we know it doesn't exist *right now*
 
382
                # See also bug #248448
 
383
                return
 
384
            else:
 
385
                raise
 
386
        if typefunc(mode):
 
387
            os.chmod(self._limbo_name(trans_id), mode)
 
388
 
 
389
    def create_hardlink(self, path, trans_id):
 
390
        """Schedule creation of a hard link"""
 
391
        name = self._limbo_name(trans_id)
 
392
        try:
 
393
            os.link(path, name)
 
394
        except OSError, e:
 
395
            if e.errno != errno.EPERM:
 
396
                raise
 
397
            raise errors.HardLinkNotSupported(path)
 
398
        try:
 
399
            unique_add(self._new_contents, trans_id, 'file')
 
400
        except:
 
401
            # Clean up the file, it never got registered so
 
402
            # TreeTransform.finalize() won't clean it up.
 
403
            os.unlink(name)
 
404
            raise
 
405
 
 
406
    def create_directory(self, trans_id):
 
407
        """Schedule creation of a new directory.
 
408
 
 
409
        See also new_directory.
 
410
        """
 
411
        os.mkdir(self._limbo_name(trans_id))
 
412
        unique_add(self._new_contents, trans_id, 'directory')
 
413
 
 
414
    def create_symlink(self, target, trans_id):
 
415
        """Schedule creation of a new symbolic link.
 
416
 
 
417
        target is a bytestring.
 
418
        See also new_symlink.
 
419
        """
 
420
        if has_symlinks():
 
421
            os.symlink(target, self._limbo_name(trans_id))
 
422
            unique_add(self._new_contents, trans_id, 'symlink')
 
423
        else:
 
424
            try:
 
425
                path = FinalPaths(self).get_path(trans_id)
 
426
            except KeyError:
 
427
                path = None
 
428
            raise UnableCreateSymlink(path=path)
 
429
 
 
430
    def cancel_creation(self, trans_id):
 
431
        """Cancel the creation of new file contents."""
 
432
        del self._new_contents[trans_id]
 
433
        children = self._limbo_children.get(trans_id)
 
434
        # if this is a limbo directory with children, move them before removing
 
435
        # the directory
 
436
        if children is not None:
 
437
            self._rename_in_limbo(children)
 
438
            del self._limbo_children[trans_id]
 
439
            del self._limbo_children_names[trans_id]
 
440
        delete_any(self._limbo_name(trans_id))
 
441
 
315
442
    def delete_contents(self, trans_id):
316
443
        """Schedule the contents of a path entry for deletion"""
317
 
        # Ensure that the object exists in the WorkingTree, this will raise an
318
 
        # exception if there is a problem
319
444
        self.tree_kind(trans_id)
320
445
        self._removed_contents.add(trans_id)
321
446
 
393
518
        new_ids.update(changed_kind)
394
519
        return sorted(FinalPaths(self).get_paths(new_ids))
395
520
 
 
521
    def tree_kind(self, trans_id):
 
522
        """Determine the file kind in the working tree.
 
523
 
 
524
        Raises NoSuchFile if the file does not exist
 
525
        """
 
526
        path = self._tree_id_paths.get(trans_id)
 
527
        if path is None:
 
528
            raise NoSuchFile(None)
 
529
        try:
 
530
            return file_kind(self._tree.abspath(path))
 
531
        except OSError, e:
 
532
            if e.errno != errno.ENOENT:
 
533
                raise
 
534
            else:
 
535
                raise NoSuchFile(path)
 
536
 
396
537
    def final_kind(self, trans_id):
397
538
        """Determine the final file kind, after any changes applied.
398
539
 
505
646
        conflicts.extend(self._overwrite_conflicts())
506
647
        return conflicts
507
648
 
508
 
    def _check_malformed(self):
509
 
        conflicts = self.find_conflicts()
510
 
        if len(conflicts) != 0:
511
 
            raise MalformedTransform(conflicts=conflicts)
512
 
 
513
649
    def _add_tree_children(self):
514
650
        """Add all the children of all active parents to the known paths.
515
651
 
531
667
            # ensure that all children are registered with the transaction
532
668
            list(self.iter_tree_children(parent_id))
533
669
 
 
670
    def iter_tree_children(self, parent_id):
 
671
        """Iterate through the entry's tree children, if any"""
 
672
        try:
 
673
            path = self._tree_id_paths[parent_id]
 
674
        except KeyError:
 
675
            return
 
676
        try:
 
677
            children = os.listdir(self._tree.abspath(path))
 
678
        except OSError, e:
 
679
            if not (osutils._is_error_enotdir(e)
 
680
                    or e.errno in (errno.ENOENT, errno.ESRCH)):
 
681
                raise
 
682
            return
 
683
 
 
684
        for child in children:
 
685
            childpath = joinpath(path, child)
 
686
            if self._tree.is_control_filename(childpath):
 
687
                continue
 
688
            yield self.trans_id_tree_path(childpath)
 
689
 
534
690
    def has_named_child(self, by_parent, parent_id, name):
535
691
        try:
536
692
            children = by_parent[parent_id]
711
867
            return True
712
868
        return False
713
869
 
 
870
    def _limbo_name(self, trans_id):
 
871
        """Generate the limbo name of a file"""
 
872
        limbo_name = self._limbo_files.get(trans_id)
 
873
        if limbo_name is not None:
 
874
            return limbo_name
 
875
        parent = self._new_parent.get(trans_id)
 
876
        # if the parent directory is already in limbo (e.g. when building a
 
877
        # tree), choose a limbo name inside the parent, to reduce further
 
878
        # renames.
 
879
        use_direct_path = False
 
880
        if self._new_contents.get(parent) == 'directory':
 
881
            filename = self._new_name.get(trans_id)
 
882
            if filename is not None:
 
883
                if parent not in self._limbo_children:
 
884
                    self._limbo_children[parent] = set()
 
885
                    self._limbo_children_names[parent] = {}
 
886
                    use_direct_path = True
 
887
                # the direct path can only be used if no other file has
 
888
                # already taken this pathname, i.e. if the name is unused, or
 
889
                # if it is already associated with this trans_id.
 
890
                elif self._case_sensitive_target:
 
891
                    if (self._limbo_children_names[parent].get(filename)
 
892
                        in (trans_id, None)):
 
893
                        use_direct_path = True
 
894
                else:
 
895
                    for l_filename, l_trans_id in\
 
896
                        self._limbo_children_names[parent].iteritems():
 
897
                        if l_trans_id == trans_id:
 
898
                            continue
 
899
                        if l_filename.lower() == filename.lower():
 
900
                            break
 
901
                    else:
 
902
                        use_direct_path = True
 
903
 
 
904
        if use_direct_path:
 
905
            limbo_name = pathjoin(self._limbo_files[parent], filename)
 
906
            self._limbo_children[parent].add(trans_id)
 
907
            self._limbo_children_names[parent][filename] = trans_id
 
908
        else:
 
909
            limbo_name = pathjoin(self._limbodir, trans_id)
 
910
            self._needs_rename.add(trans_id)
 
911
        self._limbo_files[trans_id] = limbo_name
 
912
        return limbo_name
 
913
 
714
914
    def _set_executability(self, path, trans_id):
715
915
        """Set the executability of versioned files """
716
916
        if supports_executable():
922
1122
    def get_preview_tree(self):
923
1123
        """Return a tree representing the result of the transform.
924
1124
 
925
 
        The tree is a snapshot, and altering the TreeTransform will invalidate
926
 
        it.
 
1125
        This tree only supports the subset of Tree functionality required
 
1126
        by show_diff_trees.  It must only be compared to tt._tree.
927
1127
        """
928
1128
        return _PreviewTree(self)
929
1129
 
930
 
    def commit(self, branch, message, merge_parents=None, strict=False):
931
 
        """Commit the result of this TreeTransform to a branch.
932
 
 
933
 
        :param branch: The branch to commit to.
934
 
        :param message: The message to attach to the commit.
935
 
        :param merge_parents: Additional parents specified by pending merges.
936
 
        :return: The revision_id of the revision committed.
937
 
        """
938
 
        self._check_malformed()
939
 
        if strict:
940
 
            unversioned = set(self._new_contents).difference(set(self._new_id))
941
 
            for trans_id in unversioned:
942
 
                if self.final_file_id(trans_id) is None:
943
 
                    raise errors.StrictCommitFailed()
944
 
 
945
 
        revno, last_rev_id = branch.last_revision_info()
946
 
        if last_rev_id == _mod_revision.NULL_REVISION:
947
 
            if merge_parents is not None:
948
 
                raise ValueError('Cannot supply merge parents for first'
949
 
                                 ' commit.')
950
 
            parent_ids = []
951
 
        else:
952
 
            parent_ids = [last_rev_id]
953
 
            if merge_parents is not None:
954
 
                parent_ids.extend(merge_parents)
955
 
        if self._tree.get_revision_id() != last_rev_id:
956
 
            raise ValueError('TreeTransform not based on branch basis: %s' %
957
 
                             self._tree.get_revision_id())
958
 
        builder = branch.get_commit_builder(parent_ids)
959
 
        preview = self.get_preview_tree()
960
 
        list(builder.record_iter_changes(preview, last_rev_id,
961
 
                                         self.iter_changes()))
962
 
        builder.finish_inventory()
963
 
        revision_id = builder.commit(message)
964
 
        branch.set_last_revision_info(revno + 1, revision_id)
965
 
        return revision_id
966
 
 
967
1130
    def _text_parent(self, trans_id):
968
1131
        file_id = self.tree_file_id(trans_id)
969
1132
        try:
1013
1176
                                      (('attribs',),))
1014
1177
        for trans_id, kind in self._new_contents.items():
1015
1178
            if kind == 'file':
1016
 
                lines = osutils.chunks_to_lines(
1017
 
                    self._read_file_chunks(trans_id))
 
1179
                cur_file = open(self._limbo_name(trans_id), 'rb')
 
1180
                try:
 
1181
                    lines = osutils.chunks_to_lines(cur_file.readlines())
 
1182
                finally:
 
1183
                    cur_file.close()
1018
1184
                parents = self._get_parents_lines(trans_id)
1019
1185
                mpdiff = multiparent.MultiParent.from_lines(lines, parents)
1020
1186
                content = ''.join(mpdiff.to_patch())
1021
1187
            if kind == 'directory':
1022
1188
                content = ''
1023
1189
            if kind == 'symlink':
1024
 
                content = self._read_symlink_target(trans_id)
 
1190
                content = os.readlink(self._limbo_name(trans_id))
1025
1191
            yield serializer.bytes_record(content, ((trans_id, kind),))
1026
1192
 
 
1193
 
1027
1194
    def deserialize(self, records):
1028
1195
        """Deserialize a stored TreeTransform.
1029
1196
 
1060
1227
                self.create_symlink(content.decode('utf-8'), trans_id)
1061
1228
 
1062
1229
 
1063
 
class DiskTreeTransform(TreeTransformBase):
1064
 
    """Tree transform storing its contents on disk."""
1065
 
 
1066
 
    def __init__(self, tree, limbodir, pb=None,
1067
 
                 case_sensitive=True):
1068
 
        """Constructor.
1069
 
        :param tree: The tree that will be transformed, but not necessarily
1070
 
            the output tree.
1071
 
        :param limbodir: A directory where new files can be stored until
1072
 
            they are installed in their proper places
1073
 
        :param pb: ignored
1074
 
        :param case_sensitive: If True, the target of the transform is
1075
 
            case sensitive, not just case preserving.
1076
 
        """
1077
 
        TreeTransformBase.__init__(self, tree, pb, case_sensitive)
1078
 
        self._limbodir = limbodir
1079
 
        self._deletiondir = None
1080
 
        # A mapping of transform ids to their limbo filename
1081
 
        self._limbo_files = {}
1082
 
        # A mapping of transform ids to a set of the transform ids of children
1083
 
        # that their limbo directory has
1084
 
        self._limbo_children = {}
1085
 
        # Map transform ids to maps of child filename to child transform id
1086
 
        self._limbo_children_names = {}
1087
 
        # List of transform ids that need to be renamed from limbo into place
1088
 
        self._needs_rename = set()
1089
 
        self._creation_mtime = None
1090
 
 
1091
 
    def finalize(self):
1092
 
        """Release the working tree lock, if held, clean up limbo dir.
1093
 
 
1094
 
        This is required if apply has not been invoked, but can be invoked
1095
 
        even after apply.
1096
 
        """
1097
 
        if self._tree is None:
1098
 
            return
1099
 
        try:
1100
 
            entries = [(self._limbo_name(t), t, k) for t, k in
1101
 
                       self._new_contents.iteritems()]
1102
 
            entries.sort(reverse=True)
1103
 
            for path, trans_id, kind in entries:
1104
 
                delete_any(path)
1105
 
            try:
1106
 
                delete_any(self._limbodir)
1107
 
            except OSError:
1108
 
                # We don't especially care *why* the dir is immortal.
1109
 
                raise ImmortalLimbo(self._limbodir)
1110
 
            try:
1111
 
                if self._deletiondir is not None:
1112
 
                    delete_any(self._deletiondir)
1113
 
            except OSError:
1114
 
                raise errors.ImmortalPendingDeletion(self._deletiondir)
1115
 
        finally:
1116
 
            TreeTransformBase.finalize(self)
1117
 
 
1118
 
    def _limbo_name(self, trans_id):
1119
 
        """Generate the limbo name of a file"""
1120
 
        limbo_name = self._limbo_files.get(trans_id)
1121
 
        if limbo_name is None:
1122
 
            limbo_name = self._generate_limbo_path(trans_id)
1123
 
            self._limbo_files[trans_id] = limbo_name
1124
 
        return limbo_name
1125
 
 
1126
 
    def _generate_limbo_path(self, trans_id):
1127
 
        """Generate a limbo path using the trans_id as the relative path.
1128
 
 
1129
 
        This is suitable as a fallback, and when the transform should not be
1130
 
        sensitive to the path encoding of the limbo directory.
1131
 
        """
1132
 
        self._needs_rename.add(trans_id)
1133
 
        return pathjoin(self._limbodir, trans_id)
1134
 
 
1135
 
    def adjust_path(self, name, parent, trans_id):
1136
 
        previous_parent = self._new_parent.get(trans_id)
1137
 
        previous_name = self._new_name.get(trans_id)
1138
 
        TreeTransformBase.adjust_path(self, name, parent, trans_id)
1139
 
        if (trans_id in self._limbo_files and
1140
 
            trans_id not in self._needs_rename):
1141
 
            self._rename_in_limbo([trans_id])
1142
 
            if previous_parent != parent:
1143
 
                self._limbo_children[previous_parent].remove(trans_id)
1144
 
            if previous_parent != parent or previous_name != name:
1145
 
                del self._limbo_children_names[previous_parent][previous_name]
1146
 
 
1147
 
    def _rename_in_limbo(self, trans_ids):
1148
 
        """Fix limbo names so that the right final path is produced.
1149
 
 
1150
 
        This means we outsmarted ourselves-- we tried to avoid renaming
1151
 
        these files later by creating them with their final names in their
1152
 
        final parents.  But now the previous name or parent is no longer
1153
 
        suitable, so we have to rename them.
1154
 
 
1155
 
        Even for trans_ids that have no new contents, we must remove their
1156
 
        entries from _limbo_files, because they are now stale.
1157
 
        """
1158
 
        for trans_id in trans_ids:
1159
 
            old_path = self._limbo_files.pop(trans_id)
1160
 
            if trans_id not in self._new_contents:
1161
 
                continue
1162
 
            new_path = self._limbo_name(trans_id)
1163
 
            osutils.rename(old_path, new_path)
1164
 
            for descendant in self._limbo_descendants(trans_id):
1165
 
                desc_path = self._limbo_files[descendant]
1166
 
                desc_path = new_path + desc_path[len(old_path):]
1167
 
                self._limbo_files[descendant] = desc_path
1168
 
 
1169
 
    def _limbo_descendants(self, trans_id):
1170
 
        """Return the set of trans_ids whose limbo paths descend from this."""
1171
 
        descendants = set(self._limbo_children.get(trans_id, []))
1172
 
        for descendant in list(descendants):
1173
 
            descendants.update(self._limbo_descendants(descendant))
1174
 
        return descendants
1175
 
 
1176
 
    def create_file(self, contents, trans_id, mode_id=None):
1177
 
        """Schedule creation of a new file.
1178
 
 
1179
 
        See also new_file.
1180
 
 
1181
 
        Contents is an iterator of strings, all of which will be written
1182
 
        to the target destination.
1183
 
 
1184
 
        New file takes the permissions of any existing file with that id,
1185
 
        unless mode_id is specified.
1186
 
        """
1187
 
        name = self._limbo_name(trans_id)
1188
 
        f = open(name, 'wb')
1189
 
        try:
1190
 
            try:
1191
 
                unique_add(self._new_contents, trans_id, 'file')
1192
 
            except:
1193
 
                # Clean up the file, it never got registered so
1194
 
                # TreeTransform.finalize() won't clean it up.
1195
 
                f.close()
1196
 
                os.unlink(name)
1197
 
                raise
1198
 
 
1199
 
            f.writelines(contents)
1200
 
        finally:
1201
 
            f.close()
1202
 
        self._set_mtime(name)
1203
 
        self._set_mode(trans_id, mode_id, S_ISREG)
1204
 
 
1205
 
    def _read_file_chunks(self, trans_id):
1206
 
        cur_file = open(self._limbo_name(trans_id), 'rb')
1207
 
        try:
1208
 
            return cur_file.readlines()
1209
 
        finally:
1210
 
            cur_file.close()
1211
 
 
1212
 
    def _read_symlink_target(self, trans_id):
1213
 
        return os.readlink(self._limbo_name(trans_id))
1214
 
 
1215
 
    def _set_mtime(self, path):
1216
 
        """All files that are created get the same mtime.
1217
 
 
1218
 
        This time is set by the first object to be created.
1219
 
        """
1220
 
        if self._creation_mtime is None:
1221
 
            self._creation_mtime = time.time()
1222
 
        os.utime(path, (self._creation_mtime, self._creation_mtime))
1223
 
 
1224
 
    def create_hardlink(self, path, trans_id):
1225
 
        """Schedule creation of a hard link"""
1226
 
        name = self._limbo_name(trans_id)
1227
 
        try:
1228
 
            os.link(path, name)
1229
 
        except OSError, e:
1230
 
            if e.errno != errno.EPERM:
1231
 
                raise
1232
 
            raise errors.HardLinkNotSupported(path)
1233
 
        try:
1234
 
            unique_add(self._new_contents, trans_id, 'file')
1235
 
        except:
1236
 
            # Clean up the file, it never got registered so
1237
 
            # TreeTransform.finalize() won't clean it up.
1238
 
            os.unlink(name)
1239
 
            raise
1240
 
 
1241
 
    def create_directory(self, trans_id):
1242
 
        """Schedule creation of a new directory.
1243
 
 
1244
 
        See also new_directory.
1245
 
        """
1246
 
        os.mkdir(self._limbo_name(trans_id))
1247
 
        unique_add(self._new_contents, trans_id, 'directory')
1248
 
 
1249
 
    def create_symlink(self, target, trans_id):
1250
 
        """Schedule creation of a new symbolic link.
1251
 
 
1252
 
        target is a bytestring.
1253
 
        See also new_symlink.
1254
 
        """
1255
 
        if has_symlinks():
1256
 
            os.symlink(target, self._limbo_name(trans_id))
1257
 
            unique_add(self._new_contents, trans_id, 'symlink')
1258
 
        else:
1259
 
            try:
1260
 
                path = FinalPaths(self).get_path(trans_id)
1261
 
            except KeyError:
1262
 
                path = None
1263
 
            raise UnableCreateSymlink(path=path)
1264
 
 
1265
 
    def cancel_creation(self, trans_id):
1266
 
        """Cancel the creation of new file contents."""
1267
 
        del self._new_contents[trans_id]
1268
 
        children = self._limbo_children.get(trans_id)
1269
 
        # if this is a limbo directory with children, move them before removing
1270
 
        # the directory
1271
 
        if children is not None:
1272
 
            self._rename_in_limbo(children)
1273
 
            del self._limbo_children[trans_id]
1274
 
            del self._limbo_children_names[trans_id]
1275
 
        delete_any(self._limbo_name(trans_id))
1276
 
 
1277
 
 
1278
 
class TreeTransform(DiskTreeTransform):
 
1230
class TreeTransform(TreeTransformBase):
1279
1231
    """Represent a tree transformation.
1280
1232
 
1281
1233
    This object is designed to support incremental generation of the transform,
1340
1292
    FileMover does not delete files until it is sure that a rollback will not
1341
1293
    happen.
1342
1294
    """
1343
 
    def __init__(self, tree, pb=None):
 
1295
    def __init__(self, tree, pb=DummyProgress()):
1344
1296
        """Note: a tree_write lock is taken on the tree.
1345
1297
 
1346
1298
        Use TreeTransform.finalize() to release the lock (can be omitted if
1367
1319
            tree.unlock()
1368
1320
            raise
1369
1321
 
1370
 
        # Cache of realpath results, to speed up canonical_path
1371
 
        self._realpaths = {}
1372
 
        # Cache of relpath results, to speed up canonical_path
1373
 
        self._relpaths = {}
1374
 
        DiskTreeTransform.__init__(self, tree, limbodir, pb,
 
1322
        TreeTransformBase.__init__(self, tree, limbodir, pb,
1375
1323
                                   tree.case_sensitive)
1376
1324
        self._deletiondir = deletiondir
1377
1325
 
1378
 
    def canonical_path(self, path):
1379
 
        """Get the canonical tree-relative path"""
1380
 
        # don't follow final symlinks
1381
 
        abs = self._tree.abspath(path)
1382
 
        if abs in self._relpaths:
1383
 
            return self._relpaths[abs]
1384
 
        dirname, basename = os.path.split(abs)
1385
 
        if dirname not in self._realpaths:
1386
 
            self._realpaths[dirname] = os.path.realpath(dirname)
1387
 
        dirname = self._realpaths[dirname]
1388
 
        abs = pathjoin(dirname, basename)
1389
 
        if dirname in self._relpaths:
1390
 
            relpath = pathjoin(self._relpaths[dirname], basename)
1391
 
            relpath = relpath.rstrip('/\\')
1392
 
        else:
1393
 
            relpath = self._tree.relpath(abs)
1394
 
        self._relpaths[abs] = relpath
1395
 
        return relpath
1396
 
 
1397
 
    def tree_kind(self, trans_id):
1398
 
        """Determine the file kind in the working tree.
1399
 
 
1400
 
        Raises NoSuchFile if the file does not exist
1401
 
        """
1402
 
        path = self._tree_id_paths.get(trans_id)
1403
 
        if path is None:
1404
 
            raise NoSuchFile(None)
1405
 
        try:
1406
 
            return file_kind(self._tree.abspath(path))
1407
 
        except OSError, e:
1408
 
            if e.errno != errno.ENOENT:
1409
 
                raise
1410
 
            else:
1411
 
                raise NoSuchFile(path)
1412
 
 
1413
 
    def _set_mode(self, trans_id, mode_id, typefunc):
1414
 
        """Set the mode of new file contents.
1415
 
        The mode_id is the existing file to get the mode from (often the same
1416
 
        as trans_id).  The operation is only performed if there's a mode match
1417
 
        according to typefunc.
1418
 
        """
1419
 
        if mode_id is None:
1420
 
            mode_id = trans_id
1421
 
        try:
1422
 
            old_path = self._tree_id_paths[mode_id]
1423
 
        except KeyError:
1424
 
            return
1425
 
        try:
1426
 
            mode = os.stat(self._tree.abspath(old_path)).st_mode
1427
 
        except OSError, e:
1428
 
            if e.errno in (errno.ENOENT, errno.ENOTDIR):
1429
 
                # Either old_path doesn't exist, or the parent of the
1430
 
                # target is not a directory (but will be one eventually)
1431
 
                # Either way, we know it doesn't exist *right now*
1432
 
                # See also bug #248448
1433
 
                return
1434
 
            else:
1435
 
                raise
1436
 
        if typefunc(mode):
1437
 
            os.chmod(self._limbo_name(trans_id), mode)
1438
 
 
1439
 
    def iter_tree_children(self, parent_id):
1440
 
        """Iterate through the entry's tree children, if any"""
1441
 
        try:
1442
 
            path = self._tree_id_paths[parent_id]
1443
 
        except KeyError:
1444
 
            return
1445
 
        try:
1446
 
            children = os.listdir(self._tree.abspath(path))
1447
 
        except OSError, e:
1448
 
            if not (osutils._is_error_enotdir(e)
1449
 
                    or e.errno in (errno.ENOENT, errno.ESRCH)):
1450
 
                raise
1451
 
            return
1452
 
 
1453
 
        for child in children:
1454
 
            childpath = joinpath(path, child)
1455
 
            if self._tree.is_control_filename(childpath):
1456
 
                continue
1457
 
            yield self.trans_id_tree_path(childpath)
1458
 
 
1459
 
    def _generate_limbo_path(self, trans_id):
1460
 
        """Generate a limbo path using the final path if possible.
1461
 
 
1462
 
        This optimizes the performance of applying the tree transform by
1463
 
        avoiding renames.  These renames can be avoided only when the parent
1464
 
        directory is already scheduled for creation.
1465
 
 
1466
 
        If the final path cannot be used, falls back to using the trans_id as
1467
 
        the relpath.
1468
 
        """
1469
 
        parent = self._new_parent.get(trans_id)
1470
 
        # if the parent directory is already in limbo (e.g. when building a
1471
 
        # tree), choose a limbo name inside the parent, to reduce further
1472
 
        # renames.
1473
 
        use_direct_path = False
1474
 
        if self._new_contents.get(parent) == 'directory':
1475
 
            filename = self._new_name.get(trans_id)
1476
 
            if filename is not None:
1477
 
                if parent not in self._limbo_children:
1478
 
                    self._limbo_children[parent] = set()
1479
 
                    self._limbo_children_names[parent] = {}
1480
 
                    use_direct_path = True
1481
 
                # the direct path can only be used if no other file has
1482
 
                # already taken this pathname, i.e. if the name is unused, or
1483
 
                # if it is already associated with this trans_id.
1484
 
                elif self._case_sensitive_target:
1485
 
                    if (self._limbo_children_names[parent].get(filename)
1486
 
                        in (trans_id, None)):
1487
 
                        use_direct_path = True
1488
 
                else:
1489
 
                    for l_filename, l_trans_id in\
1490
 
                        self._limbo_children_names[parent].iteritems():
1491
 
                        if l_trans_id == trans_id:
1492
 
                            continue
1493
 
                        if l_filename.lower() == filename.lower():
1494
 
                            break
1495
 
                    else:
1496
 
                        use_direct_path = True
1497
 
 
1498
 
        if not use_direct_path:
1499
 
            return DiskTreeTransform._generate_limbo_path(self, trans_id)
1500
 
 
1501
 
        limbo_name = pathjoin(self._limbo_files[parent], filename)
1502
 
        self._limbo_children[parent].add(trans_id)
1503
 
        self._limbo_children_names[parent][filename] = trans_id
1504
 
        return limbo_name
1505
 
 
1506
 
 
1507
1326
    def apply(self, no_conflicts=False, precomputed_delta=None, _mover=None):
1508
1327
        """Apply all changes to the inventory and filesystem.
1509
1328
 
1519
1338
        :param _mover: Supply an alternate FileMover, for testing
1520
1339
        """
1521
1340
        if not no_conflicts:
1522
 
            self._check_malformed()
 
1341
            conflicts = self.find_conflicts()
 
1342
            if len(conflicts) != 0:
 
1343
                raise MalformedTransform(conflicts=conflicts)
1523
1344
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1524
1345
        try:
1525
1346
            if precomputed_delta is None:
1629
1450
                child_pb.update('removing file', num, len(tree_paths))
1630
1451
                full_path = self._tree.abspath(path)
1631
1452
                if trans_id in self._removed_contents:
1632
 
                    delete_path = os.path.join(self._deletiondir, trans_id)
1633
 
                    mover.pre_delete(full_path, delete_path)
1634
 
                elif (trans_id in self._new_name
1635
 
                      or trans_id in self._new_parent):
 
1453
                    mover.pre_delete(full_path, os.path.join(self._deletiondir,
 
1454
                                     trans_id))
 
1455
                elif trans_id in self._new_name or trans_id in \
 
1456
                    self._new_parent:
1636
1457
                    try:
1637
1458
                        mover.rename(full_path, self._limbo_name(trans_id))
1638
1459
                    except OSError, e:
1684
1505
        return modified_paths
1685
1506
 
1686
1507
 
1687
 
class TransformPreview(DiskTreeTransform):
 
1508
class TransformPreview(TreeTransformBase):
1688
1509
    """A TreeTransform for generating preview trees.
1689
1510
 
1690
1511
    Unlike TreeTransform, this version works when the input tree is a
1692
1513
    unversioned files in the input tree.
1693
1514
    """
1694
1515
 
1695
 
    def __init__(self, tree, pb=None, case_sensitive=True):
 
1516
    def __init__(self, tree, pb=DummyProgress(), case_sensitive=True):
1696
1517
        tree.lock_read()
1697
1518
        limbodir = osutils.mkdtemp(prefix='bzr-limbo-')
1698
 
        DiskTreeTransform.__init__(self, tree, limbodir, pb, case_sensitive)
 
1519
        TreeTransformBase.__init__(self, tree, limbodir, pb, case_sensitive)
1699
1520
 
1700
1521
    def canonical_path(self, path):
1701
1522
        return path
1743
1564
        self._all_children_cache = {}
1744
1565
        self._path2trans_id_cache = {}
1745
1566
        self._final_name_cache = {}
1746
 
        self._iter_changes_cache = dict((c[0], c) for c in
1747
 
                                        self._transform.iter_changes())
 
1567
 
 
1568
    def _changes(self, file_id):
 
1569
        for changes in self._transform.iter_changes():
 
1570
            if changes[0] == file_id:
 
1571
                return changes
1748
1572
 
1749
1573
    def _content_change(self, file_id):
1750
1574
        """Return True if the content of this file changed"""
1751
 
        changes = self._iter_changes_cache.get(file_id)
 
1575
        changes = self._changes(file_id)
1752
1576
        # changes[2] is true if the file content changed.  See
1753
1577
        # InterTree.iter_changes.
1754
1578
        return (changes is not None and changes[2])
1823
1647
    def __iter__(self):
1824
1648
        return iter(self.all_file_ids())
1825
1649
 
1826
 
    def _has_id(self, file_id, fallback_check):
 
1650
    def has_id(self, file_id):
1827
1651
        if file_id in self._transform._r_new_id:
1828
1652
            return True
1829
1653
        elif file_id in set([self._transform.tree_file_id(trans_id) for
1830
1654
            trans_id in self._transform._removed_id]):
1831
1655
            return False
1832
1656
        else:
1833
 
            return fallback_check(file_id)
1834
 
 
1835
 
    def has_id(self, file_id):
1836
 
        return self._has_id(file_id, self._transform._tree.has_id)
1837
 
 
1838
 
    def has_or_had_id(self, file_id):
1839
 
        return self._has_id(file_id, self._transform._tree.has_or_had_id)
 
1657
            return self._transform._tree.has_id(file_id)
1840
1658
 
1841
1659
    def _path2trans_id(self, path):
1842
1660
        # We must not use None here, because that is a valid value to store.
1895
1713
            if self._transform.final_file_id(trans_id) is None:
1896
1714
                yield self._final_paths._determine_path(trans_id)
1897
1715
 
1898
 
    def _make_inv_entries(self, ordered_entries, specific_file_ids=None,
1899
 
        yield_parents=False):
 
1716
    def _make_inv_entries(self, ordered_entries, specific_file_ids):
1900
1717
        for trans_id, parent_file_id in ordered_entries:
1901
1718
            file_id = self._transform.final_file_id(trans_id)
1902
1719
            if file_id is None:
1928
1745
                ordered_ids.append((trans_id, parent_file_id))
1929
1746
        return ordered_ids
1930
1747
 
1931
 
    def iter_entries_by_dir(self, specific_file_ids=None, yield_parents=False):
 
1748
    def iter_entries_by_dir(self, specific_file_ids=None):
1932
1749
        # This may not be a maximally efficient implementation, but it is
1933
1750
        # reasonably straightforward.  An implementation that grafts the
1934
1751
        # TreeTransform changes onto the tree's iter_entries_by_dir results
1936
1753
        # position.
1937
1754
        ordered_ids = self._list_files_by_dir()
1938
1755
        for entry, trans_id in self._make_inv_entries(ordered_ids,
1939
 
            specific_file_ids, yield_parents=yield_parents):
1940
 
            yield unicode(self._final_paths.get_path(trans_id)), entry
1941
 
 
1942
 
    def _iter_entries_for_dir(self, dir_path):
1943
 
        """Return path, entry for items in a directory without recursing down."""
1944
 
        dir_file_id = self.path2id(dir_path)
1945
 
        ordered_ids = []
1946
 
        for file_id in self.iter_children(dir_file_id):
1947
 
            trans_id = self._transform.trans_id_file_id(file_id)
1948
 
            ordered_ids.append((trans_id, file_id))
1949
 
        for entry, trans_id in self._make_inv_entries(ordered_ids):
1950
 
            yield unicode(self._final_paths.get_path(trans_id)), entry
1951
 
 
1952
 
    def list_files(self, include_root=False, from_dir=None, recursive=True):
1953
 
        """See WorkingTree.list_files."""
 
1756
                                                      specific_file_ids):
 
1757
            yield unicode(self._final_paths.get_path(trans_id)), entry
 
1758
 
 
1759
    def list_files(self, include_root=False):
 
1760
        """See Tree.list_files."""
1954
1761
        # XXX This should behave like WorkingTree.list_files, but is really
1955
1762
        # more like RevisionTree.list_files.
1956
 
        if recursive:
1957
 
            prefix = None
1958
 
            if from_dir:
1959
 
                prefix = from_dir + '/'
1960
 
            entries = self.iter_entries_by_dir()
1961
 
            for path, entry in entries:
1962
 
                if entry.name == '' and not include_root:
1963
 
                    continue
1964
 
                if prefix:
1965
 
                    if not path.startswith(prefix):
1966
 
                        continue
1967
 
                    path = path[len(prefix):]
1968
 
                yield path, 'V', entry.kind, entry.file_id, entry
1969
 
        else:
1970
 
            if from_dir is None and include_root is True:
1971
 
                root_entry = inventory.make_entry('directory', '',
1972
 
                    ROOT_PARENT, self.get_root_id())
1973
 
                yield '', 'V', 'directory', root_entry.file_id, root_entry
1974
 
            entries = self._iter_entries_for_dir(from_dir or '')
1975
 
            for path, entry in entries:
1976
 
                yield path, 'V', entry.kind, entry.file_id, entry
 
1763
        for path, entry in self.iter_entries_by_dir():
 
1764
            if entry.name == '' and not include_root:
 
1765
                continue
 
1766
            yield path, 'V', entry.kind, entry.file_id, entry
1977
1767
 
1978
1768
    def kind(self, file_id):
1979
1769
        trans_id = self._transform.trans_id_file_id(file_id)
1989
1779
    def get_file_mtime(self, file_id, path=None):
1990
1780
        """See Tree.get_file_mtime"""
1991
1781
        if not self._content_change(file_id):
1992
 
            return self._transform._tree.get_file_mtime(file_id)
 
1782
            return self._transform._tree.get_file_mtime(file_id, path)
1993
1783
        return self._stat_limbo_file(file_id).st_mtime
1994
1784
 
1995
1785
    def _file_size(self, entry, stat_value):
2049
1839
                statval = os.lstat(limbo_name)
2050
1840
                size = statval.st_size
2051
1841
                if not supports_executable():
2052
 
                    executable = False
 
1842
                    executable = None
2053
1843
                else:
2054
1844
                    executable = statval.st_mode & S_IEXEC
2055
1845
            else:
2057
1847
                executable = None
2058
1848
            if kind == 'symlink':
2059
1849
                link_or_sha1 = os.readlink(limbo_name).decode(osutils._fs_enc)
2060
 
        executable = tt._new_executability.get(trans_id, executable)
 
1850
        if supports_executable():
 
1851
            executable = tt._new_executability.get(trans_id, executable)
2061
1852
        return kind, size, executable, link_or_sha1
2062
1853
 
2063
1854
    def iter_changes(self, from_tree, include_unchanged=False,
2089
1880
        name = self._transform._limbo_name(trans_id)
2090
1881
        return open(name, 'rb')
2091
1882
 
2092
 
    def get_file_with_stat(self, file_id, path=None):
2093
 
        return self.get_file(file_id, path), None
2094
 
 
2095
1883
    def annotate_iter(self, file_id,
2096
1884
                      default_revision=_mod_revision.CURRENT_REVISION):
2097
 
        changes = self._iter_changes_cache.get(file_id)
 
1885
        changes = self._changes(file_id)
2098
1886
        if changes is None:
2099
1887
            get_old = True
2100
1888
        else:
2112
1900
            return old_annotation
2113
1901
        if not changed_content:
2114
1902
            return old_annotation
2115
 
        # TODO: This is doing something similar to what WT.annotate_iter is
2116
 
        #       doing, however it fails slightly because it doesn't know what
2117
 
        #       the *other* revision_id is, so it doesn't know how to give the
2118
 
        #       other as the origin for some lines, they all get
2119
 
        #       'default_revision'
2120
 
        #       It would be nice to be able to use the new Annotator based
2121
 
        #       approach, as well.
2122
1903
        return annotate.reannotate([old_annotation],
2123
1904
                                   self.get_file(file_id).readlines(),
2124
1905
                                   default_revision)
2129
1910
            return self._transform._tree.get_symlink_target(file_id)
2130
1911
        trans_id = self._transform.trans_id_file_id(file_id)
2131
1912
        name = self._transform._limbo_name(trans_id)
2132
 
        return osutils.readlink(name)
 
1913
        return os.readlink(name)
2133
1914
 
2134
1915
    def walkdirs(self, prefix=''):
2135
1916
        pending = [self._transform.root]
2190
1971
        self.transform = transform
2191
1972
 
2192
1973
    def _determine_path(self, trans_id):
2193
 
        if (trans_id == self.transform.root or trans_id == ROOT_PARENT):
 
1974
        if trans_id == self.transform.root:
2194
1975
            return ""
2195
1976
        name = self.transform.final_name(trans_id)
2196
1977
        parent_id = self.transform.final_parent(trans_id)
2376
2157
        new_desired_files = desired_files
2377
2158
    else:
2378
2159
        iter = accelerator_tree.iter_changes(tree, include_unchanged=True)
2379
 
        unchanged = [(f, p[1]) for (f, p, c, v, d, n, k, e)
2380
 
                     in iter if not (c or e[0] != e[1])]
2381
 
        if accelerator_tree.supports_content_filtering():
2382
 
            unchanged = [(f, p) for (f, p) in unchanged
2383
 
                         if not accelerator_tree.iter_search_rules([p]).next()]
2384
 
        unchanged = dict(unchanged)
 
2160
        unchanged = dict((f, p[1]) for (f, p, c, v, d, n, k, e)
 
2161
                         in iter if not (c or e[0] != e[1]))
2385
2162
        new_desired_files = []
2386
2163
        count = 0
2387
2164
        for file_id, (trans_id, tree_path) in desired_files:
2510
2287
        tt.create_directory(trans_id)
2511
2288
 
2512
2289
 
2513
 
def create_from_tree(tt, trans_id, tree, file_id, bytes=None,
2514
 
    filter_tree_path=None):
2515
 
    """Create new file contents according to tree contents.
2516
 
    
2517
 
    :param filter_tree_path: the tree path to use to lookup
2518
 
      content filters to apply to the bytes output in the working tree.
2519
 
      This only applies if the working tree supports content filtering.
2520
 
    """
 
2290
def create_from_tree(tt, trans_id, tree, file_id, bytes=None):
 
2291
    """Create new file contents according to tree contents."""
2521
2292
    kind = tree.kind(file_id)
2522
2293
    if kind == 'directory':
2523
2294
        tt.create_directory(trans_id)
2528
2299
                bytes = tree_file.readlines()
2529
2300
            finally:
2530
2301
                tree_file.close()
2531
 
        wt = tt._tree
2532
 
        if wt.supports_content_filtering() and filter_tree_path is not None:
2533
 
            filters = wt._content_filter_stack(filter_tree_path)
2534
 
            bytes = filtered_output_bytes(bytes, filters,
2535
 
                ContentFilterContext(filter_tree_path, tree))
2536
2302
        tt.create_file(bytes, trans_id)
2537
2303
    elif kind == "symlink":
2538
2304
        tt.create_symlink(tree.get_symlink_target(file_id), trans_id)
2590
2356
 
2591
2357
 
2592
2358
def revert(working_tree, target_tree, filenames, backups=False,
2593
 
           pb=None, change_reporter=None):
 
2359
           pb=DummyProgress(), change_reporter=None):
2594
2360
    """Revert a working tree's contents to those of a target tree."""
2595
2361
    target_tree.lock_read()
2596
 
    pb = ui.ui_factory.nested_progress_bar()
2597
2362
    tt = TreeTransform(working_tree, pb)
2598
2363
    try:
2599
2364
        pp = ProgressPhase("Revert phase", 3, pb)
2618
2383
def _prepare_revert_transform(working_tree, target_tree, tt, filenames,
2619
2384
                              backups, pp, basis_tree=None,
2620
2385
                              merge_modified=None):
 
2386
    pp.next_phase()
2621
2387
    child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2622
2388
    try:
2623
2389
        if merge_modified is None:
2627
2393
                                      merge_modified, basis_tree)
2628
2394
    finally:
2629
2395
        child_pb.finished()
 
2396
    pp.next_phase()
2630
2397
    child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2631
2398
    try:
2632
2399
        raw_conflicts = resolve_conflicts(tt, child_pb,
2725
2492
                    parent_trans = ROOT_PARENT
2726
2493
                else:
2727
2494
                    parent_trans = tt.trans_id_file_id(parent[1])
2728
 
                if parent[0] is None and versioned[0]:
2729
 
                    tt.adjust_root_path(name[1], parent_trans)
2730
 
                else:
2731
 
                    tt.adjust_path(name[1], parent_trans, trans_id)
 
2495
                tt.adjust_path(name[1], parent_trans, trans_id)
2732
2496
            if executable[0] != executable[1] and kind[1] == "file":
2733
2497
                tt.set_executability(executable[1], trans_id)
2734
 
        if working_tree.supports_content_filtering():
2735
 
            for index, ((trans_id, mode_id), bytes) in enumerate(
2736
 
                target_tree.iter_files_bytes(deferred_files)):
2737
 
                file_id = deferred_files[index][0]
2738
 
                # We're reverting a tree to the target tree so using the
2739
 
                # target tree to find the file path seems the best choice
2740
 
                # here IMO - Ian C 27/Oct/2009
2741
 
                filter_tree_path = target_tree.id2path(file_id)
2742
 
                filters = working_tree._content_filter_stack(filter_tree_path)
2743
 
                bytes = filtered_output_bytes(bytes, filters,
2744
 
                    ContentFilterContext(filter_tree_path, working_tree))
2745
 
                tt.create_file(bytes, trans_id, mode_id)
2746
 
        else:
2747
 
            for (trans_id, mode_id), bytes in target_tree.iter_files_bytes(
2748
 
                deferred_files):
2749
 
                tt.create_file(bytes, trans_id, mode_id)
2750
 
        tt.fixup_new_roots()
 
2498
        for (trans_id, mode_id), bytes in target_tree.iter_files_bytes(
 
2499
            deferred_files):
 
2500
            tt.create_file(bytes, trans_id, mode_id)
2751
2501
    finally:
2752
2502
        if basis_tree is not None:
2753
2503
            basis_tree.unlock()
2754
2504
    return merge_modified
2755
2505
 
2756
2506
 
2757
 
def resolve_conflicts(tt, pb=None, pass_func=None):
 
2507
def resolve_conflicts(tt, pb=DummyProgress(), pass_func=None):
2758
2508
    """Make many conflict-resolution attempts, but die if they fail"""
2759
2509
    if pass_func is None:
2760
2510
        pass_func = conflict_pass
2761
2511
    new_conflicts = set()
2762
 
    pb = ui.ui_factory.nested_progress_bar()
2763
2512
    try:
2764
2513
        for n in range(10):
2765
2514
            pb.update('Resolution pass', n+1, 10)
2769
2518
            new_conflicts.update(pass_func(tt, conflicts))
2770
2519
        raise MalformedTransform(conflicts=conflicts)
2771
2520
    finally:
2772
 
        pb.finished()
 
2521
        pb.clear()
2773
2522
 
2774
2523
 
2775
2524
def conflict_pass(tt, conflicts, path_tree=None):
2824
2573
                        # special-case the other tree root (move its
2825
2574
                        # children to current root)
2826
2575
                        if entry.parent_id is None:
2827
 
                            create = False
 
2576
                            create=False
2828
2577
                            moved = _reparent_transform_children(
2829
2578
                                tt, trans_id, tt.root)
2830
2579
                            for child in moved:
2898
2647
        self.pending_deletions = []
2899
2648
 
2900
2649
    def rename(self, from_, to):
2901
 
        """Rename a file from one path to another."""
 
2650
        """Rename a file from one path to another.  Functions like os.rename"""
2902
2651
        try:
2903
 
            osutils.rename(from_, to)
 
2652
            os.rename(from_, to)
2904
2653
        except OSError, e:
2905
2654
            if e.errno in (errno.EEXIST, errno.ENOTEMPTY):
2906
2655
                raise errors.FileExists(to, str(e))
2920
2669
    def rollback(self):
2921
2670
        """Reverse all renames that have been performed"""
2922
2671
        for from_, to in reversed(self.past_renames):
2923
 
            osutils.rename(to, from_)
 
2672
            os.rename(to, from_)
2924
2673
        # after rollback, don't reuse _FileMover
2925
2674
        past_renames = None
2926
2675
        pending_deletions = None