/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: Andrew Bennetts
  • Date: 2008-10-30 01:05:59 UTC
  • mto: This revision was merged to the branch mainline in revision 3813.
  • Revision ID: andrew.bennetts@canonical.com-20081030010559-tumoefnsmhg4snxo
Add contrib/bzr_ssh_path_limiter.

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
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
 
    commit,
29
26
    delta,
30
27
    errors,
31
28
    inventory,
32
 
    multiparent,
33
29
    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,
51
45
    splitpath,
52
46
    supports_executable,
53
47
)
54
 
from bzrlib.progress import ProgressPhase
 
48
from bzrlib.progress import DummyProgress, ProgressPhase
55
49
from bzrlib.symbol_versioning import (
56
50
        deprecated_function,
57
51
        deprecated_in,
79
73
 
80
74
 
81
75
class TreeTransformBase(object):
82
 
    """The base class for TreeTransform and its kin."""
 
76
    """The base class for TreeTransform and TreeTransformBase"""
83
77
 
84
 
    def __init__(self, tree, pb=None,
 
78
    def __init__(self, tree, limbodir, pb=DummyProgress(),
85
79
                 case_sensitive=True):
86
80
        """Constructor.
87
81
 
88
82
        :param tree: The tree that will be transformed, but not necessarily
89
83
            the output tree.
90
 
        :param pb: ignored
 
84
        :param limbodir: A directory where new files can be stored until
 
85
            they are installed in their proper places
 
86
        :param pb: A ProgressBar indicating how much progress is being made
91
87
        :param case_sensitive: If True, the target of the transform is
92
88
            case sensitive, not just case preserving.
93
89
        """
94
90
        object.__init__(self)
95
91
        self._tree = tree
 
92
        self._limbodir = limbodir
 
93
        self._deletiondir = None
96
94
        self._id_number = 0
97
95
        # mapping of trans_id -> new basename
98
96
        self._new_name = {}
100
98
        self._new_parent = {}
101
99
        # mapping of trans_id with new contents -> new file_kind
102
100
        self._new_contents = {}
 
101
        # A mapping of transform ids to their limbo filename
 
102
        self._limbo_files = {}
 
103
        # A mapping of transform ids to a set of the transform ids of children
 
104
        # that their limbo directory has
 
105
        self._limbo_children = {}
 
106
        # Map transform ids to maps of child filename to child transform id
 
107
        self._limbo_children_names = {}
 
108
        # List of transform ids that need to be renamed from limbo into place
 
109
        self._needs_rename = set()
103
110
        # Set of trans_ids whose contents will be removed
104
111
        self._removed_contents = set()
105
112
        # Mapping of trans_id -> new execute-bit value
112
119
        self._non_present_ids = {}
113
120
        # Mapping of new file_id -> trans_id
114
121
        self._r_new_id = {}
115
 
        # Set of trans_ids that will be removed
 
122
        # Set of file_ids that will be removed
116
123
        self._removed_id = set()
117
124
        # Mapping of path in old tree -> trans_id
118
125
        self._tree_path_ids = {}
119
126
        # Mapping trans_id -> path in old tree
120
127
        self._tree_id_paths = {}
 
128
        # Cache of realpath results, to speed up canonical_path
 
129
        self._realpaths = {}
 
130
        # Cache of relpath results, to speed up canonical_path
 
131
        self._relpaths = {}
121
132
        # The trans_id that will be used as the tree root
122
133
        root_id = tree.get_root_id()
123
134
        if root_id is not None:
133
144
        # A counter of how many files have been renamed
134
145
        self.rename_count = 0
135
146
 
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
147
    def __get_root(self):
148
148
        return self._new_root
149
149
 
150
150
    root = property(__get_root)
151
151
 
 
152
    def finalize(self):
 
153
        """Release the working tree lock, if held, clean up limbo dir.
 
154
 
 
155
        This is required if apply has not been invoked, but can be invoked
 
156
        even after apply.
 
157
        """
 
158
        if self._tree is None:
 
159
            return
 
160
        try:
 
161
            entries = [(self._limbo_name(t), t, k) for t, k in
 
162
                       self._new_contents.iteritems()]
 
163
            entries.sort(reverse=True)
 
164
            for path, trans_id, kind in entries:
 
165
                if kind == "directory":
 
166
                    os.rmdir(path)
 
167
                else:
 
168
                    os.unlink(path)
 
169
            try:
 
170
                os.rmdir(self._limbodir)
 
171
            except OSError:
 
172
                # We don't especially care *why* the dir is immortal.
 
173
                raise ImmortalLimbo(self._limbodir)
 
174
            try:
 
175
                if self._deletiondir is not None:
 
176
                    os.rmdir(self._deletiondir)
 
177
            except OSError:
 
178
                raise errors.ImmortalPendingDeletion(self._deletiondir)
 
179
        finally:
 
180
            self._tree.unlock()
 
181
            self._tree = None
 
182
 
152
183
    def _assign_id(self):
153
184
        """Produce a new tranform id"""
154
185
        new_id = "new-%s" % self._id_number
164
195
 
165
196
    def adjust_path(self, name, parent, trans_id):
166
197
        """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
198
        if trans_id == self._new_root:
170
199
            raise CantMoveRoot
 
200
        previous_parent = self._new_parent.get(trans_id)
 
201
        previous_name = self._new_name.get(trans_id)
171
202
        self._new_name[trans_id] = name
172
203
        self._new_parent[trans_id] = parent
 
204
        if parent == ROOT_PARENT:
 
205
            if self._new_root is not None:
 
206
                raise ValueError("Cannot have multiple roots.")
 
207
            self._new_root = trans_id
 
208
        if (trans_id in self._limbo_files and
 
209
            trans_id not in self._needs_rename):
 
210
            self._rename_in_limbo([trans_id])
 
211
            self._limbo_children[previous_parent].remove(trans_id)
 
212
            del self._limbo_children_names[previous_parent][previous_name]
 
213
 
 
214
    def _rename_in_limbo(self, trans_ids):
 
215
        """Fix limbo names so that the right final path is produced.
 
216
 
 
217
        This means we outsmarted ourselves-- we tried to avoid renaming
 
218
        these files later by creating them with their final names in their
 
219
        final parents.  But now the previous name or parent is no longer
 
220
        suitable, so we have to rename them.
 
221
 
 
222
        Even for trans_ids that have no new contents, we must remove their
 
223
        entries from _limbo_files, because they are now stale.
 
224
        """
 
225
        for trans_id in trans_ids:
 
226
            old_path = self._limbo_files.pop(trans_id)
 
227
            if trans_id not in self._new_contents:
 
228
                continue
 
229
            new_path = self._limbo_name(trans_id)
 
230
            os.rename(old_path, new_path)
173
231
 
174
232
    def adjust_root_path(self, name, parent):
175
233
        """Emulate moving the root by moving all children, instead.
176
 
 
 
234
        
177
235
        We do this by undoing the association of root's transaction id with the
178
236
        current tree.  This allows us to create a new directory with that
179
 
        transaction id.  We unversion the root directory and version the
 
237
        transaction id.  We unversion the root directory and version the 
180
238
        physically new directory, and hope someone versions the tree root
181
239
        later.
182
240
        """
185
243
        # force moving all children of root
186
244
        for child_id in self.iter_tree_children(old_root):
187
245
            if child_id != parent:
188
 
                self.adjust_path(self.final_name(child_id),
 
246
                self.adjust_path(self.final_name(child_id), 
189
247
                                 self.final_parent(child_id), child_id)
190
248
            file_id = self.final_file_id(child_id)
191
249
            if file_id is not None:
192
250
                self.unversion_file(child_id)
193
251
            self.version_file(file_id, child_id)
194
 
 
 
252
        
195
253
        # the physical root needs a new transaction id
196
254
        self._tree_path_ids.pop("")
197
255
        self._tree_id_paths.pop(old_root)
203
261
        self.version_file(old_root_file_id, old_root)
204
262
        self.unversion_file(self._new_root)
205
263
 
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
264
    def trans_id_tree_file_id(self, inventory_id):
268
265
        """Determine the transaction id of a working tree file.
269
 
 
 
266
        
270
267
        This reflects only files that already exist, not ones that will be
271
268
        added by transactions.
272
269
        """
298
295
            else:
299
296
                return self.trans_id_tree_file_id(file_id)
300
297
 
 
298
    def canonical_path(self, path):
 
299
        """Get the canonical tree-relative path"""
 
300
        # don't follow final symlinks
 
301
        abs = self._tree.abspath(path)
 
302
        if abs in self._relpaths:
 
303
            return self._relpaths[abs]
 
304
        dirname, basename = os.path.split(abs)
 
305
        if dirname not in self._realpaths:
 
306
            self._realpaths[dirname] = os.path.realpath(dirname)
 
307
        dirname = self._realpaths[dirname]
 
308
        abs = pathjoin(dirname, basename)
 
309
        if dirname in self._relpaths:
 
310
            relpath = pathjoin(self._relpaths[dirname], basename)
 
311
            relpath = relpath.rstrip('/\\')
 
312
        else:
 
313
            relpath = self._tree.relpath(abs)
 
314
        self._relpaths[abs] = relpath
 
315
        return relpath
 
316
 
301
317
    def trans_id_tree_path(self, path):
302
318
        """Determine (and maybe set) the transaction ID for a tree path."""
303
319
        path = self.canonical_path(path)
313
329
            return ROOT_PARENT
314
330
        return self.trans_id_tree_path(os.path.dirname(path))
315
331
 
 
332
    def create_file(self, contents, trans_id, mode_id=None):
 
333
        """Schedule creation of a new file.
 
334
 
 
335
        See also new_file.
 
336
        
 
337
        Contents is an iterator of strings, all of which will be written
 
338
        to the target destination.
 
339
 
 
340
        New file takes the permissions of any existing file with that id,
 
341
        unless mode_id is specified.
 
342
        """
 
343
        name = self._limbo_name(trans_id)
 
344
        f = open(name, 'wb')
 
345
        try:
 
346
            try:
 
347
                unique_add(self._new_contents, trans_id, 'file')
 
348
            except:
 
349
                # Clean up the file, it never got registered so
 
350
                # TreeTransform.finalize() won't clean it up.
 
351
                f.close()
 
352
                os.unlink(name)
 
353
                raise
 
354
 
 
355
            f.writelines(contents)
 
356
        finally:
 
357
            f.close()
 
358
        self._set_mode(trans_id, mode_id, S_ISREG)
 
359
 
 
360
    def _set_mode(self, trans_id, mode_id, typefunc):
 
361
        """Set the mode of new file contents.
 
362
        The mode_id is the existing file to get the mode from (often the same
 
363
        as trans_id).  The operation is only performed if there's a mode match
 
364
        according to typefunc.
 
365
        """
 
366
        if mode_id is None:
 
367
            mode_id = trans_id
 
368
        try:
 
369
            old_path = self._tree_id_paths[mode_id]
 
370
        except KeyError:
 
371
            return
 
372
        try:
 
373
            mode = os.stat(self._tree.abspath(old_path)).st_mode
 
374
        except OSError, e:
 
375
            if e.errno in (errno.ENOENT, errno.ENOTDIR):
 
376
                # Either old_path doesn't exist, or the parent of the
 
377
                # target is not a directory (but will be one eventually)
 
378
                # Either way, we know it doesn't exist *right now*
 
379
                # See also bug #248448
 
380
                return
 
381
            else:
 
382
                raise
 
383
        if typefunc(mode):
 
384
            os.chmod(self._limbo_name(trans_id), mode)
 
385
 
 
386
    def create_hardlink(self, path, trans_id):
 
387
        """Schedule creation of a hard link"""
 
388
        name = self._limbo_name(trans_id)
 
389
        try:
 
390
            os.link(path, name)
 
391
        except OSError, e:
 
392
            if e.errno != errno.EPERM:
 
393
                raise
 
394
            raise errors.HardLinkNotSupported(path)
 
395
        try:
 
396
            unique_add(self._new_contents, trans_id, 'file')
 
397
        except:
 
398
            # Clean up the file, it never got registered so
 
399
            # TreeTransform.finalize() won't clean it up.
 
400
            os.unlink(name)
 
401
            raise
 
402
 
 
403
    def create_directory(self, trans_id):
 
404
        """Schedule creation of a new directory.
 
405
        
 
406
        See also new_directory.
 
407
        """
 
408
        os.mkdir(self._limbo_name(trans_id))
 
409
        unique_add(self._new_contents, trans_id, 'directory')
 
410
 
 
411
    def create_symlink(self, target, trans_id):
 
412
        """Schedule creation of a new symbolic link.
 
413
 
 
414
        target is a bytestring.
 
415
        See also new_symlink.
 
416
        """
 
417
        if has_symlinks():
 
418
            os.symlink(target, self._limbo_name(trans_id))
 
419
            unique_add(self._new_contents, trans_id, 'symlink')
 
420
        else:
 
421
            try:
 
422
                path = FinalPaths(self).get_path(trans_id)
 
423
            except KeyError:
 
424
                path = None
 
425
            raise UnableCreateSymlink(path=path)
 
426
 
 
427
    def cancel_creation(self, trans_id):
 
428
        """Cancel the creation of new file contents."""
 
429
        del self._new_contents[trans_id]
 
430
        children = self._limbo_children.get(trans_id)
 
431
        # if this is a limbo directory with children, move them before removing
 
432
        # the directory
 
433
        if children is not None:
 
434
            self._rename_in_limbo(children)
 
435
            del self._limbo_children[trans_id]
 
436
            del self._limbo_children_names[trans_id]
 
437
        delete_any(self._limbo_name(trans_id))
 
438
 
316
439
    def delete_contents(self, trans_id):
317
440
        """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
441
        self.tree_kind(trans_id)
321
442
        self._removed_contents.add(trans_id)
322
443
 
394
515
        new_ids.update(changed_kind)
395
516
        return sorted(FinalPaths(self).get_paths(new_ids))
396
517
 
 
518
    def tree_kind(self, trans_id):
 
519
        """Determine the file kind in the working tree.
 
520
 
 
521
        Raises NoSuchFile if the file does not exist
 
522
        """
 
523
        path = self._tree_id_paths.get(trans_id)
 
524
        if path is None:
 
525
            raise NoSuchFile(None)
 
526
        try:
 
527
            return file_kind(self._tree.abspath(path))
 
528
        except OSError, e:
 
529
            if e.errno != errno.ENOENT:
 
530
                raise
 
531
            else:
 
532
                raise NoSuchFile(path)
 
533
 
397
534
    def final_kind(self, trans_id):
398
535
        """Determine the final file kind, after any changes applied.
399
 
 
 
536
        
400
537
        Raises NoSuchFile if the file does not exist/has no contents.
401
538
        (It is conceivable that a path would be created without the
402
539
        corresponding contents insertion command)
422
559
 
423
560
    def final_file_id(self, trans_id):
424
561
        """Determine the file id after any changes are applied, or None.
425
 
 
 
562
        
426
563
        None indicates that the file will not be versioned after changes are
427
564
        applied.
428
565
        """
467
604
 
468
605
    def by_parent(self):
469
606
        """Return a map of parent: children for known parents.
470
 
 
 
607
        
471
608
        Only new paths and parents of tree files with assigned ids are used.
472
609
        """
473
610
        by_parent = {}
474
611
        items = list(self._new_parent.iteritems())
475
 
        items.extend((t, self.final_parent(t)) for t in
 
612
        items.extend((t, self.final_parent(t)) for t in 
476
613
                      self._tree_id_paths.keys())
477
614
        for trans_id, parent_id in items:
478
615
            if parent_id not in by_parent:
506
643
        conflicts.extend(self._overwrite_conflicts())
507
644
        return conflicts
508
645
 
509
 
    def _check_malformed(self):
510
 
        conflicts = self.find_conflicts()
511
 
        if len(conflicts) != 0:
512
 
            raise MalformedTransform(conflicts=conflicts)
513
 
 
514
646
    def _add_tree_children(self):
515
647
        """Add all the children of all active parents to the known paths.
516
648
 
518
650
        removed.  This is a necessary first step in detecting conflicts.
519
651
        """
520
652
        parents = self.by_parent().keys()
521
 
        parents.extend([t for t in self._removed_contents if
 
653
        parents.extend([t for t in self._removed_contents if 
522
654
                        self.tree_kind(t) == 'directory'])
523
655
        for trans_id in self._removed_id:
524
656
            file_id = self.tree_file_id(trans_id)
532
664
            # ensure that all children are registered with the transaction
533
665
            list(self.iter_tree_children(parent_id))
534
666
 
 
667
    def iter_tree_children(self, parent_id):
 
668
        """Iterate through the entry's tree children, if any"""
 
669
        try:
 
670
            path = self._tree_id_paths[parent_id]
 
671
        except KeyError:
 
672
            return
 
673
        try:
 
674
            children = os.listdir(self._tree.abspath(path))
 
675
        except OSError, e:
 
676
            if not (osutils._is_error_enotdir(e)
 
677
                    or e.errno in (errno.ENOENT, errno.ESRCH)):
 
678
                raise
 
679
            return
 
680
 
 
681
        for child in children:
 
682
            childpath = joinpath(path, child)
 
683
            if self._tree.is_control_filename(childpath):
 
684
                continue
 
685
            yield self.trans_id_tree_path(childpath)
 
686
 
535
687
    def has_named_child(self, by_parent, parent_id, name):
536
688
        try:
537
689
            children = by_parent[parent_id]
591
743
 
592
744
    def _improper_versioning(self):
593
745
        """Cannot version a file with no contents, or a bad type.
594
 
 
 
746
        
595
747
        However, existing entries with no contents are okay.
596
748
        """
597
749
        conflicts = []
607
759
 
608
760
    def _executability_conflicts(self):
609
761
        """Check for bad executability changes.
610
 
 
 
762
        
611
763
        Only versioned files may have their executability set, because
612
764
        1. only versioned entries can have executability under windows
613
765
        2. only files can be executable.  (The execute bit on a directory
712
864
            return True
713
865
        return False
714
866
 
 
867
    def _limbo_name(self, trans_id):
 
868
        """Generate the limbo name of a file"""
 
869
        limbo_name = self._limbo_files.get(trans_id)
 
870
        if limbo_name is not None:
 
871
            return limbo_name
 
872
        parent = self._new_parent.get(trans_id)
 
873
        # if the parent directory is already in limbo (e.g. when building a
 
874
        # tree), choose a limbo name inside the parent, to reduce further
 
875
        # renames.
 
876
        use_direct_path = False
 
877
        if self._new_contents.get(parent) == 'directory':
 
878
            filename = self._new_name.get(trans_id)
 
879
            if filename is not None:
 
880
                if parent not in self._limbo_children:
 
881
                    self._limbo_children[parent] = set()
 
882
                    self._limbo_children_names[parent] = {}
 
883
                    use_direct_path = True
 
884
                # the direct path can only be used if no other file has
 
885
                # already taken this pathname, i.e. if the name is unused, or
 
886
                # if it is already associated with this trans_id.
 
887
                elif self._case_sensitive_target:
 
888
                    if (self._limbo_children_names[parent].get(filename)
 
889
                        in (trans_id, None)):
 
890
                        use_direct_path = True
 
891
                else:
 
892
                    for l_filename, l_trans_id in\
 
893
                        self._limbo_children_names[parent].iteritems():
 
894
                        if l_trans_id == trans_id:
 
895
                            continue
 
896
                        if l_filename.lower() == filename.lower():
 
897
                            break
 
898
                    else:
 
899
                        use_direct_path = True
 
900
 
 
901
        if use_direct_path:
 
902
            limbo_name = pathjoin(self._limbo_files[parent], filename)
 
903
            self._limbo_children[parent].add(trans_id)
 
904
            self._limbo_children_names[parent][filename] = trans_id
 
905
        else:
 
906
            limbo_name = pathjoin(self._limbodir, trans_id)
 
907
            self._needs_rename.add(trans_id)
 
908
        self._limbo_files[trans_id] = limbo_name
 
909
        return limbo_name
 
910
 
715
911
    def _set_executability(self, path, trans_id):
716
912
        """Set the executability of versioned files """
717
913
        if supports_executable():
738
934
            self.version_file(file_id, trans_id)
739
935
        return trans_id
740
936
 
741
 
    def new_file(self, name, parent_id, contents, file_id=None,
 
937
    def new_file(self, name, parent_id, contents, file_id=None, 
742
938
                 executable=None):
743
939
        """Convenience method to create files.
744
 
 
 
940
        
745
941
        name is the name of the file to create.
746
942
        parent_id is the transaction id of the parent directory of the file.
747
943
        contents is an iterator of bytestrings, which will be used to produce
767
963
        """
768
964
        trans_id = self._new_entry(name, parent_id, file_id)
769
965
        self.create_directory(trans_id)
770
 
        return trans_id
 
966
        return trans_id 
771
967
 
772
968
    def new_symlink(self, name, parent_id, target, file_id=None):
773
969
        """Convenience method to create symbolic link.
774
 
 
 
970
        
775
971
        name is the name of the symlink to create.
776
972
        parent_id is the transaction id of the parent directory of the symlink.
777
973
        target is a bytestring of the target of the symlink.
923
1119
    def get_preview_tree(self):
924
1120
        """Return a tree representing the result of the transform.
925
1121
 
926
 
        The tree is a snapshot, and altering the TreeTransform will invalidate
927
 
        it.
 
1122
        This tree only supports the subset of Tree functionality required
 
1123
        by show_diff_trees.  It must only be compared to tt._tree.
928
1124
        """
929
1125
        return _PreviewTree(self)
930
1126
 
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):
 
1127
 
 
1128
class TreeTransform(TreeTransformBase):
1301
1129
    """Represent a tree transformation.
1302
1130
 
1303
1131
    This object is designed to support incremental generation of the transform,
1362
1190
    FileMover does not delete files until it is sure that a rollback will not
1363
1191
    happen.
1364
1192
    """
1365
 
    def __init__(self, tree, pb=None):
 
1193
    def __init__(self, tree, pb=DummyProgress()):
1366
1194
        """Note: a tree_write lock is taken on the tree.
1367
1195
 
1368
1196
        Use TreeTransform.finalize() to release the lock (can be omitted if
1389
1217
            tree.unlock()
1390
1218
            raise
1391
1219
 
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,
 
1220
        TreeTransformBase.__init__(self, tree, limbodir, pb,
1397
1221
                                   tree.case_sensitive)
1398
1222
        self._deletiondir = deletiondir
1399
1223
 
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
1224
    def apply(self, no_conflicts=False, precomputed_delta=None, _mover=None):
1530
1225
        """Apply all changes to the inventory and filesystem.
1531
1226
 
1541
1236
        :param _mover: Supply an alternate FileMover, for testing
1542
1237
        """
1543
1238
        if not no_conflicts:
1544
 
            self._check_malformed()
 
1239
            conflicts = self.find_conflicts()
 
1240
            if len(conflicts) != 0:
 
1241
                raise MalformedTransform(conflicts=conflicts)
1545
1242
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1546
1243
        try:
1547
1244
            if precomputed_delta is None:
1651
1348
                child_pb.update('removing file', num, len(tree_paths))
1652
1349
                full_path = self._tree.abspath(path)
1653
1350
                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):
 
1351
                    mover.pre_delete(full_path, os.path.join(self._deletiondir,
 
1352
                                     trans_id))
 
1353
                elif trans_id in self._new_name or trans_id in \
 
1354
                    self._new_parent:
1658
1355
                    try:
1659
1356
                        mover.rename(full_path, self._limbo_name(trans_id))
1660
 
                    except errors.TransformRenameFailed, e:
 
1357
                    except OSError, e:
1661
1358
                        if e.errno != errno.ENOENT:
1662
1359
                            raise
1663
1360
                    else:
1688
1385
                if trans_id in self._needs_rename:
1689
1386
                    try:
1690
1387
                        mover.rename(self._limbo_name(trans_id), full_path)
1691
 
                    except errors.TransformRenameFailed, e:
 
1388
                    except OSError, e:
1692
1389
                        # We may be renaming a dangling inventory id
1693
1390
                        if e.errno != errno.ENOENT:
1694
1391
                            raise
1706
1403
        return modified_paths
1707
1404
 
1708
1405
 
1709
 
class TransformPreview(DiskTreeTransform):
 
1406
class TransformPreview(TreeTransformBase):
1710
1407
    """A TreeTransform for generating preview trees.
1711
1408
 
1712
1409
    Unlike TreeTransform, this version works when the input tree is a
1714
1411
    unversioned files in the input tree.
1715
1412
    """
1716
1413
 
1717
 
    def __init__(self, tree, pb=None, case_sensitive=True):
 
1414
    def __init__(self, tree, pb=DummyProgress(), case_sensitive=True):
1718
1415
        tree.lock_read()
1719
1416
        limbodir = osutils.mkdtemp(prefix='bzr-limbo-')
1720
 
        DiskTreeTransform.__init__(self, tree, limbodir, pb, case_sensitive)
 
1417
        TreeTransformBase.__init__(self, tree, limbodir, pb, case_sensitive)
1721
1418
 
1722
1419
    def canonical_path(self, path):
1723
1420
        return path
1765
1462
        self._all_children_cache = {}
1766
1463
        self._path2trans_id_cache = {}
1767
1464
        self._final_name_cache = {}
1768
 
        self._iter_changes_cache = dict((c[0], c) for c in
1769
 
                                        self._transform.iter_changes())
 
1465
 
 
1466
    def _changes(self, file_id):
 
1467
        for changes in self._transform.iter_changes():
 
1468
            if changes[0] == file_id:
 
1469
                return changes
1770
1470
 
1771
1471
    def _content_change(self, file_id):
1772
1472
        """Return True if the content of this file changed"""
1773
 
        changes = self._iter_changes_cache.get(file_id)
 
1473
        changes = self._changes(file_id)
1774
1474
        # changes[2] is true if the file content changed.  See
1775
1475
        # InterTree.iter_changes.
1776
1476
        return (changes is not None and changes[2])
1792
1492
        parent_keys = [(file_id, self._file_revision(t, file_id)) for t in
1793
1493
                       self._iter_parent_trees()]
1794
1494
        vf.add_lines((file_id, tree_revision), parent_keys,
1795
 
                     self.get_file_lines(file_id))
 
1495
                     self.get_file(file_id).readlines())
1796
1496
        repo = self._get_repository()
1797
1497
        base_vf = repo.texts
1798
1498
        if base_vf not in vf.fallback_versionedfiles:
1820
1520
            executable = self.is_executable(file_id, path)
1821
1521
        return kind, executable, None
1822
1522
 
1823
 
    def is_locked(self):
1824
 
        return False
1825
 
 
1826
1523
    def lock_read(self):
1827
1524
        # Perhaps in theory, this should lock the TreeTransform?
1828
 
        return self
 
1525
        pass
1829
1526
 
1830
1527
    def unlock(self):
1831
1528
        pass
1848
1545
    def __iter__(self):
1849
1546
        return iter(self.all_file_ids())
1850
1547
 
1851
 
    def _has_id(self, file_id, fallback_check):
 
1548
    def has_id(self, file_id):
1852
1549
        if file_id in self._transform._r_new_id:
1853
1550
            return True
1854
 
        elif file_id in set([self._transform.tree_file_id(trans_id) for
1855
 
            trans_id in self._transform._removed_id]):
 
1551
        elif file_id in self._transform._removed_id:
1856
1552
            return False
1857
1553
        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)
 
1554
            return self._transform._tree.has_id(file_id)
1865
1555
 
1866
1556
    def _path2trans_id(self, path):
1867
1557
        # We must not use None here, because that is a valid value to store.
1920
1610
            if self._transform.final_file_id(trans_id) is None:
1921
1611
                yield self._final_paths._determine_path(trans_id)
1922
1612
 
1923
 
    def _make_inv_entries(self, ordered_entries, specific_file_ids=None,
1924
 
        yield_parents=False):
 
1613
    def _make_inv_entries(self, ordered_entries, specific_file_ids):
1925
1614
        for trans_id, parent_file_id in ordered_entries:
1926
1615
            file_id = self._transform.final_file_id(trans_id)
1927
1616
            if file_id is None:
1953
1642
                ordered_ids.append((trans_id, parent_file_id))
1954
1643
        return ordered_ids
1955
1644
 
1956
 
    def iter_entries_by_dir(self, specific_file_ids=None, yield_parents=False):
 
1645
    def iter_entries_by_dir(self, specific_file_ids=None):
1957
1646
        # This may not be a maximally efficient implementation, but it is
1958
1647
        # reasonably straightforward.  An implementation that grafts the
1959
1648
        # TreeTransform changes onto the tree's iter_entries_by_dir results
1961
1650
        # position.
1962
1651
        ordered_ids = self._list_files_by_dir()
1963
1652
        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."""
 
1653
                                                      specific_file_ids):
 
1654
            yield unicode(self._final_paths.get_path(trans_id)), entry
 
1655
 
 
1656
    def list_files(self, include_root=False):
 
1657
        """See Tree.list_files."""
1979
1658
        # XXX This should behave like WorkingTree.list_files, but is really
1980
1659
        # 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
 
1660
        for path, entry in self.iter_entries_by_dir():
 
1661
            if entry.name == '' and not include_root:
 
1662
                continue
 
1663
            yield path, 'V', entry.kind, entry.file_id, entry
2002
1664
 
2003
1665
    def kind(self, file_id):
2004
1666
        trans_id = self._transform.trans_id_file_id(file_id)
2014
1676
    def get_file_mtime(self, file_id, path=None):
2015
1677
        """See Tree.get_file_mtime"""
2016
1678
        if not self._content_change(file_id):
2017
 
            return self._transform._tree.get_file_mtime(file_id)
 
1679
            return self._transform._tree.get_file_mtime(file_id, path)
2018
1680
        return self._stat_limbo_file(file_id).st_mtime
2019
1681
 
2020
1682
    def _file_size(self, entry, stat_value):
2074
1736
                statval = os.lstat(limbo_name)
2075
1737
                size = statval.st_size
2076
1738
                if not supports_executable():
2077
 
                    executable = False
 
1739
                    executable = None
2078
1740
                else:
2079
1741
                    executable = statval.st_mode & S_IEXEC
2080
1742
            else:
2081
1743
                size = None
2082
1744
                executable = None
2083
1745
            if kind == 'symlink':
2084
 
                link_or_sha1 = os.readlink(limbo_name).decode(osutils._fs_enc)
2085
 
        executable = tt._new_executability.get(trans_id, executable)
 
1746
                link_or_sha1 = os.readlink(limbo_name)
 
1747
        if supports_executable():
 
1748
            executable = tt._new_executability.get(trans_id, executable)
2086
1749
        return kind, size, executable, link_or_sha1
2087
1750
 
2088
1751
    def iter_changes(self, from_tree, include_unchanged=False,
2114
1777
        name = self._transform._limbo_name(trans_id)
2115
1778
        return open(name, 'rb')
2116
1779
 
2117
 
    def get_file_with_stat(self, file_id, path=None):
2118
 
        return self.get_file(file_id, path), None
2119
 
 
2120
1780
    def annotate_iter(self, file_id,
2121
1781
                      default_revision=_mod_revision.CURRENT_REVISION):
2122
 
        changes = self._iter_changes_cache.get(file_id)
 
1782
        changes = self._changes(file_id)
2123
1783
        if changes is None:
2124
1784
            get_old = True
2125
1785
        else:
2137
1797
            return old_annotation
2138
1798
        if not changed_content:
2139
1799
            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
1800
        return annotate.reannotate([old_annotation],
2148
1801
                                   self.get_file(file_id).readlines(),
2149
1802
                                   default_revision)
2154
1807
            return self._transform._tree.get_symlink_target(file_id)
2155
1808
        trans_id = self._transform.trans_id_file_id(file_id)
2156
1809
        name = self._transform._limbo_name(trans_id)
2157
 
        return osutils.readlink(name)
 
1810
        return os.readlink(name)
2158
1811
 
2159
1812
    def walkdirs(self, prefix=''):
2160
1813
        pending = [self._transform.root]
2215
1868
        self.transform = transform
2216
1869
 
2217
1870
    def _determine_path(self, trans_id):
2218
 
        if (trans_id == self.transform.root or trans_id == ROOT_PARENT):
 
1871
        if trans_id == self.transform.root:
2219
1872
            return ""
2220
1873
        name = self.transform.final_name(trans_id)
2221
1874
        parent_id = self.transform.final_parent(trans_id)
2245
1898
def build_tree(tree, wt, accelerator_tree=None, hardlink=False,
2246
1899
               delta_from_tree=False):
2247
1900
    """Create working tree for a branch, using a TreeTransform.
2248
 
 
 
1901
    
2249
1902
    This function should be used on empty trees, having a tree root at most.
2250
1903
    (see merge and revert functionality for working with existing trees)
2251
1904
 
2252
1905
    Existing files are handled like so:
2253
 
 
 
1906
    
2254
1907
    - Existing bzrdirs take precedence over creating new items.  They are
2255
1908
      created as '%s.diverted' % name.
2256
1909
    - Otherwise, if the content on disk matches the content we are building,
2358
2011
                    executable = tree.is_executable(file_id, tree_path)
2359
2012
                    if executable:
2360
2013
                        tt.set_executability(executable, trans_id)
2361
 
                    trans_data = (trans_id, tree_path)
2362
 
                    deferred_contents.append((file_id, trans_data))
 
2014
                    deferred_contents.append((file_id, trans_id))
2363
2015
                else:
2364
2016
                    file_trans_id[file_id] = new_by_entry(tt, entry, parent_id,
2365
2017
                                                          tree)
2396
2048
def _create_files(tt, tree, desired_files, pb, offset, accelerator_tree,
2397
2049
                  hardlink):
2398
2050
    total = len(desired_files) + offset
2399
 
    wt = tt._tree
2400
2051
    if accelerator_tree is None:
2401
2052
        new_desired_files = desired_files
2402
2053
    else:
2403
2054
        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)
 
2055
        unchanged = dict((f, p[1]) for (f, p, c, v, d, n, k, e)
 
2056
                         in iter if not (c or e[0] != e[1]))
2410
2057
        new_desired_files = []
2411
2058
        count = 0
2412
 
        for file_id, (trans_id, tree_path) in desired_files:
 
2059
        for file_id, trans_id in desired_files:
2413
2060
            accelerator_path = unchanged.get(file_id)
2414
2061
            if accelerator_path is None:
2415
 
                new_desired_files.append((file_id, (trans_id, tree_path)))
 
2062
                new_desired_files.append((file_id, trans_id))
2416
2063
                continue
2417
2064
            pb.update('Adding file contents', count + offset, total)
2418
2065
            if hardlink:
2420
2067
                                   trans_id)
2421
2068
            else:
2422
2069
                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
2070
                try:
2428
2071
                    tt.create_file(contents, trans_id)
2429
2072
                finally:
2430
 
                    try:
2431
 
                        contents.close()
2432
 
                    except AttributeError:
2433
 
                        # after filtering, contents may no longer be file-like
2434
 
                        pass
 
2073
                    contents.close()
2435
2074
            count += 1
2436
2075
        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))
 
2076
    for count, (trans_id, contents) in enumerate(tree.iter_files_bytes(
 
2077
                                                 new_desired_files)):
2443
2078
        tt.create_file(contents, trans_id)
2444
2079
        pb.update('Adding file contents', count + offset, total)
2445
2080
 
2460
2095
    if entry.kind == "directory":
2461
2096
        return True
2462
2097
    if entry.kind == "file":
2463
 
        f = file(target_path, 'rb')
2464
 
        try:
2465
 
            if tree.get_file_text(file_id) == f.read():
2466
 
                return True
2467
 
        finally:
2468
 
            f.close()
 
2098
        if tree.get_file(file_id).read() == file(target_path, 'rb').read():
 
2099
            return True
2469
2100
    elif entry.kind == "symlink":
2470
2101
        if tree.get_symlink_target(file_id) == os.readlink(target_path):
2471
2102
            return True
2509
2140
    if kind == 'file':
2510
2141
        contents = tree.get_file(entry.file_id).readlines()
2511
2142
        executable = tree.is_executable(entry.file_id)
2512
 
        return tt.new_file(name, parent_id, contents, entry.file_id,
 
2143
        return tt.new_file(name, parent_id, contents, entry.file_id, 
2513
2144
                           executable)
2514
2145
    elif kind in ('directory', 'tree-reference'):
2515
2146
        trans_id = tt.new_directory(name, parent_id, entry.file_id)
2516
2147
        if kind == 'tree-reference':
2517
2148
            tt.set_tree_reference(entry.reference_revision, trans_id)
2518
 
        return trans_id
 
2149
        return trans_id 
2519
2150
    elif kind == 'symlink':
2520
2151
        target = tree.get_symlink_target(entry.file_id)
2521
2152
        return tt.new_symlink(name, parent_id, target, entry.file_id)
2539
2170
        tt.create_directory(trans_id)
2540
2171
 
2541
2172
 
2542
 
def create_from_tree(tt, trans_id, tree, file_id, bytes=None,
2543
 
    filter_tree_path=None):
2544
 
    """Create new file contents according to tree contents.
2545
 
    
2546
 
    :param filter_tree_path: the tree path to use to lookup
2547
 
      content filters to apply to the bytes output in the working tree.
2548
 
      This only applies if the working tree supports content filtering.
2549
 
    """
 
2173
def create_from_tree(tt, trans_id, tree, file_id, bytes=None):
 
2174
    """Create new file contents according to tree contents."""
2550
2175
    kind = tree.kind(file_id)
2551
2176
    if kind == 'directory':
2552
2177
        tt.create_directory(trans_id)
2557
2182
                bytes = tree_file.readlines()
2558
2183
            finally:
2559
2184
                tree_file.close()
2560
 
        wt = tt._tree
2561
 
        if wt.supports_content_filtering() and filter_tree_path is not None:
2562
 
            filters = wt._content_filter_stack(filter_tree_path)
2563
 
            bytes = filtered_output_bytes(bytes, filters,
2564
 
                ContentFilterContext(filter_tree_path, tree))
2565
2185
        tt.create_file(bytes, trans_id)
2566
2186
    elif kind == "symlink":
2567
2187
        tt.create_symlink(tree.get_symlink_target(file_id), trans_id)
2611
2231
        if entry.kind != working_kind:
2612
2232
            contents_mod, meta_mod = True, False
2613
2233
        else:
2614
 
            cur_entry._read_tree_state(working_tree.id2path(file_id),
 
2234
            cur_entry._read_tree_state(working_tree.id2path(file_id), 
2615
2235
                                       working_tree)
2616
2236
            contents_mod, meta_mod = entry.detect_changes(cur_entry)
2617
2237
            cur_entry._forget_tree_state()
2619
2239
 
2620
2240
 
2621
2241
def revert(working_tree, target_tree, filenames, backups=False,
2622
 
           pb=None, change_reporter=None):
 
2242
           pb=DummyProgress(), change_reporter=None):
2623
2243
    """Revert a working tree's contents to those of a target tree."""
2624
2244
    target_tree.lock_read()
2625
 
    pb = ui.ui_factory.nested_progress_bar()
2626
2245
    tt = TreeTransform(working_tree, pb)
2627
2246
    try:
2628
2247
        pp = ProgressPhase("Revert phase", 3, pb)
2647
2266
def _prepare_revert_transform(working_tree, target_tree, tt, filenames,
2648
2267
                              backups, pp, basis_tree=None,
2649
2268
                              merge_modified=None):
 
2269
    pp.next_phase()
2650
2270
    child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2651
2271
    try:
2652
2272
        if merge_modified is None:
2656
2276
                                      merge_modified, basis_tree)
2657
2277
    finally:
2658
2278
        child_pb.finished()
 
2279
    pp.next_phase()
2659
2280
    child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2660
2281
    try:
2661
2282
        raw_conflicts = resolve_conflicts(tt, child_pb,
2754
2375
                    parent_trans = ROOT_PARENT
2755
2376
                else:
2756
2377
                    parent_trans = tt.trans_id_file_id(parent[1])
2757
 
                if parent[0] is None and versioned[0]:
2758
 
                    tt.adjust_root_path(name[1], parent_trans)
2759
 
                else:
2760
 
                    tt.adjust_path(name[1], parent_trans, trans_id)
 
2378
                tt.adjust_path(name[1], parent_trans, trans_id)
2761
2379
            if executable[0] != executable[1] and kind[1] == "file":
2762
2380
                tt.set_executability(executable[1], trans_id)
2763
 
        if working_tree.supports_content_filtering():
2764
 
            for index, ((trans_id, mode_id), bytes) in enumerate(
2765
 
                target_tree.iter_files_bytes(deferred_files)):
2766
 
                file_id = deferred_files[index][0]
2767
 
                # We're reverting a tree to the target tree so using the
2768
 
                # target tree to find the file path seems the best choice
2769
 
                # here IMO - Ian C 27/Oct/2009
2770
 
                filter_tree_path = target_tree.id2path(file_id)
2771
 
                filters = working_tree._content_filter_stack(filter_tree_path)
2772
 
                bytes = filtered_output_bytes(bytes, filters,
2773
 
                    ContentFilterContext(filter_tree_path, working_tree))
2774
 
                tt.create_file(bytes, trans_id, mode_id)
2775
 
        else:
2776
 
            for (trans_id, mode_id), bytes in target_tree.iter_files_bytes(
2777
 
                deferred_files):
2778
 
                tt.create_file(bytes, trans_id, mode_id)
2779
 
        tt.fixup_new_roots()
 
2381
        for (trans_id, mode_id), bytes in target_tree.iter_files_bytes(
 
2382
            deferred_files):
 
2383
            tt.create_file(bytes, trans_id, mode_id)
2780
2384
    finally:
2781
2385
        if basis_tree is not None:
2782
2386
            basis_tree.unlock()
2783
2387
    return merge_modified
2784
2388
 
2785
2389
 
2786
 
def resolve_conflicts(tt, pb=None, pass_func=None):
 
2390
def resolve_conflicts(tt, pb=DummyProgress(), pass_func=None):
2787
2391
    """Make many conflict-resolution attempts, but die if they fail"""
2788
2392
    if pass_func is None:
2789
2393
        pass_func = conflict_pass
2790
2394
    new_conflicts = set()
2791
 
    pb = ui.ui_factory.nested_progress_bar()
2792
2395
    try:
2793
2396
        for n in range(10):
2794
2397
            pb.update('Resolution pass', n+1, 10)
2798
2401
            new_conflicts.update(pass_func(tt, conflicts))
2799
2402
        raise MalformedTransform(conflicts=conflicts)
2800
2403
    finally:
2801
 
        pb.finished()
 
2404
        pb.clear()
2802
2405
 
2803
2406
 
2804
2407
def conflict_pass(tt, conflicts, path_tree=None):
2823
2426
                existing_file, new_file = conflict[1], conflict[2]
2824
2427
            new_name = tt.final_name(existing_file)+'.moved'
2825
2428
            tt.adjust_path(new_name, final_parent, existing_file)
2826
 
            new_conflicts.add((c_type, 'Moved existing file to',
 
2429
            new_conflicts.add((c_type, 'Moved existing file to', 
2827
2430
                               existing_file, new_file))
2828
2431
        elif c_type == 'parent loop':
2829
2432
            # break the loop by undoing one of the ops that caused the loop
2833
2436
            new_conflicts.add((c_type, 'Cancelled move', cur,
2834
2437
                               tt.final_parent(cur),))
2835
2438
            tt.adjust_path(tt.final_name(cur), tt.get_tree_parent(cur), cur)
2836
 
 
 
2439
            
2837
2440
        elif c_type == 'missing parent':
2838
2441
            trans_id = conflict[1]
2839
2442
            try:
2840
2443
                tt.cancel_deletion(trans_id)
2841
 
                new_conflicts.add(('deleting parent', 'Not deleting',
 
2444
                new_conflicts.add(('deleting parent', 'Not deleting', 
2842
2445
                                   trans_id))
2843
2446
            except KeyError:
2844
2447
                create = True
2853
2456
                        # special-case the other tree root (move its
2854
2457
                        # children to current root)
2855
2458
                        if entry.parent_id is None:
2856
 
                            create = False
 
2459
                            create=False
2857
2460
                            moved = _reparent_transform_children(
2858
2461
                                tt, trans_id, tt.root)
2859
2462
                            for child in moved:
2909
2512
        if len(conflict) == 3:
2910
2513
            yield Conflict.factory(c_type, action=action, path=modified_path,
2911
2514
                                     file_id=modified_id)
2912
 
 
 
2515
             
2913
2516
        else:
2914
2517
            conflicting_path = fp.get_path(conflict[3])
2915
2518
            conflicting_id = tt.final_file_id(conflict[3])
2916
2519
            yield Conflict.factory(c_type, action=action, path=modified_path,
2917
 
                                   file_id=modified_id,
 
2520
                                   file_id=modified_id, 
2918
2521
                                   conflict_path=conflicting_path,
2919
2522
                                   conflict_file_id=conflicting_id)
2920
2523
 
2927
2530
        self.pending_deletions = []
2928
2531
 
2929
2532
    def rename(self, from_, to):
2930
 
        """Rename a file from one path to another."""
 
2533
        """Rename a file from one path to another.  Functions like os.rename"""
2931
2534
        try:
2932
 
            osutils.rename(from_, to)
2933
 
        except (IOError, OSError), e:
 
2535
            os.rename(from_, to)
 
2536
        except OSError, e:
2934
2537
            if e.errno in (errno.EEXIST, errno.ENOTEMPTY):
2935
2538
                raise errors.FileExists(to, str(e))
2936
 
            # normal OSError doesn't include filenames so it's hard to see where
2937
 
            # the problem is, see https://bugs.launchpad.net/bzr/+bug/491763
2938
 
            raise errors.TransformRenameFailed(from_, to, str(e), e.errno)
 
2539
            raise
2939
2540
        self.past_renames.append((from_, to))
2940
2541
 
2941
2542
    def pre_delete(self, from_, to):
2951
2552
    def rollback(self):
2952
2553
        """Reverse all renames that have been performed"""
2953
2554
        for from_, to in reversed(self.past_renames):
2954
 
            try:
2955
 
                osutils.rename(to, from_)
2956
 
            except (OSError, IOError), e:
2957
 
                raise errors.TransformRenameFailed(to, from_, str(e), e.errno)                
 
2555
            os.rename(to, from_)
2958
2556
        # after rollback, don't reuse _FileMover
2959
2557
        past_renames = None
2960
2558
        pending_deletions = None