/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: Martin Pool
  • Date: 2008-10-20 23:58:12 UTC
  • mto: This revision was merged to the branch mainline in revision 3787.
  • Revision ID: mbp@sourcefrog.net-20081020235812-itg90mk0u4dez92z
lp-upload-release now handles names like bzr-1.8.tar.gz

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
26
    delta,
29
27
    errors,
30
28
    inventory,
31
 
    multiparent,
32
29
    osutils,
33
30
    revision as _mod_revision,
34
 
    ui,
35
31
    )
36
32
""")
37
33
from bzrlib.errors import (DuplicateKey, MalformedTransform, NoSuchFile,
38
 
                           ReusingTransform, CantMoveRoot,
 
34
                           ReusingTransform, NotVersionedError, CantMoveRoot,
39
35
                           ExistingLimbo, ImmortalLimbo, NoFinalPath,
40
36
                           UnableCreateSymlink)
41
 
from bzrlib.filters import filtered_output_bytes, ContentFilterContext
42
37
from bzrlib.inventory import InventoryEntry
43
38
from bzrlib.osutils import (
44
39
    delete_any,
50
45
    splitpath,
51
46
    supports_executable,
52
47
)
53
 
from bzrlib.progress import ProgressPhase
 
48
from bzrlib.progress import DummyProgress, ProgressPhase
54
49
from bzrlib.symbol_versioning import (
55
50
        deprecated_function,
56
51
        deprecated_in,
78
73
 
79
74
 
80
75
class TreeTransformBase(object):
81
 
    """The base class for TreeTransform and its kin."""
 
76
    """The base class for TreeTransform and TreeTransformBase"""
82
77
 
83
 
    def __init__(self, tree, pb=None,
 
78
    def __init__(self, tree, limbodir, pb=DummyProgress(),
84
79
                 case_sensitive=True):
85
80
        """Constructor.
86
81
 
87
82
        :param tree: The tree that will be transformed, but not necessarily
88
83
            the output tree.
89
 
        :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
90
87
        :param case_sensitive: If True, the target of the transform is
91
88
            case sensitive, not just case preserving.
92
89
        """
93
90
        object.__init__(self)
94
91
        self._tree = tree
 
92
        self._limbodir = limbodir
 
93
        self._deletiondir = None
95
94
        self._id_number = 0
96
95
        # mapping of trans_id -> new basename
97
96
        self._new_name = {}
99
98
        self._new_parent = {}
100
99
        # mapping of trans_id with new contents -> new file_kind
101
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()
102
110
        # Set of trans_ids whose contents will be removed
103
111
        self._removed_contents = set()
104
112
        # Mapping of trans_id -> new execute-bit value
111
119
        self._non_present_ids = {}
112
120
        # Mapping of new file_id -> trans_id
113
121
        self._r_new_id = {}
114
 
        # Set of trans_ids that will be removed
 
122
        # Set of file_ids that will be removed
115
123
        self._removed_id = set()
116
124
        # Mapping of path in old tree -> trans_id
117
125
        self._tree_path_ids = {}
118
126
        # Mapping trans_id -> path in old tree
119
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 = {}
120
132
        # The trans_id that will be used as the tree root
121
133
        root_id = tree.get_root_id()
122
134
        if root_id is not None:
132
144
        # A counter of how many files have been renamed
133
145
        self.rename_count = 0
134
146
 
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
147
    def __get_root(self):
147
148
        return self._new_root
148
149
 
149
150
    root = property(__get_root)
150
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
 
151
183
    def _assign_id(self):
152
184
        """Produce a new tranform id"""
153
185
        new_id = "new-%s" % self._id_number
163
195
 
164
196
    def adjust_path(self, name, parent, trans_id):
165
197
        """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
198
        if trans_id == self._new_root:
169
199
            raise CantMoveRoot
 
200
        previous_parent = self._new_parent.get(trans_id)
 
201
        previous_name = self._new_name.get(trans_id)
170
202
        self._new_name[trans_id] = name
171
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)
172
231
 
173
232
    def adjust_root_path(self, name, parent):
174
233
        """Emulate moving the root by moving all children, instead.
175
 
 
 
234
        
176
235
        We do this by undoing the association of root's transaction id with the
177
236
        current tree.  This allows us to create a new directory with that
178
 
        transaction id.  We unversion the root directory and version the
 
237
        transaction id.  We unversion the root directory and version the 
179
238
        physically new directory, and hope someone versions the tree root
180
239
        later.
181
240
        """
184
243
        # force moving all children of root
185
244
        for child_id in self.iter_tree_children(old_root):
186
245
            if child_id != parent:
187
 
                self.adjust_path(self.final_name(child_id),
 
246
                self.adjust_path(self.final_name(child_id), 
188
247
                                 self.final_parent(child_id), child_id)
189
248
            file_id = self.final_file_id(child_id)
190
249
            if file_id is not None:
191
250
                self.unversion_file(child_id)
192
251
            self.version_file(file_id, child_id)
193
 
 
 
252
        
194
253
        # the physical root needs a new transaction id
195
254
        self._tree_path_ids.pop("")
196
255
        self._tree_id_paths.pop(old_root)
202
261
        self.version_file(old_root_file_id, old_root)
203
262
        self.unversion_file(self._new_root)
204
263
 
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
264
    def trans_id_tree_file_id(self, inventory_id):
267
265
        """Determine the transaction id of a working tree file.
268
 
 
 
266
        
269
267
        This reflects only files that already exist, not ones that will be
270
268
        added by transactions.
271
269
        """
297
295
            else:
298
296
                return self.trans_id_tree_file_id(file_id)
299
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
 
300
317
    def trans_id_tree_path(self, path):
301
318
        """Determine (and maybe set) the transaction ID for a tree path."""
302
319
        path = self.canonical_path(path)
312
329
            return ROOT_PARENT
313
330
        return self.trans_id_tree_path(os.path.dirname(path))
314
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
 
315
439
    def delete_contents(self, trans_id):
316
440
        """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
441
        self.tree_kind(trans_id)
320
442
        self._removed_contents.add(trans_id)
321
443
 
393
515
        new_ids.update(changed_kind)
394
516
        return sorted(FinalPaths(self).get_paths(new_ids))
395
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
 
396
534
    def final_kind(self, trans_id):
397
535
        """Determine the final file kind, after any changes applied.
398
 
 
 
536
        
399
537
        Raises NoSuchFile if the file does not exist/has no contents.
400
538
        (It is conceivable that a path would be created without the
401
539
        corresponding contents insertion command)
421
559
 
422
560
    def final_file_id(self, trans_id):
423
561
        """Determine the file id after any changes are applied, or None.
424
 
 
 
562
        
425
563
        None indicates that the file will not be versioned after changes are
426
564
        applied.
427
565
        """
466
604
 
467
605
    def by_parent(self):
468
606
        """Return a map of parent: children for known parents.
469
 
 
 
607
        
470
608
        Only new paths and parents of tree files with assigned ids are used.
471
609
        """
472
610
        by_parent = {}
473
611
        items = list(self._new_parent.iteritems())
474
 
        items.extend((t, self.final_parent(t)) for t in
 
612
        items.extend((t, self.final_parent(t)) for t in 
475
613
                      self._tree_id_paths.keys())
476
614
        for trans_id, parent_id in items:
477
615
            if parent_id not in by_parent:
505
643
        conflicts.extend(self._overwrite_conflicts())
506
644
        return conflicts
507
645
 
508
 
    def _check_malformed(self):
509
 
        conflicts = self.find_conflicts()
510
 
        if len(conflicts) != 0:
511
 
            raise MalformedTransform(conflicts=conflicts)
512
 
 
513
646
    def _add_tree_children(self):
514
647
        """Add all the children of all active parents to the known paths.
515
648
 
517
650
        removed.  This is a necessary first step in detecting conflicts.
518
651
        """
519
652
        parents = self.by_parent().keys()
520
 
        parents.extend([t for t in self._removed_contents if
 
653
        parents.extend([t for t in self._removed_contents if 
521
654
                        self.tree_kind(t) == 'directory'])
522
655
        for trans_id in self._removed_id:
523
656
            file_id = self.tree_file_id(trans_id)
531
664
            # ensure that all children are registered with the transaction
532
665
            list(self.iter_tree_children(parent_id))
533
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
 
534
687
    def has_named_child(self, by_parent, parent_id, name):
535
688
        try:
536
689
            children = by_parent[parent_id]
590
743
 
591
744
    def _improper_versioning(self):
592
745
        """Cannot version a file with no contents, or a bad type.
593
 
 
 
746
        
594
747
        However, existing entries with no contents are okay.
595
748
        """
596
749
        conflicts = []
606
759
 
607
760
    def _executability_conflicts(self):
608
761
        """Check for bad executability changes.
609
 
 
 
762
        
610
763
        Only versioned files may have their executability set, because
611
764
        1. only versioned entries can have executability under windows
612
765
        2. only files can be executable.  (The execute bit on a directory
711
864
            return True
712
865
        return False
713
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
 
714
911
    def _set_executability(self, path, trans_id):
715
912
        """Set the executability of versioned files """
716
913
        if supports_executable():
737
934
            self.version_file(file_id, trans_id)
738
935
        return trans_id
739
936
 
740
 
    def new_file(self, name, parent_id, contents, file_id=None,
 
937
    def new_file(self, name, parent_id, contents, file_id=None, 
741
938
                 executable=None):
742
939
        """Convenience method to create files.
743
 
 
 
940
        
744
941
        name is the name of the file to create.
745
942
        parent_id is the transaction id of the parent directory of the file.
746
943
        contents is an iterator of bytestrings, which will be used to produce
766
963
        """
767
964
        trans_id = self._new_entry(name, parent_id, file_id)
768
965
        self.create_directory(trans_id)
769
 
        return trans_id
 
966
        return trans_id 
770
967
 
771
968
    def new_symlink(self, name, parent_id, target, file_id=None):
772
969
        """Convenience method to create symbolic link.
773
 
 
 
970
        
774
971
        name is the name of the symlink to create.
775
972
        parent_id is the transaction id of the parent directory of the symlink.
776
973
        target is a bytestring of the target of the symlink.
922
1119
    def get_preview_tree(self):
923
1120
        """Return a tree representing the result of the transform.
924
1121
 
925
 
        The tree is a snapshot, and altering the TreeTransform will invalidate
926
 
        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.
927
1124
        """
928
1125
        return _PreviewTree(self)
929
1126
 
930
 
    def commit(self, branch, message, merge_parents=None, strict=False):
931
 
        """Commit the result of this TreeTransform to a branch.
932
 
 
933
 
        :param branch: The branch to commit to.
934
 
        :param message: The message to attach to the commit.
935
 
        :param merge_parents: Additional parents specified by pending merges.
936
 
        :return: The revision_id of the revision committed.
937
 
        """
938
 
        self._check_malformed()
939
 
        if strict:
940
 
            unversioned = set(self._new_contents).difference(set(self._new_id))
941
 
            for trans_id in unversioned:
942
 
                if self.final_file_id(trans_id) is None:
943
 
                    raise errors.StrictCommitFailed()
944
 
 
945
 
        revno, last_rev_id = branch.last_revision_info()
946
 
        if last_rev_id == _mod_revision.NULL_REVISION:
947
 
            if merge_parents is not None:
948
 
                raise ValueError('Cannot supply merge parents for first'
949
 
                                 ' commit.')
950
 
            parent_ids = []
951
 
        else:
952
 
            parent_ids = [last_rev_id]
953
 
            if merge_parents is not None:
954
 
                parent_ids.extend(merge_parents)
955
 
        if self._tree.get_revision_id() != last_rev_id:
956
 
            raise ValueError('TreeTransform not based on branch basis: %s' %
957
 
                             self._tree.get_revision_id())
958
 
        builder = branch.get_commit_builder(parent_ids)
959
 
        preview = self.get_preview_tree()
960
 
        list(builder.record_iter_changes(preview, last_rev_id,
961
 
                                         self.iter_changes()))
962
 
        builder.finish_inventory()
963
 
        revision_id = builder.commit(message)
964
 
        branch.set_last_revision_info(revno + 1, revision_id)
965
 
        return revision_id
966
 
 
967
 
    def _text_parent(self, trans_id):
968
 
        file_id = self.tree_file_id(trans_id)
969
 
        try:
970
 
            if file_id is None or self._tree.kind(file_id) != 'file':
971
 
                return None
972
 
        except errors.NoSuchFile:
973
 
            return None
974
 
        return file_id
975
 
 
976
 
    def _get_parents_texts(self, trans_id):
977
 
        """Get texts for compression parents of this file."""
978
 
        file_id = self._text_parent(trans_id)
979
 
        if file_id is None:
980
 
            return ()
981
 
        return (self._tree.get_file_text(file_id),)
982
 
 
983
 
    def _get_parents_lines(self, trans_id):
984
 
        """Get lines for compression parents of this file."""
985
 
        file_id = self._text_parent(trans_id)
986
 
        if file_id is None:
987
 
            return ()
988
 
        return (self._tree.get_file_lines(file_id),)
989
 
 
990
 
    def serialize(self, serializer):
991
 
        """Serialize this TreeTransform.
992
 
 
993
 
        :param serializer: A Serialiser like pack.ContainerSerializer.
994
 
        """
995
 
        new_name = dict((k, v.encode('utf-8')) for k, v in
996
 
                        self._new_name.items())
997
 
        new_executability = dict((k, int(v)) for k, v in
998
 
                                 self._new_executability.items())
999
 
        tree_path_ids = dict((k.encode('utf-8'), v)
1000
 
                             for k, v in self._tree_path_ids.items())
1001
 
        attribs = {
1002
 
            '_id_number': self._id_number,
1003
 
            '_new_name': new_name,
1004
 
            '_new_parent': self._new_parent,
1005
 
            '_new_executability': new_executability,
1006
 
            '_new_id': self._new_id,
1007
 
            '_tree_path_ids': tree_path_ids,
1008
 
            '_removed_id': list(self._removed_id),
1009
 
            '_removed_contents': list(self._removed_contents),
1010
 
            '_non_present_ids': self._non_present_ids,
1011
 
            }
1012
 
        yield serializer.bytes_record(bencode.bencode(attribs),
1013
 
                                      (('attribs',),))
1014
 
        for trans_id, kind in self._new_contents.items():
1015
 
            if kind == 'file':
1016
 
                lines = osutils.chunks_to_lines(
1017
 
                    self._read_file_chunks(trans_id))
1018
 
                parents = self._get_parents_lines(trans_id)
1019
 
                mpdiff = multiparent.MultiParent.from_lines(lines, parents)
1020
 
                content = ''.join(mpdiff.to_patch())
1021
 
            if kind == 'directory':
1022
 
                content = ''
1023
 
            if kind == 'symlink':
1024
 
                content = self._read_symlink_target(trans_id)
1025
 
            yield serializer.bytes_record(content, ((trans_id, kind),))
1026
 
 
1027
 
    def deserialize(self, records):
1028
 
        """Deserialize a stored TreeTransform.
1029
 
 
1030
 
        :param records: An iterable of (names, content) tuples, as per
1031
 
            pack.ContainerPushParser.
1032
 
        """
1033
 
        names, content = records.next()
1034
 
        attribs = bencode.bdecode(content)
1035
 
        self._id_number = attribs['_id_number']
1036
 
        self._new_name = dict((k, v.decode('utf-8'))
1037
 
                            for k, v in attribs['_new_name'].items())
1038
 
        self._new_parent = attribs['_new_parent']
1039
 
        self._new_executability = dict((k, bool(v)) for k, v in
1040
 
            attribs['_new_executability'].items())
1041
 
        self._new_id = attribs['_new_id']
1042
 
        self._r_new_id = dict((v, k) for k, v in self._new_id.items())
1043
 
        self._tree_path_ids = {}
1044
 
        self._tree_id_paths = {}
1045
 
        for bytepath, trans_id in attribs['_tree_path_ids'].items():
1046
 
            path = bytepath.decode('utf-8')
1047
 
            self._tree_path_ids[path] = trans_id
1048
 
            self._tree_id_paths[trans_id] = path
1049
 
        self._removed_id = set(attribs['_removed_id'])
1050
 
        self._removed_contents = set(attribs['_removed_contents'])
1051
 
        self._non_present_ids = attribs['_non_present_ids']
1052
 
        for ((trans_id, kind),), content in records:
1053
 
            if kind == 'file':
1054
 
                mpdiff = multiparent.MultiParent.from_patch(content)
1055
 
                lines = mpdiff.to_lines(self._get_parents_texts(trans_id))
1056
 
                self.create_file(lines, trans_id)
1057
 
            if kind == 'directory':
1058
 
                self.create_directory(trans_id)
1059
 
            if kind == 'symlink':
1060
 
                self.create_symlink(content.decode('utf-8'), trans_id)
1061
 
 
1062
 
 
1063
 
class DiskTreeTransform(TreeTransformBase):
1064
 
    """Tree transform storing its contents on disk."""
1065
 
 
1066
 
    def __init__(self, tree, limbodir, pb=None,
1067
 
                 case_sensitive=True):
1068
 
        """Constructor.
1069
 
        :param tree: The tree that will be transformed, but not necessarily
1070
 
            the output tree.
1071
 
        :param limbodir: A directory where new files can be stored until
1072
 
            they are installed in their proper places
1073
 
        :param pb: ignored
1074
 
        :param case_sensitive: If True, the target of the transform is
1075
 
            case sensitive, not just case preserving.
1076
 
        """
1077
 
        TreeTransformBase.__init__(self, tree, pb, case_sensitive)
1078
 
        self._limbodir = limbodir
1079
 
        self._deletiondir = None
1080
 
        # A mapping of transform ids to their limbo filename
1081
 
        self._limbo_files = {}
1082
 
        # A mapping of transform ids to a set of the transform ids of children
1083
 
        # that their limbo directory has
1084
 
        self._limbo_children = {}
1085
 
        # Map transform ids to maps of child filename to child transform id
1086
 
        self._limbo_children_names = {}
1087
 
        # List of transform ids that need to be renamed from limbo into place
1088
 
        self._needs_rename = set()
1089
 
        self._creation_mtime = None
1090
 
 
1091
 
    def finalize(self):
1092
 
        """Release the working tree lock, if held, clean up limbo dir.
1093
 
 
1094
 
        This is required if apply has not been invoked, but can be invoked
1095
 
        even after apply.
1096
 
        """
1097
 
        if self._tree is None:
1098
 
            return
1099
 
        try:
1100
 
            entries = [(self._limbo_name(t), t, k) for t, k in
1101
 
                       self._new_contents.iteritems()]
1102
 
            entries.sort(reverse=True)
1103
 
            for path, trans_id, kind in entries:
1104
 
                delete_any(path)
1105
 
            try:
1106
 
                delete_any(self._limbodir)
1107
 
            except OSError:
1108
 
                # We don't especially care *why* the dir is immortal.
1109
 
                raise ImmortalLimbo(self._limbodir)
1110
 
            try:
1111
 
                if self._deletiondir is not None:
1112
 
                    delete_any(self._deletiondir)
1113
 
            except OSError:
1114
 
                raise errors.ImmortalPendingDeletion(self._deletiondir)
1115
 
        finally:
1116
 
            TreeTransformBase.finalize(self)
1117
 
 
1118
 
    def _limbo_name(self, trans_id):
1119
 
        """Generate the limbo name of a file"""
1120
 
        limbo_name = self._limbo_files.get(trans_id)
1121
 
        if limbo_name is None:
1122
 
            limbo_name = self._generate_limbo_path(trans_id)
1123
 
            self._limbo_files[trans_id] = limbo_name
1124
 
        return limbo_name
1125
 
 
1126
 
    def _generate_limbo_path(self, trans_id):
1127
 
        """Generate a limbo path using the trans_id as the relative path.
1128
 
 
1129
 
        This is suitable as a fallback, and when the transform should not be
1130
 
        sensitive to the path encoding of the limbo directory.
1131
 
        """
1132
 
        self._needs_rename.add(trans_id)
1133
 
        return pathjoin(self._limbodir, trans_id)
1134
 
 
1135
 
    def adjust_path(self, name, parent, trans_id):
1136
 
        previous_parent = self._new_parent.get(trans_id)
1137
 
        previous_name = self._new_name.get(trans_id)
1138
 
        TreeTransformBase.adjust_path(self, name, parent, trans_id)
1139
 
        if (trans_id in self._limbo_files and
1140
 
            trans_id not in self._needs_rename):
1141
 
            self._rename_in_limbo([trans_id])
1142
 
            if previous_parent != parent:
1143
 
                self._limbo_children[previous_parent].remove(trans_id)
1144
 
            if previous_parent != parent or previous_name != name:
1145
 
                del self._limbo_children_names[previous_parent][previous_name]
1146
 
 
1147
 
    def _rename_in_limbo(self, trans_ids):
1148
 
        """Fix limbo names so that the right final path is produced.
1149
 
 
1150
 
        This means we outsmarted ourselves-- we tried to avoid renaming
1151
 
        these files later by creating them with their final names in their
1152
 
        final parents.  But now the previous name or parent is no longer
1153
 
        suitable, so we have to rename them.
1154
 
 
1155
 
        Even for trans_ids that have no new contents, we must remove their
1156
 
        entries from _limbo_files, because they are now stale.
1157
 
        """
1158
 
        for trans_id in trans_ids:
1159
 
            old_path = self._limbo_files.pop(trans_id)
1160
 
            if trans_id not in self._new_contents:
1161
 
                continue
1162
 
            new_path = self._limbo_name(trans_id)
1163
 
            osutils.rename(old_path, new_path)
1164
 
            for descendant in self._limbo_descendants(trans_id):
1165
 
                desc_path = self._limbo_files[descendant]
1166
 
                desc_path = new_path + desc_path[len(old_path):]
1167
 
                self._limbo_files[descendant] = desc_path
1168
 
 
1169
 
    def _limbo_descendants(self, trans_id):
1170
 
        """Return the set of trans_ids whose limbo paths descend from this."""
1171
 
        descendants = set(self._limbo_children.get(trans_id, []))
1172
 
        for descendant in list(descendants):
1173
 
            descendants.update(self._limbo_descendants(descendant))
1174
 
        return descendants
1175
 
 
1176
 
    def create_file(self, contents, trans_id, mode_id=None):
1177
 
        """Schedule creation of a new file.
1178
 
 
1179
 
        See also new_file.
1180
 
 
1181
 
        Contents is an iterator of strings, all of which will be written
1182
 
        to the target destination.
1183
 
 
1184
 
        New file takes the permissions of any existing file with that id,
1185
 
        unless mode_id is specified.
1186
 
        """
1187
 
        name = self._limbo_name(trans_id)
1188
 
        f = open(name, 'wb')
1189
 
        try:
1190
 
            try:
1191
 
                unique_add(self._new_contents, trans_id, 'file')
1192
 
            except:
1193
 
                # Clean up the file, it never got registered so
1194
 
                # TreeTransform.finalize() won't clean it up.
1195
 
                f.close()
1196
 
                os.unlink(name)
1197
 
                raise
1198
 
 
1199
 
            f.writelines(contents)
1200
 
        finally:
1201
 
            f.close()
1202
 
        self._set_mtime(name)
1203
 
        self._set_mode(trans_id, mode_id, S_ISREG)
1204
 
 
1205
 
    def _read_file_chunks(self, trans_id):
1206
 
        cur_file = open(self._limbo_name(trans_id), 'rb')
1207
 
        try:
1208
 
            return cur_file.readlines()
1209
 
        finally:
1210
 
            cur_file.close()
1211
 
 
1212
 
    def _read_symlink_target(self, trans_id):
1213
 
        return os.readlink(self._limbo_name(trans_id))
1214
 
 
1215
 
    def _set_mtime(self, path):
1216
 
        """All files that are created get the same mtime.
1217
 
 
1218
 
        This time is set by the first object to be created.
1219
 
        """
1220
 
        if self._creation_mtime is None:
1221
 
            self._creation_mtime = time.time()
1222
 
        os.utime(path, (self._creation_mtime, self._creation_mtime))
1223
 
 
1224
 
    def create_hardlink(self, path, trans_id):
1225
 
        """Schedule creation of a hard link"""
1226
 
        name = self._limbo_name(trans_id)
1227
 
        try:
1228
 
            os.link(path, name)
1229
 
        except OSError, e:
1230
 
            if e.errno != errno.EPERM:
1231
 
                raise
1232
 
            raise errors.HardLinkNotSupported(path)
1233
 
        try:
1234
 
            unique_add(self._new_contents, trans_id, 'file')
1235
 
        except:
1236
 
            # Clean up the file, it never got registered so
1237
 
            # TreeTransform.finalize() won't clean it up.
1238
 
            os.unlink(name)
1239
 
            raise
1240
 
 
1241
 
    def create_directory(self, trans_id):
1242
 
        """Schedule creation of a new directory.
1243
 
 
1244
 
        See also new_directory.
1245
 
        """
1246
 
        os.mkdir(self._limbo_name(trans_id))
1247
 
        unique_add(self._new_contents, trans_id, 'directory')
1248
 
 
1249
 
    def create_symlink(self, target, trans_id):
1250
 
        """Schedule creation of a new symbolic link.
1251
 
 
1252
 
        target is a bytestring.
1253
 
        See also new_symlink.
1254
 
        """
1255
 
        if has_symlinks():
1256
 
            os.symlink(target, self._limbo_name(trans_id))
1257
 
            unique_add(self._new_contents, trans_id, 'symlink')
1258
 
        else:
1259
 
            try:
1260
 
                path = FinalPaths(self).get_path(trans_id)
1261
 
            except KeyError:
1262
 
                path = None
1263
 
            raise UnableCreateSymlink(path=path)
1264
 
 
1265
 
    def cancel_creation(self, trans_id):
1266
 
        """Cancel the creation of new file contents."""
1267
 
        del self._new_contents[trans_id]
1268
 
        children = self._limbo_children.get(trans_id)
1269
 
        # if this is a limbo directory with children, move them before removing
1270
 
        # the directory
1271
 
        if children is not None:
1272
 
            self._rename_in_limbo(children)
1273
 
            del self._limbo_children[trans_id]
1274
 
            del self._limbo_children_names[trans_id]
1275
 
        delete_any(self._limbo_name(trans_id))
1276
 
 
1277
 
 
1278
 
class TreeTransform(DiskTreeTransform):
 
1127
 
 
1128
class TreeTransform(TreeTransformBase):
1279
1129
    """Represent a tree transformation.
1280
1130
 
1281
1131
    This object is designed to support incremental generation of the transform,
1340
1190
    FileMover does not delete files until it is sure that a rollback will not
1341
1191
    happen.
1342
1192
    """
1343
 
    def __init__(self, tree, pb=None):
 
1193
    def __init__(self, tree, pb=DummyProgress()):
1344
1194
        """Note: a tree_write lock is taken on the tree.
1345
1195
 
1346
1196
        Use TreeTransform.finalize() to release the lock (can be omitted if
1367
1217
            tree.unlock()
1368
1218
            raise
1369
1219
 
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,
 
1220
        TreeTransformBase.__init__(self, tree, limbodir, pb,
1375
1221
                                   tree.case_sensitive)
1376
1222
        self._deletiondir = deletiondir
1377
1223
 
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
1224
    def apply(self, no_conflicts=False, precomputed_delta=None, _mover=None):
1508
1225
        """Apply all changes to the inventory and filesystem.
1509
1226
 
1519
1236
        :param _mover: Supply an alternate FileMover, for testing
1520
1237
        """
1521
1238
        if not no_conflicts:
1522
 
            self._check_malformed()
 
1239
            conflicts = self.find_conflicts()
 
1240
            if len(conflicts) != 0:
 
1241
                raise MalformedTransform(conflicts=conflicts)
1523
1242
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1524
1243
        try:
1525
1244
            if precomputed_delta is None:
1629
1348
                child_pb.update('removing file', num, len(tree_paths))
1630
1349
                full_path = self._tree.abspath(path)
1631
1350
                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):
 
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:
1636
1355
                    try:
1637
1356
                        mover.rename(full_path, self._limbo_name(trans_id))
1638
1357
                    except OSError, e:
1684
1403
        return modified_paths
1685
1404
 
1686
1405
 
1687
 
class TransformPreview(DiskTreeTransform):
 
1406
class TransformPreview(TreeTransformBase):
1688
1407
    """A TreeTransform for generating preview trees.
1689
1408
 
1690
1409
    Unlike TreeTransform, this version works when the input tree is a
1692
1411
    unversioned files in the input tree.
1693
1412
    """
1694
1413
 
1695
 
    def __init__(self, tree, pb=None, case_sensitive=True):
 
1414
    def __init__(self, tree, pb=DummyProgress(), case_sensitive=True):
1696
1415
        tree.lock_read()
1697
1416
        limbodir = osutils.mkdtemp(prefix='bzr-limbo-')
1698
 
        DiskTreeTransform.__init__(self, tree, limbodir, pb, case_sensitive)
 
1417
        TreeTransformBase.__init__(self, tree, limbodir, pb, case_sensitive)
1699
1418
 
1700
1419
    def canonical_path(self, path):
1701
1420
        return path
1743
1462
        self._all_children_cache = {}
1744
1463
        self._path2trans_id_cache = {}
1745
1464
        self._final_name_cache = {}
1746
 
        self._iter_changes_cache = dict((c[0], c) for c in
1747
 
                                        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
1748
1470
 
1749
1471
    def _content_change(self, file_id):
1750
1472
        """Return True if the content of this file changed"""
1751
 
        changes = self._iter_changes_cache.get(file_id)
 
1473
        changes = self._changes(file_id)
1752
1474
        # changes[2] is true if the file content changed.  See
1753
1475
        # InterTree.iter_changes.
1754
1476
        return (changes is not None and changes[2])
1798
1520
            executable = self.is_executable(file_id, path)
1799
1521
        return kind, executable, None
1800
1522
 
1801
 
    def is_locked(self):
1802
 
        return False
1803
 
 
1804
1523
    def lock_read(self):
1805
1524
        # Perhaps in theory, this should lock the TreeTransform?
1806
 
        return self
 
1525
        pass
1807
1526
 
1808
1527
    def unlock(self):
1809
1528
        pass
1826
1545
    def __iter__(self):
1827
1546
        return iter(self.all_file_ids())
1828
1547
 
1829
 
    def _has_id(self, file_id, fallback_check):
 
1548
    def has_id(self, file_id):
1830
1549
        if file_id in self._transform._r_new_id:
1831
1550
            return True
1832
 
        elif file_id in set([self._transform.tree_file_id(trans_id) for
1833
 
            trans_id in self._transform._removed_id]):
 
1551
        elif file_id in self._transform._removed_id:
1834
1552
            return False
1835
1553
        else:
1836
 
            return fallback_check(file_id)
1837
 
 
1838
 
    def has_id(self, file_id):
1839
 
        return self._has_id(file_id, self._transform._tree.has_id)
1840
 
 
1841
 
    def has_or_had_id(self, file_id):
1842
 
        return self._has_id(file_id, self._transform._tree.has_or_had_id)
 
1554
            return self._transform._tree.has_id(file_id)
1843
1555
 
1844
1556
    def _path2trans_id(self, path):
1845
1557
        # We must not use None here, because that is a valid value to store.
1898
1610
            if self._transform.final_file_id(trans_id) is None:
1899
1611
                yield self._final_paths._determine_path(trans_id)
1900
1612
 
1901
 
    def _make_inv_entries(self, ordered_entries, specific_file_ids=None,
1902
 
        yield_parents=False):
 
1613
    def _make_inv_entries(self, ordered_entries, specific_file_ids):
1903
1614
        for trans_id, parent_file_id in ordered_entries:
1904
1615
            file_id = self._transform.final_file_id(trans_id)
1905
1616
            if file_id is None:
1931
1642
                ordered_ids.append((trans_id, parent_file_id))
1932
1643
        return ordered_ids
1933
1644
 
1934
 
    def iter_entries_by_dir(self, specific_file_ids=None, yield_parents=False):
 
1645
    def iter_entries_by_dir(self, specific_file_ids=None):
1935
1646
        # This may not be a maximally efficient implementation, but it is
1936
1647
        # reasonably straightforward.  An implementation that grafts the
1937
1648
        # TreeTransform changes onto the tree's iter_entries_by_dir results
1939
1650
        # position.
1940
1651
        ordered_ids = self._list_files_by_dir()
1941
1652
        for entry, trans_id in self._make_inv_entries(ordered_ids,
1942
 
            specific_file_ids, yield_parents=yield_parents):
1943
 
            yield unicode(self._final_paths.get_path(trans_id)), entry
1944
 
 
1945
 
    def _iter_entries_for_dir(self, dir_path):
1946
 
        """Return path, entry for items in a directory without recursing down."""
1947
 
        dir_file_id = self.path2id(dir_path)
1948
 
        ordered_ids = []
1949
 
        for file_id in self.iter_children(dir_file_id):
1950
 
            trans_id = self._transform.trans_id_file_id(file_id)
1951
 
            ordered_ids.append((trans_id, file_id))
1952
 
        for entry, trans_id in self._make_inv_entries(ordered_ids):
1953
 
            yield unicode(self._final_paths.get_path(trans_id)), entry
1954
 
 
1955
 
    def list_files(self, include_root=False, from_dir=None, recursive=True):
1956
 
        """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."""
1957
1658
        # XXX This should behave like WorkingTree.list_files, but is really
1958
1659
        # more like RevisionTree.list_files.
1959
 
        if recursive:
1960
 
            prefix = None
1961
 
            if from_dir:
1962
 
                prefix = from_dir + '/'
1963
 
            entries = self.iter_entries_by_dir()
1964
 
            for path, entry in entries:
1965
 
                if entry.name == '' and not include_root:
1966
 
                    continue
1967
 
                if prefix:
1968
 
                    if not path.startswith(prefix):
1969
 
                        continue
1970
 
                    path = path[len(prefix):]
1971
 
                yield path, 'V', entry.kind, entry.file_id, entry
1972
 
        else:
1973
 
            if from_dir is None and include_root is True:
1974
 
                root_entry = inventory.make_entry('directory', '',
1975
 
                    ROOT_PARENT, self.get_root_id())
1976
 
                yield '', 'V', 'directory', root_entry.file_id, root_entry
1977
 
            entries = self._iter_entries_for_dir(from_dir or '')
1978
 
            for path, entry in entries:
1979
 
                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
1980
1664
 
1981
1665
    def kind(self, file_id):
1982
1666
        trans_id = self._transform.trans_id_file_id(file_id)
1992
1676
    def get_file_mtime(self, file_id, path=None):
1993
1677
        """See Tree.get_file_mtime"""
1994
1678
        if not self._content_change(file_id):
1995
 
            return self._transform._tree.get_file_mtime(file_id)
 
1679
            return self._transform._tree.get_file_mtime(file_id, path)
1996
1680
        return self._stat_limbo_file(file_id).st_mtime
1997
1681
 
1998
1682
    def _file_size(self, entry, stat_value):
2052
1736
                statval = os.lstat(limbo_name)
2053
1737
                size = statval.st_size
2054
1738
                if not supports_executable():
2055
 
                    executable = False
 
1739
                    executable = None
2056
1740
                else:
2057
1741
                    executable = statval.st_mode & S_IEXEC
2058
1742
            else:
2059
1743
                size = None
2060
1744
                executable = None
2061
1745
            if kind == 'symlink':
2062
 
                link_or_sha1 = os.readlink(limbo_name).decode(osutils._fs_enc)
2063
 
        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)
2064
1749
        return kind, size, executable, link_or_sha1
2065
1750
 
2066
1751
    def iter_changes(self, from_tree, include_unchanged=False,
2068
1753
                      require_versioned=True, want_unversioned=False):
2069
1754
        """See InterTree.iter_changes.
2070
1755
 
2071
 
        This has a fast path that is only used when the from_tree matches
2072
 
        the transform tree, and no fancy options are supplied.
 
1756
        This implementation does not support include_unchanged, specific_files,
 
1757
        or want_unversioned.  extra_trees, require_versioned, and pb are
 
1758
        ignored.
2073
1759
        """
2074
 
        if (from_tree is not self._transform._tree or include_unchanged or
2075
 
            specific_files or want_unversioned):
 
1760
        if from_tree is not self._transform._tree:
2076
1761
            return tree.InterTree(from_tree, self).iter_changes(
2077
1762
                include_unchanged=include_unchanged,
2078
1763
                specific_files=specific_files,
2080
1765
                extra_trees=extra_trees,
2081
1766
                require_versioned=require_versioned,
2082
1767
                want_unversioned=want_unversioned)
 
1768
        if include_unchanged:
 
1769
            raise ValueError('include_unchanged is not supported')
 
1770
        if specific_files is not None:
 
1771
            raise ValueError('specific_files is not supported')
2083
1772
        if want_unversioned:
2084
1773
            raise ValueError('want_unversioned is not supported')
2085
1774
        return self._transform.iter_changes()
2092
1781
        name = self._transform._limbo_name(trans_id)
2093
1782
        return open(name, 'rb')
2094
1783
 
2095
 
    def get_file_with_stat(self, file_id, path=None):
2096
 
        return self.get_file(file_id, path), None
 
1784
    def get_file_text(self, file_id):
 
1785
        text_file = self.get_file(file_id)
 
1786
        try:
 
1787
            return text_file.read()
 
1788
        finally:
 
1789
            text_file.close()
2097
1790
 
2098
1791
    def annotate_iter(self, file_id,
2099
1792
                      default_revision=_mod_revision.CURRENT_REVISION):
2100
 
        changes = self._iter_changes_cache.get(file_id)
 
1793
        changes = self._changes(file_id)
2101
1794
        if changes is None:
2102
1795
            get_old = True
2103
1796
        else:
2115
1808
            return old_annotation
2116
1809
        if not changed_content:
2117
1810
            return old_annotation
2118
 
        # TODO: This is doing something similar to what WT.annotate_iter is
2119
 
        #       doing, however it fails slightly because it doesn't know what
2120
 
        #       the *other* revision_id is, so it doesn't know how to give the
2121
 
        #       other as the origin for some lines, they all get
2122
 
        #       'default_revision'
2123
 
        #       It would be nice to be able to use the new Annotator based
2124
 
        #       approach, as well.
2125
1811
        return annotate.reannotate([old_annotation],
2126
1812
                                   self.get_file(file_id).readlines(),
2127
1813
                                   default_revision)
2132
1818
            return self._transform._tree.get_symlink_target(file_id)
2133
1819
        trans_id = self._transform.trans_id_file_id(file_id)
2134
1820
        name = self._transform._limbo_name(trans_id)
2135
 
        return osutils.readlink(name)
 
1821
        return os.readlink(name)
2136
1822
 
2137
1823
    def walkdirs(self, prefix=''):
2138
1824
        pending = [self._transform.root]
2193
1879
        self.transform = transform
2194
1880
 
2195
1881
    def _determine_path(self, trans_id):
2196
 
        if (trans_id == self.transform.root or trans_id == ROOT_PARENT):
 
1882
        if trans_id == self.transform.root:
2197
1883
            return ""
2198
1884
        name = self.transform.final_name(trans_id)
2199
1885
        parent_id = self.transform.final_parent(trans_id)
2223
1909
def build_tree(tree, wt, accelerator_tree=None, hardlink=False,
2224
1910
               delta_from_tree=False):
2225
1911
    """Create working tree for a branch, using a TreeTransform.
2226
 
 
 
1912
    
2227
1913
    This function should be used on empty trees, having a tree root at most.
2228
1914
    (see merge and revert functionality for working with existing trees)
2229
1915
 
2230
1916
    Existing files are handled like so:
2231
 
 
 
1917
    
2232
1918
    - Existing bzrdirs take precedence over creating new items.  They are
2233
1919
      created as '%s.diverted' % name.
2234
1920
    - Otherwise, if the content on disk matches the content we are building,
2336
2022
                    executable = tree.is_executable(file_id, tree_path)
2337
2023
                    if executable:
2338
2024
                        tt.set_executability(executable, trans_id)
2339
 
                    trans_data = (trans_id, tree_path)
2340
 
                    deferred_contents.append((file_id, trans_data))
 
2025
                    deferred_contents.append((file_id, trans_id))
2341
2026
                else:
2342
2027
                    file_trans_id[file_id] = new_by_entry(tt, entry, parent_id,
2343
2028
                                                          tree)
2374
2059
def _create_files(tt, tree, desired_files, pb, offset, accelerator_tree,
2375
2060
                  hardlink):
2376
2061
    total = len(desired_files) + offset
2377
 
    wt = tt._tree
2378
2062
    if accelerator_tree is None:
2379
2063
        new_desired_files = desired_files
2380
2064
    else:
2381
2065
        iter = accelerator_tree.iter_changes(tree, include_unchanged=True)
2382
 
        unchanged = [(f, p[1]) for (f, p, c, v, d, n, k, e)
2383
 
                     in iter if not (c or e[0] != e[1])]
2384
 
        if accelerator_tree.supports_content_filtering():
2385
 
            unchanged = [(f, p) for (f, p) in unchanged
2386
 
                         if not accelerator_tree.iter_search_rules([p]).next()]
2387
 
        unchanged = dict(unchanged)
 
2066
        unchanged = dict((f, p[1]) for (f, p, c, v, d, n, k, e)
 
2067
                         in iter if not (c or e[0] != e[1]))
2388
2068
        new_desired_files = []
2389
2069
        count = 0
2390
 
        for file_id, (trans_id, tree_path) in desired_files:
 
2070
        for file_id, trans_id in desired_files:
2391
2071
            accelerator_path = unchanged.get(file_id)
2392
2072
            if accelerator_path is None:
2393
 
                new_desired_files.append((file_id, (trans_id, tree_path)))
 
2073
                new_desired_files.append((file_id, trans_id))
2394
2074
                continue
2395
2075
            pb.update('Adding file contents', count + offset, total)
2396
2076
            if hardlink:
2398
2078
                                   trans_id)
2399
2079
            else:
2400
2080
                contents = accelerator_tree.get_file(file_id, accelerator_path)
2401
 
                if wt.supports_content_filtering():
2402
 
                    filters = wt._content_filter_stack(tree_path)
2403
 
                    contents = filtered_output_bytes(contents, filters,
2404
 
                        ContentFilterContext(tree_path, tree))
2405
2081
                try:
2406
2082
                    tt.create_file(contents, trans_id)
2407
2083
                finally:
2408
 
                    try:
2409
 
                        contents.close()
2410
 
                    except AttributeError:
2411
 
                        # after filtering, contents may no longer be file-like
2412
 
                        pass
 
2084
                    contents.close()
2413
2085
            count += 1
2414
2086
        offset += count
2415
 
    for count, ((trans_id, tree_path), contents) in enumerate(
2416
 
            tree.iter_files_bytes(new_desired_files)):
2417
 
        if wt.supports_content_filtering():
2418
 
            filters = wt._content_filter_stack(tree_path)
2419
 
            contents = filtered_output_bytes(contents, filters,
2420
 
                ContentFilterContext(tree_path, tree))
 
2087
    for count, (trans_id, contents) in enumerate(tree.iter_files_bytes(
 
2088
                                                 new_desired_files)):
2421
2089
        tt.create_file(contents, trans_id)
2422
2090
        pb.update('Adding file contents', count + offset, total)
2423
2091
 
2483
2151
    if kind == 'file':
2484
2152
        contents = tree.get_file(entry.file_id).readlines()
2485
2153
        executable = tree.is_executable(entry.file_id)
2486
 
        return tt.new_file(name, parent_id, contents, entry.file_id,
 
2154
        return tt.new_file(name, parent_id, contents, entry.file_id, 
2487
2155
                           executable)
2488
2156
    elif kind in ('directory', 'tree-reference'):
2489
2157
        trans_id = tt.new_directory(name, parent_id, entry.file_id)
2490
2158
        if kind == 'tree-reference':
2491
2159
            tt.set_tree_reference(entry.reference_revision, trans_id)
2492
 
        return trans_id
 
2160
        return trans_id 
2493
2161
    elif kind == 'symlink':
2494
2162
        target = tree.get_symlink_target(entry.file_id)
2495
2163
        return tt.new_symlink(name, parent_id, target, entry.file_id)
2513
2181
        tt.create_directory(trans_id)
2514
2182
 
2515
2183
 
2516
 
def create_from_tree(tt, trans_id, tree, file_id, bytes=None,
2517
 
    filter_tree_path=None):
2518
 
    """Create new file contents according to tree contents.
2519
 
    
2520
 
    :param filter_tree_path: the tree path to use to lookup
2521
 
      content filters to apply to the bytes output in the working tree.
2522
 
      This only applies if the working tree supports content filtering.
2523
 
    """
 
2184
def create_from_tree(tt, trans_id, tree, file_id, bytes=None):
 
2185
    """Create new file contents according to tree contents."""
2524
2186
    kind = tree.kind(file_id)
2525
2187
    if kind == 'directory':
2526
2188
        tt.create_directory(trans_id)
2531
2193
                bytes = tree_file.readlines()
2532
2194
            finally:
2533
2195
                tree_file.close()
2534
 
        wt = tt._tree
2535
 
        if wt.supports_content_filtering() and filter_tree_path is not None:
2536
 
            filters = wt._content_filter_stack(filter_tree_path)
2537
 
            bytes = filtered_output_bytes(bytes, filters,
2538
 
                ContentFilterContext(filter_tree_path, tree))
2539
2196
        tt.create_file(bytes, trans_id)
2540
2197
    elif kind == "symlink":
2541
2198
        tt.create_symlink(tree.get_symlink_target(file_id), trans_id)
2585
2242
        if entry.kind != working_kind:
2586
2243
            contents_mod, meta_mod = True, False
2587
2244
        else:
2588
 
            cur_entry._read_tree_state(working_tree.id2path(file_id),
 
2245
            cur_entry._read_tree_state(working_tree.id2path(file_id), 
2589
2246
                                       working_tree)
2590
2247
            contents_mod, meta_mod = entry.detect_changes(cur_entry)
2591
2248
            cur_entry._forget_tree_state()
2593
2250
 
2594
2251
 
2595
2252
def revert(working_tree, target_tree, filenames, backups=False,
2596
 
           pb=None, change_reporter=None):
 
2253
           pb=DummyProgress(), change_reporter=None):
2597
2254
    """Revert a working tree's contents to those of a target tree."""
2598
2255
    target_tree.lock_read()
2599
 
    pb = ui.ui_factory.nested_progress_bar()
2600
2256
    tt = TreeTransform(working_tree, pb)
2601
2257
    try:
2602
2258
        pp = ProgressPhase("Revert phase", 3, pb)
2621
2277
def _prepare_revert_transform(working_tree, target_tree, tt, filenames,
2622
2278
                              backups, pp, basis_tree=None,
2623
2279
                              merge_modified=None):
 
2280
    pp.next_phase()
2624
2281
    child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2625
2282
    try:
2626
2283
        if merge_modified is None:
2630
2287
                                      merge_modified, basis_tree)
2631
2288
    finally:
2632
2289
        child_pb.finished()
 
2290
    pp.next_phase()
2633
2291
    child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2634
2292
    try:
2635
2293
        raw_conflicts = resolve_conflicts(tt, child_pb,
2728
2386
                    parent_trans = ROOT_PARENT
2729
2387
                else:
2730
2388
                    parent_trans = tt.trans_id_file_id(parent[1])
2731
 
                if parent[0] is None and versioned[0]:
2732
 
                    tt.adjust_root_path(name[1], parent_trans)
2733
 
                else:
2734
 
                    tt.adjust_path(name[1], parent_trans, trans_id)
 
2389
                tt.adjust_path(name[1], parent_trans, trans_id)
2735
2390
            if executable[0] != executable[1] and kind[1] == "file":
2736
2391
                tt.set_executability(executable[1], trans_id)
2737
 
        if working_tree.supports_content_filtering():
2738
 
            for index, ((trans_id, mode_id), bytes) in enumerate(
2739
 
                target_tree.iter_files_bytes(deferred_files)):
2740
 
                file_id = deferred_files[index][0]
2741
 
                # We're reverting a tree to the target tree so using the
2742
 
                # target tree to find the file path seems the best choice
2743
 
                # here IMO - Ian C 27/Oct/2009
2744
 
                filter_tree_path = target_tree.id2path(file_id)
2745
 
                filters = working_tree._content_filter_stack(filter_tree_path)
2746
 
                bytes = filtered_output_bytes(bytes, filters,
2747
 
                    ContentFilterContext(filter_tree_path, working_tree))
2748
 
                tt.create_file(bytes, trans_id, mode_id)
2749
 
        else:
2750
 
            for (trans_id, mode_id), bytes in target_tree.iter_files_bytes(
2751
 
                deferred_files):
2752
 
                tt.create_file(bytes, trans_id, mode_id)
2753
 
        tt.fixup_new_roots()
 
2392
        for (trans_id, mode_id), bytes in target_tree.iter_files_bytes(
 
2393
            deferred_files):
 
2394
            tt.create_file(bytes, trans_id, mode_id)
2754
2395
    finally:
2755
2396
        if basis_tree is not None:
2756
2397
            basis_tree.unlock()
2757
2398
    return merge_modified
2758
2399
 
2759
2400
 
2760
 
def resolve_conflicts(tt, pb=None, pass_func=None):
 
2401
def resolve_conflicts(tt, pb=DummyProgress(), pass_func=None):
2761
2402
    """Make many conflict-resolution attempts, but die if they fail"""
2762
2403
    if pass_func is None:
2763
2404
        pass_func = conflict_pass
2764
2405
    new_conflicts = set()
2765
 
    pb = ui.ui_factory.nested_progress_bar()
2766
2406
    try:
2767
2407
        for n in range(10):
2768
2408
            pb.update('Resolution pass', n+1, 10)
2772
2412
            new_conflicts.update(pass_func(tt, conflicts))
2773
2413
        raise MalformedTransform(conflicts=conflicts)
2774
2414
    finally:
2775
 
        pb.finished()
 
2415
        pb.clear()
2776
2416
 
2777
2417
 
2778
2418
def conflict_pass(tt, conflicts, path_tree=None):
2797
2437
                existing_file, new_file = conflict[1], conflict[2]
2798
2438
            new_name = tt.final_name(existing_file)+'.moved'
2799
2439
            tt.adjust_path(new_name, final_parent, existing_file)
2800
 
            new_conflicts.add((c_type, 'Moved existing file to',
 
2440
            new_conflicts.add((c_type, 'Moved existing file to', 
2801
2441
                               existing_file, new_file))
2802
2442
        elif c_type == 'parent loop':
2803
2443
            # break the loop by undoing one of the ops that caused the loop
2807
2447
            new_conflicts.add((c_type, 'Cancelled move', cur,
2808
2448
                               tt.final_parent(cur),))
2809
2449
            tt.adjust_path(tt.final_name(cur), tt.get_tree_parent(cur), cur)
2810
 
 
 
2450
            
2811
2451
        elif c_type == 'missing parent':
2812
2452
            trans_id = conflict[1]
2813
2453
            try:
2814
2454
                tt.cancel_deletion(trans_id)
2815
 
                new_conflicts.add(('deleting parent', 'Not deleting',
 
2455
                new_conflicts.add(('deleting parent', 'Not deleting', 
2816
2456
                                   trans_id))
2817
2457
            except KeyError:
2818
2458
                create = True
2827
2467
                        # special-case the other tree root (move its
2828
2468
                        # children to current root)
2829
2469
                        if entry.parent_id is None:
2830
 
                            create = False
 
2470
                            create=False
2831
2471
                            moved = _reparent_transform_children(
2832
2472
                                tt, trans_id, tt.root)
2833
2473
                            for child in moved:
2883
2523
        if len(conflict) == 3:
2884
2524
            yield Conflict.factory(c_type, action=action, path=modified_path,
2885
2525
                                     file_id=modified_id)
2886
 
 
 
2526
             
2887
2527
        else:
2888
2528
            conflicting_path = fp.get_path(conflict[3])
2889
2529
            conflicting_id = tt.final_file_id(conflict[3])
2890
2530
            yield Conflict.factory(c_type, action=action, path=modified_path,
2891
 
                                   file_id=modified_id,
 
2531
                                   file_id=modified_id, 
2892
2532
                                   conflict_path=conflicting_path,
2893
2533
                                   conflict_file_id=conflicting_id)
2894
2534
 
2901
2541
        self.pending_deletions = []
2902
2542
 
2903
2543
    def rename(self, from_, to):
2904
 
        """Rename a file from one path to another."""
 
2544
        """Rename a file from one path to another.  Functions like os.rename"""
2905
2545
        try:
2906
 
            osutils.rename(from_, to)
 
2546
            os.rename(from_, to)
2907
2547
        except OSError, e:
2908
2548
            if e.errno in (errno.EEXIST, errno.ENOTEMPTY):
2909
2549
                raise errors.FileExists(to, str(e))
2923
2563
    def rollback(self):
2924
2564
        """Reverse all renames that have been performed"""
2925
2565
        for from_, to in reversed(self.past_renames):
2926
 
            osutils.rename(to, from_)
 
2566
            os.rename(to, from_)
2927
2567
        # after rollback, don't reuse _FileMover
2928
2568
        past_renames = None
2929
2569
        pending_deletions = None