← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

  • Committer: Neil Martinsen-Burrell
  • Date: 2008-06-19 06:57:22 UTC
  • mto: (3505.1.1 ianc-integration)
  • mto: This revision was merged to the branch mainline in revision 3506.
  • Revision ID: nmb@wartburg.edu-20080619065722-dboa3ko7ap8dcf2p
Fix bug 228058: user names with @ signs should work

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
1
 
# Copyright (C) 2006-2011 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
16
 
 
17
 
from __future__ import absolute_import
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
18
16
 
19
17
import os
20
18
import errno
21
 
from stat import S_ISREG, S_IEXEC
22
 
import time
 
19
from stat import S_ISREG
 
20
import tempfile
23
21
 
 
22
from bzrlib.lazy_import import lazy_import
 
23
lazy_import(globals(), """
24
24
from bzrlib import (
25
 
    config as _mod_config,
 
25
    bzrdir,
 
26
    delta,
26
27
    errors,
27
 
    lazy_import,
28
 
    registry,
29
 
    trace,
30
 
    tree,
31
 
    )
32
 
lazy_import.lazy_import(globals(), """
33
 
from bzrlib import (
34
 
    annotate,
35
 
    bencode,
36
 
    controldir,
37
 
    commit,
38
 
    conflicts,
39
 
    delta,
40
28
    inventory,
41
 
    multiparent,
42
 
    osutils,
43
29
    revision as _mod_revision,
44
 
    ui,
45
 
    urlutils,
46
30
    )
47
 
from bzrlib.i18n import gettext
48
31
""")
49
 
from bzrlib.errors import (DuplicateKey, MalformedTransform,
50
 
                           ReusingTransform, CantMoveRoot,
51
 
                           ImmortalLimbo, NoFinalPath,
 
32
from bzrlib.errors import (DuplicateKey, MalformedTransform, NoSuchFile,
 
33
                           ReusingTransform, NotVersionedError, CantMoveRoot,
 
34
                           ExistingLimbo, ImmortalLimbo, NoFinalPath,
52
35
                           UnableCreateSymlink)
53
 
from bzrlib.filters import filtered_output_bytes, ContentFilterContext
54
 
from bzrlib.mutabletree import MutableTree
55
 
from bzrlib.osutils import (
56
 
    delete_any,
57
 
    file_kind,
58
 
    has_symlinks,
59
 
    pathjoin,
60
 
    sha_file,
61
 
    splitpath,
62
 
    )
63
 
from bzrlib.progress import ProgressPhase
 
36
from bzrlib.inventory import InventoryEntry
 
37
from bzrlib.osutils import (file_kind, supports_executable, pathjoin, lexists,
 
38
                            delete_any, has_symlinks)
 
39
from bzrlib.progress import DummyProgress, ProgressPhase
64
40
from bzrlib.symbol_versioning import (
65
 
    deprecated_function,
66
 
    deprecated_in,
67
 
    deprecated_method,
68
 
    )
 
41
        deprecated_function,
 
42
        )
 
43
from bzrlib.trace import mutter, warning
 
44
from bzrlib import tree
 
45
import bzrlib.ui
 
46
import bzrlib.urlutils as urlutils
69
47
 
70
48
 
71
49
ROOT_PARENT = "root-parent"
72
50
 
 
51
 
73
52
def unique_add(map, key, value):
74
53
    if key in map:
75
54
        raise DuplicateKey(key=key)
76
55
    map[key] = value
77
56
 
78
57
 
79
 
 
80
58
class _TransformResults(object):
81
59
    def __init__(self, modified_paths, rename_count):
82
60
        object.__init__(self)
85
63
 
86
64
 
87
65
class TreeTransformBase(object):
88
 
    """The base class for TreeTransform and its kin."""
 
66
    """The base class for TreeTransform and TreeTransformBase"""
89
67
 
90
 
    def __init__(self, tree, pb=None,
 
68
    def __init__(self, tree, limbodir, pb=DummyProgress(),
91
69
                 case_sensitive=True):
92
70
        """Constructor.
93
71
 
94
72
        :param tree: The tree that will be transformed, but not necessarily
95
73
            the output tree.
96
 
        :param pb: ignored
 
74
        :param limbodir: A directory where new files can be stored until
 
75
            they are installed in their proper places
 
76
        :param pb: A ProgressBar indicating how much progress is being made
97
77
        :param case_sensitive: If True, the target of the transform is
98
78
            case sensitive, not just case preserving.
99
79
        """
100
80
        object.__init__(self)
101
81
        self._tree = tree
 
82
        self._limbodir = limbodir
 
83
        self._deletiondir = None
102
84
        self._id_number = 0
103
85
        # mapping of trans_id -> new basename
104
86
        self._new_name = {}
106
88
        self._new_parent = {}
107
89
        # mapping of trans_id with new contents -> new file_kind
108
90
        self._new_contents = {}
109
 
        # mapping of trans_id => (sha1 of content, stat_value)
110
 
        self._observed_sha1s = {}
 
91
        # A mapping of transform ids to their limbo filename
 
92
        self._limbo_files = {}
 
93
        # A mapping of transform ids to a set of the transform ids of children
 
94
        # that their limbo directory has
 
95
        self._limbo_children = {}
 
96
        # Map transform ids to maps of child filename to child transform id
 
97
        self._limbo_children_names = {}
 
98
        # List of transform ids that need to be renamed from limbo into place
 
99
        self._needs_rename = set()
111
100
        # Set of trans_ids whose contents will be removed
112
101
        self._removed_contents = set()
113
102
        # Mapping of trans_id -> new execute-bit value
120
109
        self._non_present_ids = {}
121
110
        # Mapping of new file_id -> trans_id
122
111
        self._r_new_id = {}
123
 
        # Set of trans_ids that will be removed
 
112
        # Set of file_ids that will be removed
124
113
        self._removed_id = set()
125
114
        # Mapping of path in old tree -> trans_id
126
115
        self._tree_path_ids = {}
127
116
        # Mapping trans_id -> path in old tree
128
117
        self._tree_id_paths = {}
 
118
        # Cache of realpath results, to speed up canonical_path
 
119
        self._realpaths = {}
 
120
        # Cache of relpath results, to speed up canonical_path
 
121
        self._relpaths = {}
129
122
        # The trans_id that will be used as the tree root
130
 
        root_id = tree.get_root_id()
131
 
        if root_id is not None:
132
 
            self._new_root = self.trans_id_tree_file_id(root_id)
133
 
        else:
134
 
            self._new_root = None
135
 
        # Indicator of whether the transform has been applied
 
123
        self._new_root = self.trans_id_tree_file_id(tree.get_root_id())
 
124
        # Indictor of whether the transform has been applied
136
125
        self._done = False
137
126
        # A progress bar
138
127
        self._pb = pb
141
130
        # A counter of how many files have been renamed
142
131
        self.rename_count = 0
143
132
 
144
 
    def __enter__(self):
145
 
        """Support Context Manager API."""
146
 
        return self
147
 
 
148
 
    def __exit__(self, exc_type, exc_val, exc_tb):
149
 
        """Support Context Manager API."""
150
 
        self.finalize()
151
 
 
152
 
    def finalize(self):
153
 
        """Release the working tree lock, if held.
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
 
        for hook in MutableTree.hooks['post_transform']:
161
 
            hook(self._tree, self)
162
 
        self._tree.unlock()
163
 
        self._tree = None
164
 
 
165
133
    def __get_root(self):
166
134
        return self._new_root
167
135
 
168
136
    root = property(__get_root)
169
137
 
 
138
    def finalize(self):
 
139
        """Release the working tree lock, if held, clean up limbo dir.
 
140
 
 
141
        This is required if apply has not been invoked, but can be invoked
 
142
        even after apply.
 
143
        """
 
144
        if self._tree is None:
 
145
            return
 
146
        try:
 
147
            entries = [(self._limbo_name(t), t, k) for t, k in
 
148
                       self._new_contents.iteritems()]
 
149
            entries.sort(reverse=True)
 
150
            for path, trans_id, kind in entries:
 
151
                if kind == "directory":
 
152
                    os.rmdir(path)
 
153
                else:
 
154
                    os.unlink(path)
 
155
            try:
 
156
                os.rmdir(self._limbodir)
 
157
            except OSError:
 
158
                # We don't especially care *why* the dir is immortal.
 
159
                raise ImmortalLimbo(self._limbodir)
 
160
            try:
 
161
                if self._deletiondir is not None:
 
162
                    os.rmdir(self._deletiondir)
 
163
            except OSError:
 
164
                raise errors.ImmortalPendingDeletion(self._deletiondir)
 
165
        finally:
 
166
            self._tree.unlock()
 
167
            self._tree = None
 
168
 
170
169
    def _assign_id(self):
171
170
        """Produce a new tranform id"""
172
171
        new_id = "new-%s" % self._id_number
182
181
 
183
182
    def adjust_path(self, name, parent, trans_id):
184
183
        """Change the path that is assigned to a transaction id."""
185
 
        if parent is None:
186
 
            raise ValueError("Parent trans-id may not be None")
187
184
        if trans_id == self._new_root:
188
185
            raise CantMoveRoot
 
186
        previous_parent = self._new_parent.get(trans_id)
 
187
        previous_name = self._new_name.get(trans_id)
189
188
        self._new_name[trans_id] = name
190
189
        self._new_parent[trans_id] = parent
 
190
        if (trans_id in self._limbo_files and
 
191
            trans_id not in self._needs_rename):
 
192
            self._rename_in_limbo([trans_id])
 
193
            self._limbo_children[previous_parent].remove(trans_id)
 
194
            del self._limbo_children_names[previous_parent][previous_name]
 
195
 
 
196
    def _rename_in_limbo(self, trans_ids):
 
197
        """Fix limbo names so that the right final path is produced.
 
198
 
 
199
        This means we outsmarted ourselves-- we tried to avoid renaming
 
200
        these files later by creating them with their final names in their
 
201
        final parents.  But now the previous name or parent is no longer
 
202
        suitable, so we have to rename them.
 
203
 
 
204
        Even for trans_ids that have no new contents, we must remove their
 
205
        entries from _limbo_files, because they are now stale.
 
206
        """
 
207
        for trans_id in trans_ids:
 
208
            old_path = self._limbo_files.pop(trans_id)
 
209
            if trans_id not in self._new_contents:
 
210
                continue
 
211
            new_path = self._limbo_name(trans_id)
 
212
            os.rename(old_path, new_path)
191
213
 
192
214
    def adjust_root_path(self, name, parent):
193
215
        """Emulate moving the root by moving all children, instead.
194
 
 
 
216
        
195
217
        We do this by undoing the association of root's transaction id with the
196
218
        current tree.  This allows us to create a new directory with that
197
 
        transaction id.  We unversion the root directory and version the
 
219
        transaction id.  We unversion the root directory and version the 
198
220
        physically new directory, and hope someone versions the tree root
199
221
        later.
200
222
        """
203
225
        # force moving all children of root
204
226
        for child_id in self.iter_tree_children(old_root):
205
227
            if child_id != parent:
206
 
                self.adjust_path(self.final_name(child_id),
 
228
                self.adjust_path(self.final_name(child_id), 
207
229
                                 self.final_parent(child_id), child_id)
208
230
            file_id = self.final_file_id(child_id)
209
231
            if file_id is not None:
210
232
                self.unversion_file(child_id)
211
233
            self.version_file(file_id, child_id)
212
 
 
 
234
        
213
235
        # the physical root needs a new transaction id
214
236
        self._tree_path_ids.pop("")
215
237
        self._tree_id_paths.pop(old_root)
221
243
        self.version_file(old_root_file_id, old_root)
222
244
        self.unversion_file(self._new_root)
223
245
 
224
 
    def fixup_new_roots(self):
225
 
        """Reinterpret requests to change the root directory
226
 
 
227
 
        Instead of creating a root directory, or moving an existing directory,
228
 
        all the attributes and children of the new root are applied to the
229
 
        existing root directory.
230
 
 
231
 
        This means that the old root trans-id becomes obsolete, so it is
232
 
        recommended only to invoke this after the root trans-id has become
233
 
        irrelevant.
234
 
 
235
 
        """
236
 
        new_roots = [k for k, v in self._new_parent.iteritems() if v ==
237
 
                     ROOT_PARENT]
238
 
        if len(new_roots) < 1:
239
 
            return
240
 
        if len(new_roots) != 1:
241
 
            raise ValueError('A tree cannot have two roots!')
242
 
        if self._new_root is None:
243
 
            self._new_root = new_roots[0]
244
 
            return
245
 
        old_new_root = new_roots[0]
246
 
        # unversion the new root's directory.
247
 
        if self.final_kind(self._new_root) is None:
248
 
            file_id = self.final_file_id(old_new_root)
249
 
        else:
250
 
            file_id = self.final_file_id(self._new_root)
251
 
        if old_new_root in self._new_id:
252
 
            self.cancel_versioning(old_new_root)
253
 
        else:
254
 
            self.unversion_file(old_new_root)
255
 
        # if, at this stage, root still has an old file_id, zap it so we can
256
 
        # stick a new one in.
257
 
        if (self.tree_file_id(self._new_root) is not None and
258
 
            self._new_root not in self._removed_id):
259
 
            self.unversion_file(self._new_root)
260
 
        if file_id is not None:
261
 
            self.version_file(file_id, self._new_root)
262
 
 
263
 
        # Now move children of new root into old root directory.
264
 
        # Ensure all children are registered with the transaction, but don't
265
 
        # use directly-- some tree children have new parents
266
 
        list(self.iter_tree_children(old_new_root))
267
 
        # Move all children of new root into old root directory.
268
 
        for child in self.by_parent().get(old_new_root, []):
269
 
            self.adjust_path(self.final_name(child), self._new_root, child)
270
 
 
271
 
        # Ensure old_new_root has no directory.
272
 
        if old_new_root in self._new_contents:
273
 
            self.cancel_creation(old_new_root)
274
 
        else:
275
 
            self.delete_contents(old_new_root)
276
 
 
277
 
        # prevent deletion of root directory.
278
 
        if self._new_root in self._removed_contents:
279
 
            self.cancel_deletion(self._new_root)
280
 
 
281
 
        # destroy path info for old_new_root.
282
 
        del self._new_parent[old_new_root]
283
 
        del self._new_name[old_new_root]
284
 
 
285
246
    def trans_id_tree_file_id(self, inventory_id):
286
247
        """Determine the transaction id of a working tree file.
287
 
 
 
248
        
288
249
        This reflects only files that already exist, not ones that will be
289
250
        added by transactions.
290
251
        """
291
 
        if inventory_id is None:
292
 
            raise ValueError('None is not a valid file id')
293
252
        path = self._tree.id2path(inventory_id)
294
253
        return self.trans_id_tree_path(path)
295
254
 
299
258
        a transaction has been unversioned, it is deliberately still returned.
300
259
        (this will likely lead to an unversioned parent conflict.)
301
260
        """
302
 
        if file_id is None:
303
 
            raise ValueError('None is not a valid file id')
304
261
        if file_id in self._r_new_id and self._r_new_id[file_id] is not None:
305
262
            return self._r_new_id[file_id]
306
 
        else:
307
 
            try:
308
 
                self._tree.iter_entries_by_dir([file_id]).next()
309
 
            except StopIteration:
310
 
                if file_id in self._non_present_ids:
311
 
                    return self._non_present_ids[file_id]
312
 
                else:
313
 
                    trans_id = self._assign_id()
314
 
                    self._non_present_ids[file_id] = trans_id
315
 
                    return trans_id
316
 
            else:
317
 
                return self.trans_id_tree_file_id(file_id)
 
263
        elif file_id in self._tree.inventory:
 
264
            return self.trans_id_tree_file_id(file_id)
 
265
        elif file_id in self._non_present_ids:
 
266
            return self._non_present_ids[file_id]
 
267
        else:
 
268
            trans_id = self._assign_id()
 
269
            self._non_present_ids[file_id] = trans_id
 
270
            return trans_id
 
271
 
 
272
    def canonical_path(self, path):
 
273
        """Get the canonical tree-relative path"""
 
274
        # don't follow final symlinks
 
275
        abs = self._tree.abspath(path)
 
276
        if abs in self._relpaths:
 
277
            return self._relpaths[abs]
 
278
        dirname, basename = os.path.split(abs)
 
279
        if dirname not in self._realpaths:
 
280
            self._realpaths[dirname] = os.path.realpath(dirname)
 
281
        dirname = self._realpaths[dirname]
 
282
        abs = pathjoin(dirname, basename)
 
283
        if dirname in self._relpaths:
 
284
            relpath = pathjoin(self._relpaths[dirname], basename)
 
285
            relpath = relpath.rstrip('/\\')
 
286
        else:
 
287
            relpath = self._tree.relpath(abs)
 
288
        self._relpaths[abs] = relpath
 
289
        return relpath
318
290
 
319
291
    def trans_id_tree_path(self, path):
320
292
        """Determine (and maybe set) the transaction ID for a tree path."""
331
303
            return ROOT_PARENT
332
304
        return self.trans_id_tree_path(os.path.dirname(path))
333
305
 
 
306
    def create_file(self, contents, trans_id, mode_id=None):
 
307
        """Schedule creation of a new file.
 
308
 
 
309
        See also new_file.
 
310
        
 
311
        Contents is an iterator of strings, all of which will be written
 
312
        to the target destination.
 
313
 
 
314
        New file takes the permissions of any existing file with that id,
 
315
        unless mode_id is specified.
 
316
        """
 
317
        name = self._limbo_name(trans_id)
 
318
        f = open(name, 'wb')
 
319
        try:
 
320
            try:
 
321
                unique_add(self._new_contents, trans_id, 'file')
 
322
            except:
 
323
                # Clean up the file, it never got registered so
 
324
                # TreeTransform.finalize() won't clean it up.
 
325
                f.close()
 
326
                os.unlink(name)
 
327
                raise
 
328
 
 
329
            f.writelines(contents)
 
330
        finally:
 
331
            f.close()
 
332
        self._set_mode(trans_id, mode_id, S_ISREG)
 
333
 
 
334
    def _set_mode(self, trans_id, mode_id, typefunc):
 
335
        """Set the mode of new file contents.
 
336
        The mode_id is the existing file to get the mode from (often the same
 
337
        as trans_id).  The operation is only performed if there's a mode match
 
338
        according to typefunc.
 
339
        """
 
340
        if mode_id is None:
 
341
            mode_id = trans_id
 
342
        try:
 
343
            old_path = self._tree_id_paths[mode_id]
 
344
        except KeyError:
 
345
            return
 
346
        try:
 
347
            mode = os.stat(self._tree.abspath(old_path)).st_mode
 
348
        except OSError, e:
 
349
            if e.errno == errno.ENOENT:
 
350
                return
 
351
            else:
 
352
                raise
 
353
        if typefunc(mode):
 
354
            os.chmod(self._limbo_name(trans_id), mode)
 
355
 
 
356
    def create_hardlink(self, path, trans_id):
 
357
        """Schedule creation of a hard link"""
 
358
        name = self._limbo_name(trans_id)
 
359
        try:
 
360
            os.link(path, name)
 
361
        except OSError, e:
 
362
            if e.errno != errno.EPERM:
 
363
                raise
 
364
            raise errors.HardLinkNotSupported(path)
 
365
        try:
 
366
            unique_add(self._new_contents, trans_id, 'file')
 
367
        except:
 
368
            # Clean up the file, it never got registered so
 
369
            # TreeTransform.finalize() won't clean it up.
 
370
            os.unlink(name)
 
371
            raise
 
372
 
 
373
    def create_directory(self, trans_id):
 
374
        """Schedule creation of a new directory.
 
375
        
 
376
        See also new_directory.
 
377
        """
 
378
        os.mkdir(self._limbo_name(trans_id))
 
379
        unique_add(self._new_contents, trans_id, 'directory')
 
380
 
 
381
    def create_symlink(self, target, trans_id):
 
382
        """Schedule creation of a new symbolic link.
 
383
 
 
384
        target is a bytestring.
 
385
        See also new_symlink.
 
386
        """
 
387
        if has_symlinks():
 
388
            os.symlink(target, self._limbo_name(trans_id))
 
389
            unique_add(self._new_contents, trans_id, 'symlink')
 
390
        else:
 
391
            try:
 
392
                path = FinalPaths(self).get_path(trans_id)
 
393
            except KeyError:
 
394
                path = None
 
395
            raise UnableCreateSymlink(path=path)
 
396
 
 
397
    def cancel_creation(self, trans_id):
 
398
        """Cancel the creation of new file contents."""
 
399
        del self._new_contents[trans_id]
 
400
        children = self._limbo_children.get(trans_id)
 
401
        # if this is a limbo directory with children, move them before removing
 
402
        # the directory
 
403
        if children is not None:
 
404
            self._rename_in_limbo(children)
 
405
            del self._limbo_children[trans_id]
 
406
            del self._limbo_children_names[trans_id]
 
407
        delete_any(self._limbo_name(trans_id))
 
408
 
334
409
    def delete_contents(self, trans_id):
335
410
        """Schedule the contents of a path entry for deletion"""
336
 
        kind = self.tree_kind(trans_id)
337
 
        if kind is not None:
338
 
            self._removed_contents.add(trans_id)
 
411
        self.tree_kind(trans_id)
 
412
        self._removed_contents.add(trans_id)
339
413
 
340
414
    def cancel_deletion(self, trans_id):
341
415
        """Cancel a scheduled deletion"""
384
458
        """
385
459
        new_ids = set()
386
460
        if filesystem_only:
387
 
            stale_ids = self._needs_rename.difference(self._new_name)
388
 
            stale_ids.difference_update(self._new_parent)
389
 
            stale_ids.difference_update(self._new_contents)
390
 
            stale_ids.difference_update(self._new_id)
391
 
            needs_rename = self._needs_rename.difference(stale_ids)
392
 
            id_sets = (needs_rename, self._new_executability)
 
461
            id_sets = (self._needs_rename, self._new_executability)
393
462
        else:
394
463
            id_sets = (self._new_name, self._new_parent, self._new_contents,
395
464
                       self._new_id, self._new_executability)
397
466
            new_ids.update(id_set)
398
467
        return sorted(FinalPaths(self).get_paths(new_ids))
399
468
 
400
 
    def _inventory_altered(self):
401
 
        """Determine which trans_ids need new Inventory entries.
402
 
 
403
 
        An new entry is needed when anything that would be reflected by an
404
 
        inventory entry changes, including file name, file_id, parent file_id,
405
 
        file kind, and the execute bit.
406
 
 
407
 
        Some care is taken to return entries with real changes, not cases
408
 
        where the value is deleted and then restored to its original value,
409
 
        but some actually unchanged values may be returned.
410
 
 
411
 
        :returns: A list of (path, trans_id) for all items requiring an
412
 
            inventory change. Ordered by path.
 
469
    def tree_kind(self, trans_id):
 
470
        """Determine the file kind in the working tree.
 
471
 
 
472
        Raises NoSuchFile if the file does not exist
413
473
        """
414
 
        changed_ids = set()
415
 
        # Find entries whose file_ids are new (or changed).
416
 
        new_file_id = set(t for t in self._new_id
417
 
                          if self._new_id[t] != self.tree_file_id(t))
418
 
        for id_set in [self._new_name, self._new_parent, new_file_id,
419
 
                       self._new_executability]:
420
 
            changed_ids.update(id_set)
421
 
        # removing implies a kind change
422
 
        changed_kind = set(self._removed_contents)
423
 
        # so does adding
424
 
        changed_kind.intersection_update(self._new_contents)
425
 
        # Ignore entries that are already known to have changed.
426
 
        changed_kind.difference_update(changed_ids)
427
 
        #  to keep only the truly changed ones
428
 
        changed_kind = (t for t in changed_kind
429
 
                        if self.tree_kind(t) != self.final_kind(t))
430
 
        # all kind changes will alter the inventory
431
 
        changed_ids.update(changed_kind)
432
 
        # To find entries with changed parent_ids, find parents which existed,
433
 
        # but changed file_id.
434
 
        changed_file_id = set(t for t in new_file_id if t in self._removed_id)
435
 
        # Now add all their children to the set.
436
 
        for parent_trans_id in new_file_id:
437
 
            changed_ids.update(self.iter_tree_children(parent_trans_id))
438
 
        return sorted(FinalPaths(self).get_paths(changed_ids))
 
474
        path = self._tree_id_paths.get(trans_id)
 
475
        if path is None:
 
476
            raise NoSuchFile(None)
 
477
        try:
 
478
            return file_kind(self._tree.abspath(path))
 
479
        except OSError, e:
 
480
            if e.errno != errno.ENOENT:
 
481
                raise
 
482
            else:
 
483
                raise NoSuchFile(path)
439
484
 
440
485
    def final_kind(self, trans_id):
441
486
        """Determine the final file kind, after any changes applied.
442
 
 
443
 
        :return: None if the file does not exist/has no contents.  (It is
444
 
            conceivable that a path would be created without the corresponding
445
 
            contents insertion command)
 
487
        
 
488
        Raises NoSuchFile if the file does not exist/has no contents.
 
489
        (It is conceivable that a path would be created without the
 
490
        corresponding contents insertion command)
446
491
        """
447
492
        if trans_id in self._new_contents:
448
493
            return self._new_contents[trans_id]
449
494
        elif trans_id in self._removed_contents:
450
 
            return None
 
495
            raise NoSuchFile(None)
451
496
        else:
452
497
            return self.tree_kind(trans_id)
453
498
 
461
506
        # the file is old; the old id is still valid
462
507
        if self._new_root == trans_id:
463
508
            return self._tree.get_root_id()
464
 
        return self._tree.path2id(path)
 
509
        return self._tree.inventory.path2id(path)
465
510
 
466
511
    def final_file_id(self, trans_id):
467
512
        """Determine the file id after any changes are applied, or None.
468
 
 
 
513
        
469
514
        None indicates that the file will not be versioned after changes are
470
515
        applied.
471
516
        """
510
555
 
511
556
    def by_parent(self):
512
557
        """Return a map of parent: children for known parents.
513
 
 
 
558
        
514
559
        Only new paths and parents of tree files with assigned ids are used.
515
560
        """
516
561
        by_parent = {}
517
562
        items = list(self._new_parent.iteritems())
518
 
        items.extend((t, self.final_parent(t)) for t in
 
563
        items.extend((t, self.final_parent(t)) for t in 
519
564
                      self._tree_id_paths.keys())
520
565
        for trans_id, parent_id in items:
521
566
            if parent_id not in by_parent:
549
594
        conflicts.extend(self._overwrite_conflicts())
550
595
        return conflicts
551
596
 
552
 
    def _check_malformed(self):
553
 
        conflicts = self.find_conflicts()
554
 
        if len(conflicts) != 0:
555
 
            raise MalformedTransform(conflicts=conflicts)
556
 
 
557
597
    def _add_tree_children(self):
558
598
        """Add all the children of all active parents to the known paths.
559
599
 
561
601
        removed.  This is a necessary first step in detecting conflicts.
562
602
        """
563
603
        parents = self.by_parent().keys()
564
 
        parents.extend([t for t in self._removed_contents if
 
604
        parents.extend([t for t in self._removed_contents if 
565
605
                        self.tree_kind(t) == 'directory'])
566
606
        for trans_id in self._removed_id:
567
607
            file_id = self.tree_file_id(trans_id)
568
608
            if file_id is not None:
569
 
                if self._tree.stored_kind(file_id) == 'directory':
 
609
                if self._tree.inventory[file_id].kind == 'directory':
570
610
                    parents.append(trans_id)
571
611
            elif self.tree_kind(trans_id) == 'directory':
572
612
                parents.append(trans_id)
575
615
            # ensure that all children are registered with the transaction
576
616
            list(self.iter_tree_children(parent_id))
577
617
 
578
 
    def _has_named_child(self, name, parent_id, known_children):
579
 
        """Does a parent already have a name child.
580
 
 
581
 
        :param name: The searched for name.
582
 
 
583
 
        :param parent_id: The parent for which the check is made.
584
 
 
585
 
        :param known_children: The already known children. This should have
586
 
            been recently obtained from `self.by_parent.get(parent_id)`
587
 
            (or will be if None is passed).
588
 
        """
589
 
        if known_children is None:
590
 
            known_children = self.by_parent().get(parent_id, [])
591
 
        for child in known_children:
 
618
    def iter_tree_children(self, parent_id):
 
619
        """Iterate through the entry's tree children, if any"""
 
620
        try:
 
621
            path = self._tree_id_paths[parent_id]
 
622
        except KeyError:
 
623
            return
 
624
        try:
 
625
            children = os.listdir(self._tree.abspath(path))
 
626
        except OSError, e:
 
627
            if e.errno not in (errno.ENOENT, errno.ESRCH, errno.ENOTDIR):
 
628
                raise
 
629
            return
 
630
            
 
631
        for child in children:
 
632
            childpath = joinpath(path, child)
 
633
            if self._tree.is_control_filename(childpath):
 
634
                continue
 
635
            yield self.trans_id_tree_path(childpath)
 
636
 
 
637
    def has_named_child(self, by_parent, parent_id, name):
 
638
        try:
 
639
            children = by_parent[parent_id]
 
640
        except KeyError:
 
641
            children = []
 
642
        for child in children:
592
643
            if self.final_name(child) == name:
593
644
                return True
594
 
        parent_path = self._tree_id_paths.get(parent_id, None)
595
 
        if parent_path is None:
596
 
            # No parent... no children
 
645
        try:
 
646
            path = self._tree_id_paths[parent_id]
 
647
        except KeyError:
597
648
            return False
598
 
        child_path = joinpath(parent_path, name)
599
 
        child_id = self._tree_path_ids.get(child_path, None)
 
649
        childpath = joinpath(path, name)
 
650
        child_id = self._tree_path_ids.get(childpath)
600
651
        if child_id is None:
601
 
            # Not known by the tree transform yet, check the filesystem
602
 
            return osutils.lexists(self._tree.abspath(child_path))
 
652
            return lexists(self._tree.abspath(childpath))
603
653
        else:
604
 
            raise AssertionError('child_id is missing: %s, %s, %s'
605
 
                                 % (name, parent_id, child_id))
606
 
 
607
 
    def _available_backup_name(self, name, target_id):
608
 
        """Find an available backup name.
609
 
 
610
 
        :param name: The basename of the file.
611
 
 
612
 
        :param target_id: The directory trans_id where the backup should 
613
 
            be placed.
614
 
        """
615
 
        known_children = self.by_parent().get(target_id, [])
616
 
        return osutils.available_backup_name(
617
 
            name,
618
 
            lambda base: self._has_named_child(
619
 
                base, target_id, known_children))
 
654
            if self.final_parent(child_id) != parent_id:
 
655
                return False
 
656
            if child_id in self._removed_contents:
 
657
                # XXX What about dangling file-ids?
 
658
                return False
 
659
            else:
 
660
                return True
620
661
 
621
662
    def _parent_loops(self):
622
663
        """No entry should be its own ancestor"""
624
665
        for trans_id in self._new_parent:
625
666
            seen = set()
626
667
            parent_id = trans_id
627
 
            while parent_id != ROOT_PARENT:
 
668
            while parent_id is not ROOT_PARENT:
628
669
                seen.add(parent_id)
629
670
                try:
630
671
                    parent_id = self.final_parent(parent_id)
640
681
        """If parent directories are versioned, children must be versioned."""
641
682
        conflicts = []
642
683
        for parent_id, children in by_parent.iteritems():
643
 
            if parent_id == ROOT_PARENT:
 
684
            if parent_id is ROOT_PARENT:
644
685
                continue
645
686
            if self.final_file_id(parent_id) is not None:
646
687
                continue
652
693
 
653
694
    def _improper_versioning(self):
654
695
        """Cannot version a file with no contents, or a bad type.
655
 
 
 
696
        
656
697
        However, existing entries with no contents are okay.
657
698
        """
658
699
        conflicts = []
659
700
        for trans_id in self._new_id.iterkeys():
660
 
            kind = self.final_kind(trans_id)
661
 
            if kind is None:
 
701
            try:
 
702
                kind = self.final_kind(trans_id)
 
703
            except NoSuchFile:
662
704
                conflicts.append(('versioning no contents', trans_id))
663
705
                continue
664
 
            if not inventory.InventoryEntry.versionable_kind(kind):
 
706
            if not InventoryEntry.versionable_kind(kind):
665
707
                conflicts.append(('versioning bad kind', trans_id, kind))
666
708
        return conflicts
667
709
 
668
710
    def _executability_conflicts(self):
669
711
        """Check for bad executability changes.
670
 
 
 
712
        
671
713
        Only versioned files may have their executability set, because
672
714
        1. only versioned entries can have executability under windows
673
715
        2. only files can be executable.  (The execute bit on a directory
678
720
            if self.final_file_id(trans_id) is None:
679
721
                conflicts.append(('unversioned executability', trans_id))
680
722
            else:
681
 
                if self.final_kind(trans_id) != "file":
 
723
                try:
 
724
                    non_file = self.final_kind(trans_id) != "file"
 
725
                except NoSuchFile:
 
726
                    non_file = True
 
727
                if non_file is True:
682
728
                    conflicts.append(('non-file executability', trans_id))
683
729
        return conflicts
684
730
 
686
732
        """Check for overwrites (not permitted on Win32)"""
687
733
        conflicts = []
688
734
        for trans_id in self._new_contents:
689
 
            if self.tree_kind(trans_id) is None:
 
735
            try:
 
736
                self.tree_kind(trans_id)
 
737
            except NoSuchFile:
690
738
                continue
691
739
            if trans_id not in self._removed_contents:
692
740
                conflicts.append(('overwrite', trans_id,
699
747
        if (self._new_name, self._new_parent) == ({}, {}):
700
748
            return conflicts
701
749
        for children in by_parent.itervalues():
702
 
            name_ids = []
703
 
            for child_tid in children:
704
 
                name = self.final_name(child_tid)
705
 
                if name is not None:
706
 
                    # Keep children only if they still exist in the end
707
 
                    if not self._case_sensitive_target:
708
 
                        name = name.lower()
709
 
                    name_ids.append((name, child_tid))
 
750
            name_ids = [(self.final_name(t), t) for t in children]
 
751
            if not self._case_sensitive_target:
 
752
                name_ids = [(n.lower(), t) for n, t in name_ids]
710
753
            name_ids.sort()
711
754
            last_name = None
712
755
            last_trans_id = None
713
756
            for name, trans_id in name_ids:
714
 
                kind = self.final_kind(trans_id)
 
757
                try:
 
758
                    kind = self.final_kind(trans_id)
 
759
                except NoSuchFile:
 
760
                    kind = None
715
761
                file_id = self.final_file_id(trans_id)
716
762
                if kind is None and file_id is None:
717
763
                    continue
736
782
        return conflicts
737
783
 
738
784
    def _parent_type_conflicts(self, by_parent):
739
 
        """Children must have a directory parent"""
 
785
        """parents must have directory 'contents'."""
740
786
        conflicts = []
741
787
        for parent_id, children in by_parent.iteritems():
742
 
            if parent_id == ROOT_PARENT:
743
 
                continue
744
 
            no_children = True
745
 
            for child_id in children:
746
 
                if self.final_kind(child_id) is not None:
747
 
                    no_children = False
748
 
                    break
749
 
            if no_children:
750
 
                continue
751
 
            # There is at least a child, so we need an existing directory to
752
 
            # contain it.
753
 
            kind = self.final_kind(parent_id)
 
788
            if parent_id is ROOT_PARENT:
 
789
                continue
 
790
            if not self._any_contents(children):
 
791
                continue
 
792
            for child in children:
 
793
                try:
 
794
                    self.final_kind(child)
 
795
                except NoSuchFile:
 
796
                    continue
 
797
            try:
 
798
                kind = self.final_kind(parent_id)
 
799
            except NoSuchFile:
 
800
                kind = None
754
801
            if kind is None:
755
 
                # The directory will be deleted
756
802
                conflicts.append(('missing parent', parent_id))
757
803
            elif kind != "directory":
758
 
                # Meh, we need a *directory* to put something in it
759
804
                conflicts.append(('non-directory parent', parent_id))
760
805
        return conflicts
761
806
 
762
 
    def _set_executability(self, path, trans_id):
 
807
    def _any_contents(self, trans_ids):
 
808
        """Return true if any of the trans_ids, will have contents."""
 
809
        for trans_id in trans_ids:
 
810
            try:
 
811
                kind = self.final_kind(trans_id)
 
812
            except NoSuchFile:
 
813
                continue
 
814
            return True
 
815
        return False
 
816
 
 
817
    def _limbo_name(self, trans_id):
 
818
        """Generate the limbo name of a file"""
 
819
        limbo_name = self._limbo_files.get(trans_id)
 
820
        if limbo_name is not None:
 
821
            return limbo_name
 
822
        parent = self._new_parent.get(trans_id)
 
823
        # if the parent directory is already in limbo (e.g. when building a
 
824
        # tree), choose a limbo name inside the parent, to reduce further
 
825
        # renames.
 
826
        use_direct_path = False
 
827
        if self._new_contents.get(parent) == 'directory':
 
828
            filename = self._new_name.get(trans_id)
 
829
            if filename is not None:
 
830
                if parent not in self._limbo_children:
 
831
                    self._limbo_children[parent] = set()
 
832
                    self._limbo_children_names[parent] = {}
 
833
                    use_direct_path = True
 
834
                # the direct path can only be used if no other file has
 
835
                # already taken this pathname, i.e. if the name is unused, or
 
836
                # if it is already associated with this trans_id.
 
837
                elif self._case_sensitive_target:
 
838
                    if (self._limbo_children_names[parent].get(filename)
 
839
                        in (trans_id, None)):
 
840
                        use_direct_path = True
 
841
                else:
 
842
                    for l_filename, l_trans_id in\
 
843
                        self._limbo_children_names[parent].iteritems():
 
844
                        if l_trans_id == trans_id:
 
845
                            continue
 
846
                        if l_filename.lower() == filename.lower():
 
847
                            break
 
848
                    else:
 
849
                        use_direct_path = True
 
850
 
 
851
        if use_direct_path:
 
852
            limbo_name = pathjoin(self._limbo_files[parent], filename)
 
853
            self._limbo_children[parent].add(trans_id)
 
854
            self._limbo_children_names[parent][filename] = trans_id
 
855
        else:
 
856
            limbo_name = pathjoin(self._limbodir, trans_id)
 
857
            self._needs_rename.add(trans_id)
 
858
        self._limbo_files[trans_id] = limbo_name
 
859
        return limbo_name
 
860
 
 
861
    def _set_executability(self, path, entry, trans_id):
763
862
        """Set the executability of versioned files """
764
 
        if self._tree._supports_executable():
765
 
            new_executability = self._new_executability[trans_id]
 
863
        new_executability = self._new_executability[trans_id]
 
864
        if entry is not None:
 
865
            entry.executable = new_executability
 
866
        if supports_executable():
766
867
            abspath = self._tree.abspath(path)
767
868
            current_mode = os.stat(abspath).st_mode
768
869
            if new_executability:
776
877
                    to_mode |= 0010 & ~umask
777
878
            else:
778
879
                to_mode = current_mode & ~0111
779
 
            osutils.chmod_if_possible(abspath, to_mode)
 
880
            os.chmod(abspath, to_mode)
780
881
 
781
882
    def _new_entry(self, name, parent_id, file_id):
782
883
        """Helper function to create a new filesystem entry."""
785
886
            self.version_file(file_id, trans_id)
786
887
        return trans_id
787
888
 
788
 
    def new_file(self, name, parent_id, contents, file_id=None,
789
 
                 executable=None, sha1=None):
 
889
    def new_file(self, name, parent_id, contents, file_id=None, 
 
890
                 executable=None):
790
891
        """Convenience method to create files.
791
 
 
 
892
        
792
893
        name is the name of the file to create.
793
894
        parent_id is the transaction id of the parent directory of the file.
794
895
        contents is an iterator of bytestrings, which will be used to produce
799
900
        trans_id = self._new_entry(name, parent_id, file_id)
800
901
        # TODO: rather than scheduling a set_executable call,
801
902
        # have create_file create the file with the right mode.
802
 
        self.create_file(contents, trans_id, sha1=sha1)
 
903
        self.create_file(contents, trans_id)
803
904
        if executable is not None:
804
905
            self.set_executability(executable, trans_id)
805
906
        return trans_id
814
915
        """
815
916
        trans_id = self._new_entry(name, parent_id, file_id)
816
917
        self.create_directory(trans_id)
817
 
        return trans_id
 
918
        return trans_id 
818
919
 
819
920
    def new_symlink(self, name, parent_id, target, file_id=None):
820
921
        """Convenience method to create symbolic link.
821
 
 
 
922
        
822
923
        name is the name of the symlink to create.
823
924
        parent_id is the transaction id of the parent directory of the symlink.
824
925
        target is a bytestring of the target of the symlink.
828
929
        self.create_symlink(target, trans_id)
829
930
        return trans_id
830
931
 
831
 
    def new_orphan(self, trans_id, parent_id):
832
 
        """Schedule an item to be orphaned.
833
 
 
834
 
        When a directory is about to be removed, its children, if they are not
835
 
        versioned are moved out of the way: they don't have a parent anymore.
836
 
 
837
 
        :param trans_id: The trans_id of the existing item.
838
 
        :param parent_id: The parent trans_id of the item.
839
 
        """
840
 
        raise NotImplementedError(self.new_orphan)
841
 
 
842
 
    def _get_potential_orphans(self, dir_id):
843
 
        """Find the potential orphans in a directory.
844
 
 
845
 
        A directory can't be safely deleted if there are versioned files in it.
846
 
        If all the contained files are unversioned then they can be orphaned.
847
 
 
848
 
        The 'None' return value means that the directory contains at least one
849
 
        versioned file and should not be deleted.
850
 
 
851
 
        :param dir_id: The directory trans id.
852
 
 
853
 
        :return: A list of the orphan trans ids or None if at least one
854
 
             versioned file is present.
855
 
        """
856
 
        orphans = []
857
 
        # Find the potential orphans, stop if one item should be kept
858
 
        for child_tid in self.by_parent()[dir_id]:
859
 
            if child_tid in self._removed_contents:
860
 
                # The child is removed as part of the transform. Since it was
861
 
                # versioned before, it's not an orphan
862
 
                continue
863
 
            elif self.final_file_id(child_tid) is None:
864
 
                # The child is not versioned
865
 
                orphans.append(child_tid)
866
 
            else:
867
 
                # We have a versioned file here, searching for orphans is
868
 
                # meaningless.
869
 
                orphans = None
870
 
                break
871
 
        return orphans
872
 
 
873
932
    def _affected_ids(self):
874
933
        """Return the set of transform ids affected by the transform"""
875
934
        trans_ids = set(self._removed_id)
905
964
        from_path = self._tree_id_paths.get(from_trans_id)
906
965
        if from_versioned:
907
966
            # get data from working tree if versioned
908
 
            from_entry = self._tree.iter_entries_by_dir([file_id]).next()[1]
 
967
            from_entry = self._tree.inventory[file_id]
909
968
            from_name = from_entry.name
910
969
            from_parent = from_entry.parent_id
911
970
        else:
934
993
        Return a (name, parent, kind, executable) tuple
935
994
        """
936
995
        to_name = self.final_name(to_trans_id)
937
 
        to_kind = self.final_kind(to_trans_id)
 
996
        try:
 
997
            to_kind = self.final_kind(to_trans_id)
 
998
        except NoSuchFile:
 
999
            to_kind = None
938
1000
        to_parent = self.final_file_id(self.final_parent(to_trans_id))
939
1001
        if to_trans_id in self._new_executability:
940
1002
            to_executable = self._new_executability[to_trans_id]
1009
1071
    def get_preview_tree(self):
1010
1072
        """Return a tree representing the result of the transform.
1011
1073
 
1012
 
        The tree is a snapshot, and altering the TreeTransform will invalidate
1013
 
        it.
 
1074
        This tree only supports the subset of Tree functionality required
 
1075
        by show_diff_trees.  It must only be compared to tt._tree.
1014
1076
        """
1015
1077
        return _PreviewTree(self)
1016
1078
 
1017
 
    def commit(self, branch, message, merge_parents=None, strict=False,
1018
 
               timestamp=None, timezone=None, committer=None, authors=None,
1019
 
               revprops=None, revision_id=None):
1020
 
        """Commit the result of this TreeTransform to a branch.
1021
 
 
1022
 
        :param branch: The branch to commit to.
1023
 
        :param message: The message to attach to the commit.
1024
 
        :param merge_parents: Additional parent revision-ids specified by
1025
 
            pending merges.
1026
 
        :param strict: If True, abort the commit if there are unversioned
1027
 
            files.
1028
 
        :param timestamp: if not None, seconds-since-epoch for the time and
1029
 
            date.  (May be a float.)
1030
 
        :param timezone: Optional timezone for timestamp, as an offset in
1031
 
            seconds.
1032
 
        :param committer: Optional committer in email-id format.
1033
 
            (e.g. "J Random Hacker <jrandom@example.com>")
1034
 
        :param authors: Optional list of authors in email-id format.
1035
 
        :param revprops: Optional dictionary of revision properties.
1036
 
        :param revision_id: Optional revision id.  (Specifying a revision-id
1037
 
            may reduce performance for some non-native formats.)
1038
 
        :return: The revision_id of the revision committed.
1039
 
        """
1040
 
        self._check_malformed()
1041
 
        if strict:
1042
 
            unversioned = set(self._new_contents).difference(set(self._new_id))
1043
 
            for trans_id in unversioned:
1044
 
                if self.final_file_id(trans_id) is None:
1045
 
                    raise errors.StrictCommitFailed()
1046
 
 
1047
 
        revno, last_rev_id = branch.last_revision_info()
1048
 
        if last_rev_id == _mod_revision.NULL_REVISION:
1049
 
            if merge_parents is not None:
1050
 
                raise ValueError('Cannot supply merge parents for first'
1051
 
                                 ' commit.')
1052
 
            parent_ids = []
1053
 
        else:
1054
 
            parent_ids = [last_rev_id]
1055
 
            if merge_parents is not None:
1056
 
                parent_ids.extend(merge_parents)
1057
 
        if self._tree.get_revision_id() != last_rev_id:
1058
 
            raise ValueError('TreeTransform not based on branch basis: %s' %
1059
 
                             self._tree.get_revision_id())
1060
 
        revprops = commit.Commit.update_revprops(revprops, branch, authors)
1061
 
        builder = branch.get_commit_builder(parent_ids,
1062
 
                                            timestamp=timestamp,
1063
 
                                            timezone=timezone,
1064
 
                                            committer=committer,
1065
 
                                            revprops=revprops,
1066
 
                                            revision_id=revision_id)
1067
 
        preview = self.get_preview_tree()
1068
 
        list(builder.record_iter_changes(preview, last_rev_id,
1069
 
                                         self.iter_changes()))
1070
 
        builder.finish_inventory()
1071
 
        revision_id = builder.commit(message)
1072
 
        branch.set_last_revision_info(revno + 1, revision_id)
1073
 
        return revision_id
1074
 
 
1075
 
    def _text_parent(self, trans_id):
1076
 
        file_id = self.tree_file_id(trans_id)
1077
 
        try:
1078
 
            if file_id is None or self._tree.kind(file_id) != 'file':
1079
 
                return None
1080
 
        except errors.NoSuchFile:
1081
 
            return None
1082
 
        return file_id
1083
 
 
1084
 
    def _get_parents_texts(self, trans_id):
1085
 
        """Get texts for compression parents of this file."""
1086
 
        file_id = self._text_parent(trans_id)
1087
 
        if file_id is None:
1088
 
            return ()
1089
 
        return (self._tree.get_file_text(file_id),)
1090
 
 
1091
 
    def _get_parents_lines(self, trans_id):
1092
 
        """Get lines for compression parents of this file."""
1093
 
        file_id = self._text_parent(trans_id)
1094
 
        if file_id is None:
1095
 
            return ()
1096
 
        return (self._tree.get_file_lines(file_id),)
1097
 
 
1098
 
    def serialize(self, serializer):
1099
 
        """Serialize this TreeTransform.
1100
 
 
1101
 
        :param serializer: A Serialiser like pack.ContainerSerializer.
1102
 
        """
1103
 
        new_name = dict((k, v.encode('utf-8')) for k, v in
1104
 
                        self._new_name.items())
1105
 
        new_executability = dict((k, int(v)) for k, v in
1106
 
                                 self._new_executability.items())
1107
 
        tree_path_ids = dict((k.encode('utf-8'), v)
1108
 
                             for k, v in self._tree_path_ids.items())
1109
 
        attribs = {
1110
 
            '_id_number': self._id_number,
1111
 
            '_new_name': new_name,
1112
 
            '_new_parent': self._new_parent,
1113
 
            '_new_executability': new_executability,
1114
 
            '_new_id': self._new_id,
1115
 
            '_tree_path_ids': tree_path_ids,
1116
 
            '_removed_id': list(self._removed_id),
1117
 
            '_removed_contents': list(self._removed_contents),
1118
 
            '_non_present_ids': self._non_present_ids,
1119
 
            }
1120
 
        yield serializer.bytes_record(bencode.bencode(attribs),
1121
 
                                      (('attribs',),))
1122
 
        for trans_id, kind in self._new_contents.items():
1123
 
            if kind == 'file':
1124
 
                lines = osutils.chunks_to_lines(
1125
 
                    self._read_file_chunks(trans_id))
1126
 
                parents = self._get_parents_lines(trans_id)
1127
 
                mpdiff = multiparent.MultiParent.from_lines(lines, parents)
1128
 
                content = ''.join(mpdiff.to_patch())
1129
 
            if kind == 'directory':
1130
 
                content = ''
1131
 
            if kind == 'symlink':
1132
 
                content = self._read_symlink_target(trans_id)
1133
 
            yield serializer.bytes_record(content, ((trans_id, kind),))
1134
 
 
1135
 
    def deserialize(self, records):
1136
 
        """Deserialize a stored TreeTransform.
1137
 
 
1138
 
        :param records: An iterable of (names, content) tuples, as per
1139
 
            pack.ContainerPushParser.
1140
 
        """
1141
 
        names, content = records.next()
1142
 
        attribs = bencode.bdecode(content)
1143
 
        self._id_number = attribs['_id_number']
1144
 
        self._new_name = dict((k, v.decode('utf-8'))
1145
 
                            for k, v in attribs['_new_name'].items())
1146
 
        self._new_parent = attribs['_new_parent']
1147
 
        self._new_executability = dict((k, bool(v)) for k, v in
1148
 
            attribs['_new_executability'].items())
1149
 
        self._new_id = attribs['_new_id']
1150
 
        self._r_new_id = dict((v, k) for k, v in self._new_id.items())
1151
 
        self._tree_path_ids = {}
1152
 
        self._tree_id_paths = {}
1153
 
        for bytepath, trans_id in attribs['_tree_path_ids'].items():
1154
 
            path = bytepath.decode('utf-8')
1155
 
            self._tree_path_ids[path] = trans_id
1156
 
            self._tree_id_paths[trans_id] = path
1157
 
        self._removed_id = set(attribs['_removed_id'])
1158
 
        self._removed_contents = set(attribs['_removed_contents'])
1159
 
        self._non_present_ids = attribs['_non_present_ids']
1160
 
        for ((trans_id, kind),), content in records:
1161
 
            if kind == 'file':
1162
 
                mpdiff = multiparent.MultiParent.from_patch(content)
1163
 
                lines = mpdiff.to_lines(self._get_parents_texts(trans_id))
1164
 
                self.create_file(lines, trans_id)
1165
 
            if kind == 'directory':
1166
 
                self.create_directory(trans_id)
1167
 
            if kind == 'symlink':
1168
 
                self.create_symlink(content.decode('utf-8'), trans_id)
1169
 
 
1170
 
 
1171
 
class DiskTreeTransform(TreeTransformBase):
1172
 
    """Tree transform storing its contents on disk."""
1173
 
 
1174
 
    def __init__(self, tree, limbodir, pb=None,
1175
 
                 case_sensitive=True):
1176
 
        """Constructor.
1177
 
        :param tree: The tree that will be transformed, but not necessarily
1178
 
            the output tree.
1179
 
        :param limbodir: A directory where new files can be stored until
1180
 
            they are installed in their proper places
1181
 
        :param pb: ignored
1182
 
        :param case_sensitive: If True, the target of the transform is
1183
 
            case sensitive, not just case preserving.
1184
 
        """
1185
 
        TreeTransformBase.__init__(self, tree, pb, case_sensitive)
1186
 
        self._limbodir = limbodir
1187
 
        self._deletiondir = None
1188
 
        # A mapping of transform ids to their limbo filename
1189
 
        self._limbo_files = {}
1190
 
        self._possibly_stale_limbo_files = set()
1191
 
        # A mapping of transform ids to a set of the transform ids of children
1192
 
        # that their limbo directory has
1193
 
        self._limbo_children = {}
1194
 
        # Map transform ids to maps of child filename to child transform id
1195
 
        self._limbo_children_names = {}
1196
 
        # List of transform ids that need to be renamed from limbo into place
1197
 
        self._needs_rename = set()
1198
 
        self._creation_mtime = None
1199
 
 
1200
 
    def finalize(self):
1201
 
        """Release the working tree lock, if held, clean up limbo dir.
1202
 
 
1203
 
        This is required if apply has not been invoked, but can be invoked
1204
 
        even after apply.
1205
 
        """
1206
 
        if self._tree is None:
1207
 
            return
1208
 
        try:
1209
 
            limbo_paths = self._limbo_files.values() + list(
1210
 
                self._possibly_stale_limbo_files)
1211
 
            limbo_paths = sorted(limbo_paths, reverse=True)
1212
 
            for path in limbo_paths:
1213
 
                try:
1214
 
                    delete_any(path)
1215
 
                except OSError, e:
1216
 
                    if e.errno != errno.ENOENT:
1217
 
                        raise
1218
 
                    # XXX: warn? perhaps we just got interrupted at an
1219
 
                    # inconvenient moment, but perhaps files are disappearing
1220
 
                    # from under us?
1221
 
            try:
1222
 
                delete_any(self._limbodir)
1223
 
            except OSError:
1224
 
                # We don't especially care *why* the dir is immortal.
1225
 
                raise ImmortalLimbo(self._limbodir)
1226
 
            try:
1227
 
                if self._deletiondir is not None:
1228
 
                    delete_any(self._deletiondir)
1229
 
            except OSError:
1230
 
                raise errors.ImmortalPendingDeletion(self._deletiondir)
1231
 
        finally:
1232
 
            TreeTransformBase.finalize(self)
1233
 
 
1234
 
    def _limbo_supports_executable(self):
1235
 
        """Check if the limbo path supports the executable bit."""
1236
 
        # FIXME: Check actual file system capabilities of limbodir
1237
 
        return osutils.supports_executable()
1238
 
 
1239
 
    def _limbo_name(self, trans_id):
1240
 
        """Generate the limbo name of a file"""
1241
 
        limbo_name = self._limbo_files.get(trans_id)
1242
 
        if limbo_name is None:
1243
 
            limbo_name = self._generate_limbo_path(trans_id)
1244
 
            self._limbo_files[trans_id] = limbo_name
1245
 
        return limbo_name
1246
 
 
1247
 
    def _generate_limbo_path(self, trans_id):
1248
 
        """Generate a limbo path using the trans_id as the relative path.
1249
 
 
1250
 
        This is suitable as a fallback, and when the transform should not be
1251
 
        sensitive to the path encoding of the limbo directory.
1252
 
        """
1253
 
        self._needs_rename.add(trans_id)
1254
 
        return pathjoin(self._limbodir, trans_id)
1255
 
 
1256
 
    def adjust_path(self, name, parent, trans_id):
1257
 
        previous_parent = self._new_parent.get(trans_id)
1258
 
        previous_name = self._new_name.get(trans_id)
1259
 
        TreeTransformBase.adjust_path(self, name, parent, trans_id)
1260
 
        if (trans_id in self._limbo_files and
1261
 
            trans_id not in self._needs_rename):
1262
 
            self._rename_in_limbo([trans_id])
1263
 
            if previous_parent != parent:
1264
 
                self._limbo_children[previous_parent].remove(trans_id)
1265
 
            if previous_parent != parent or previous_name != name:
1266
 
                del self._limbo_children_names[previous_parent][previous_name]
1267
 
 
1268
 
    def _rename_in_limbo(self, trans_ids):
1269
 
        """Fix limbo names so that the right final path is produced.
1270
 
 
1271
 
        This means we outsmarted ourselves-- we tried to avoid renaming
1272
 
        these files later by creating them with their final names in their
1273
 
        final parents.  But now the previous name or parent is no longer
1274
 
        suitable, so we have to rename them.
1275
 
 
1276
 
        Even for trans_ids that have no new contents, we must remove their
1277
 
        entries from _limbo_files, because they are now stale.
1278
 
        """
1279
 
        for trans_id in trans_ids:
1280
 
            old_path = self._limbo_files[trans_id]
1281
 
            self._possibly_stale_limbo_files.add(old_path)
1282
 
            del self._limbo_files[trans_id]
1283
 
            if trans_id not in self._new_contents:
1284
 
                continue
1285
 
            new_path = self._limbo_name(trans_id)
1286
 
            os.rename(old_path, new_path)
1287
 
            self._possibly_stale_limbo_files.remove(old_path)
1288
 
            for descendant in self._limbo_descendants(trans_id):
1289
 
                desc_path = self._limbo_files[descendant]
1290
 
                desc_path = new_path + desc_path[len(old_path):]
1291
 
                self._limbo_files[descendant] = desc_path
1292
 
 
1293
 
    def _limbo_descendants(self, trans_id):
1294
 
        """Return the set of trans_ids whose limbo paths descend from this."""
1295
 
        descendants = set(self._limbo_children.get(trans_id, []))
1296
 
        for descendant in list(descendants):
1297
 
            descendants.update(self._limbo_descendants(descendant))
1298
 
        return descendants
1299
 
 
1300
 
    def create_file(self, contents, trans_id, mode_id=None, sha1=None):
1301
 
        """Schedule creation of a new file.
1302
 
 
1303
 
        :seealso: new_file.
1304
 
 
1305
 
        :param contents: an iterator of strings, all of which will be written
1306
 
            to the target destination.
1307
 
        :param trans_id: TreeTransform handle
1308
 
        :param mode_id: If not None, force the mode of the target file to match
1309
 
            the mode of the object referenced by mode_id.
1310
 
            Otherwise, we will try to preserve mode bits of an existing file.
1311
 
        :param sha1: If the sha1 of this content is already known, pass it in.
1312
 
            We can use it to prevent future sha1 computations.
1313
 
        """
1314
 
        name = self._limbo_name(trans_id)
1315
 
        f = open(name, 'wb')
1316
 
        try:
1317
 
            unique_add(self._new_contents, trans_id, 'file')
1318
 
            f.writelines(contents)
1319
 
        finally:
1320
 
            f.close()
1321
 
        self._set_mtime(name)
1322
 
        self._set_mode(trans_id, mode_id, S_ISREG)
1323
 
        # It is unfortunate we have to use lstat instead of fstat, but we just
1324
 
        # used utime and chmod on the file, so we need the accurate final
1325
 
        # details.
1326
 
        if sha1 is not None:
1327
 
            self._observed_sha1s[trans_id] = (sha1, osutils.lstat(name))
1328
 
 
1329
 
    def _read_file_chunks(self, trans_id):
1330
 
        cur_file = open(self._limbo_name(trans_id), 'rb')
1331
 
        try:
1332
 
            return cur_file.readlines()
1333
 
        finally:
1334
 
            cur_file.close()
1335
 
 
1336
 
    def _read_symlink_target(self, trans_id):
1337
 
        return os.readlink(self._limbo_name(trans_id))
1338
 
 
1339
 
    def _set_mtime(self, path):
1340
 
        """All files that are created get the same mtime.
1341
 
 
1342
 
        This time is set by the first object to be created.
1343
 
        """
1344
 
        if self._creation_mtime is None:
1345
 
            self._creation_mtime = time.time()
1346
 
        os.utime(path, (self._creation_mtime, self._creation_mtime))
1347
 
 
1348
 
    def create_hardlink(self, path, trans_id):
1349
 
        """Schedule creation of a hard link"""
1350
 
        name = self._limbo_name(trans_id)
1351
 
        try:
1352
 
            os.link(path, name)
1353
 
        except OSError, e:
1354
 
            if e.errno != errno.EPERM:
1355
 
                raise
1356
 
            raise errors.HardLinkNotSupported(path)
1357
 
        try:
1358
 
            unique_add(self._new_contents, trans_id, 'file')
1359
 
        except:
1360
 
            # Clean up the file, it never got registered so
1361
 
            # TreeTransform.finalize() won't clean it up.
1362
 
            os.unlink(name)
1363
 
            raise
1364
 
 
1365
 
    def create_directory(self, trans_id):
1366
 
        """Schedule creation of a new directory.
1367
 
 
1368
 
        See also new_directory.
1369
 
        """
1370
 
        os.mkdir(self._limbo_name(trans_id))
1371
 
        unique_add(self._new_contents, trans_id, 'directory')
1372
 
 
1373
 
    def create_symlink(self, target, trans_id):
1374
 
        """Schedule creation of a new symbolic link.
1375
 
 
1376
 
        target is a bytestring.
1377
 
        See also new_symlink.
1378
 
        """
1379
 
        if has_symlinks():
1380
 
            os.symlink(target, self._limbo_name(trans_id))
1381
 
            unique_add(self._new_contents, trans_id, 'symlink')
1382
 
        else:
1383
 
            try:
1384
 
                path = FinalPaths(self).get_path(trans_id)
1385
 
            except KeyError:
1386
 
                path = None
1387
 
            raise UnableCreateSymlink(path=path)
1388
 
 
1389
 
    def cancel_creation(self, trans_id):
1390
 
        """Cancel the creation of new file contents."""
1391
 
        del self._new_contents[trans_id]
1392
 
        if trans_id in self._observed_sha1s:
1393
 
            del self._observed_sha1s[trans_id]
1394
 
        children = self._limbo_children.get(trans_id)
1395
 
        # if this is a limbo directory with children, move them before removing
1396
 
        # the directory
1397
 
        if children is not None:
1398
 
            self._rename_in_limbo(children)
1399
 
            del self._limbo_children[trans_id]
1400
 
            del self._limbo_children_names[trans_id]
1401
 
        delete_any(self._limbo_name(trans_id))
1402
 
 
1403
 
    def new_orphan(self, trans_id, parent_id):
1404
 
        conf = self._tree.get_config_stack()
1405
 
        handle_orphan = conf.get('bzr.transform.orphan_policy')
1406
 
        handle_orphan(self, trans_id, parent_id)
1407
 
 
1408
 
 
1409
 
class OrphaningError(errors.BzrError):
1410
 
 
1411
 
    # Only bugs could lead to such exception being seen by the user
1412
 
    internal_error = True
1413
 
    _fmt = "Error while orphaning %s in %s directory"
1414
 
 
1415
 
    def __init__(self, orphan, parent):
1416
 
        errors.BzrError.__init__(self)
1417
 
        self.orphan = orphan
1418
 
        self.parent = parent
1419
 
 
1420
 
 
1421
 
class OrphaningForbidden(OrphaningError):
1422
 
 
1423
 
    _fmt = "Policy: %s doesn't allow creating orphans."
1424
 
 
1425
 
    def __init__(self, policy):
1426
 
        errors.BzrError.__init__(self)
1427
 
        self.policy = policy
1428
 
 
1429
 
 
1430
 
def move_orphan(tt, orphan_id, parent_id):
1431
 
    """See TreeTransformBase.new_orphan.
1432
 
 
1433
 
    This creates a new orphan in the `bzr-orphans` dir at the root of the
1434
 
    `TreeTransform`.
1435
 
 
1436
 
    :param tt: The TreeTransform orphaning `trans_id`.
1437
 
 
1438
 
    :param orphan_id: The trans id that should be orphaned.
1439
 
 
1440
 
    :param parent_id: The orphan parent trans id.
1441
 
    """
1442
 
    # Add the orphan dir if it doesn't exist
1443
 
    orphan_dir_basename = 'bzr-orphans'
1444
 
    od_id = tt.trans_id_tree_path(orphan_dir_basename)
1445
 
    if tt.final_kind(od_id) is None:
1446
 
        tt.create_directory(od_id)
1447
 
    parent_path = tt._tree_id_paths[parent_id]
1448
 
    # Find a name that doesn't exist yet in the orphan dir
1449
 
    actual_name = tt.final_name(orphan_id)
1450
 
    new_name = tt._available_backup_name(actual_name, od_id)
1451
 
    tt.adjust_path(new_name, od_id, orphan_id)
1452
 
    trace.warning('%s has been orphaned in %s'
1453
 
                  % (joinpath(parent_path, actual_name), orphan_dir_basename))
1454
 
 
1455
 
 
1456
 
def refuse_orphan(tt, orphan_id, parent_id):
1457
 
    """See TreeTransformBase.new_orphan.
1458
 
 
1459
 
    This refuses to create orphan, letting the caller handle the conflict.
1460
 
    """
1461
 
    raise OrphaningForbidden('never')
1462
 
 
1463
 
 
1464
 
orphaning_registry = registry.Registry()
1465
 
orphaning_registry.register(
1466
 
    'conflict', refuse_orphan,
1467
 
    'Leave orphans in place and create a conflict on the directory.')
1468
 
orphaning_registry.register(
1469
 
    'move', move_orphan,
1470
 
    'Move orphans into the bzr-orphans directory.')
1471
 
orphaning_registry._set_default_key('conflict')
1472
 
 
1473
 
 
1474
 
opt_transform_orphan = _mod_config.RegistryOption(
1475
 
    'bzr.transform.orphan_policy', orphaning_registry,
1476
 
    help='Policy for orphaned files during transform operations.',
1477
 
    invalid='warning')
1478
 
 
1479
 
 
1480
 
class TreeTransform(DiskTreeTransform):
 
1079
 
 
1080
class TreeTransform(TreeTransformBase):
1481
1081
    """Represent a tree transformation.
1482
1082
 
1483
1083
    This object is designed to support incremental generation of the transform,
1542
1142
    FileMover does not delete files until it is sure that a rollback will not
1543
1143
    happen.
1544
1144
    """
1545
 
    def __init__(self, tree, pb=None):
 
1145
    def __init__(self, tree, pb=DummyProgress()):
1546
1146
        """Note: a tree_write lock is taken on the tree.
1547
1147
 
1548
1148
        Use TreeTransform.finalize() to release the lock (can be omitted if
1553
1153
        try:
1554
1154
            limbodir = urlutils.local_path_from_url(
1555
1155
                tree._transport.abspath('limbo'))
1556
 
            osutils.ensure_empty_directory_exists(
1557
 
                limbodir,
1558
 
                errors.ExistingLimbo)
 
1156
            try:
 
1157
                os.mkdir(limbodir)
 
1158
            except OSError, e:
 
1159
                if e.errno == errno.EEXIST:
 
1160
                    raise ExistingLimbo(limbodir)
1559
1161
            deletiondir = urlutils.local_path_from_url(
1560
1162
                tree._transport.abspath('pending-deletion'))
1561
 
            osutils.ensure_empty_directory_exists(
1562
 
                deletiondir,
1563
 
                errors.ExistingPendingDeletion)
 
1163
            try:
 
1164
                os.mkdir(deletiondir)
 
1165
            except OSError, e:
 
1166
                if e.errno == errno.EEXIST:
 
1167
                    raise errors.ExistingPendingDeletion(deletiondir)
1564
1168
        except:
1565
1169
            tree.unlock()
1566
1170
            raise
1567
1171
 
1568
 
        # Cache of realpath results, to speed up canonical_path
1569
 
        self._realpaths = {}
1570
 
        # Cache of relpath results, to speed up canonical_path
1571
 
        self._relpaths = {}
1572
 
        DiskTreeTransform.__init__(self, tree, limbodir, pb,
 
1172
        TreeTransformBase.__init__(self, tree, limbodir, pb,
1573
1173
                                   tree.case_sensitive)
1574
1174
        self._deletiondir = deletiondir
1575
1175
 
1576
 
    def canonical_path(self, path):
1577
 
        """Get the canonical tree-relative path"""
1578
 
        # don't follow final symlinks
1579
 
        abs = self._tree.abspath(path)
1580
 
        if abs in self._relpaths:
1581
 
            return self._relpaths[abs]
1582
 
        dirname, basename = os.path.split(abs)
1583
 
        if dirname not in self._realpaths:
1584
 
            self._realpaths[dirname] = os.path.realpath(dirname)
1585
 
        dirname = self._realpaths[dirname]
1586
 
        abs = pathjoin(dirname, basename)
1587
 
        if dirname in self._relpaths:
1588
 
            relpath = pathjoin(self._relpaths[dirname], basename)
1589
 
            relpath = relpath.rstrip('/\\')
1590
 
        else:
1591
 
            relpath = self._tree.relpath(abs)
1592
 
        self._relpaths[abs] = relpath
1593
 
        return relpath
1594
 
 
1595
 
    def tree_kind(self, trans_id):
1596
 
        """Determine the file kind in the working tree.
1597
 
 
1598
 
        :returns: The file kind or None if the file does not exist
1599
 
        """
1600
 
        path = self._tree_id_paths.get(trans_id)
1601
 
        if path is None:
1602
 
            return None
1603
 
        try:
1604
 
            return file_kind(self._tree.abspath(path))
1605
 
        except errors.NoSuchFile:
1606
 
            return None
1607
 
 
1608
 
    def _set_mode(self, trans_id, mode_id, typefunc):
1609
 
        """Set the mode of new file contents.
1610
 
        The mode_id is the existing file to get the mode from (often the same
1611
 
        as trans_id).  The operation is only performed if there's a mode match
1612
 
        according to typefunc.
1613
 
        """
1614
 
        if mode_id is None:
1615
 
            mode_id = trans_id
1616
 
        try:
1617
 
            old_path = self._tree_id_paths[mode_id]
1618
 
        except KeyError:
1619
 
            return
1620
 
        try:
1621
 
            mode = os.stat(self._tree.abspath(old_path)).st_mode
1622
 
        except OSError, e:
1623
 
            if e.errno in (errno.ENOENT, errno.ENOTDIR):
1624
 
                # Either old_path doesn't exist, or the parent of the
1625
 
                # target is not a directory (but will be one eventually)
1626
 
                # Either way, we know it doesn't exist *right now*
1627
 
                # See also bug #248448
1628
 
                return
1629
 
            else:
1630
 
                raise
1631
 
        if typefunc(mode):
1632
 
            osutils.chmod_if_possible(self._limbo_name(trans_id), mode)
1633
 
 
1634
 
    def iter_tree_children(self, parent_id):
1635
 
        """Iterate through the entry's tree children, if any"""
1636
 
        try:
1637
 
            path = self._tree_id_paths[parent_id]
1638
 
        except KeyError:
1639
 
            return
1640
 
        try:
1641
 
            children = os.listdir(self._tree.abspath(path))
1642
 
        except OSError, e:
1643
 
            if not (osutils._is_error_enotdir(e)
1644
 
                    or e.errno in (errno.ENOENT, errno.ESRCH)):
1645
 
                raise
1646
 
            return
1647
 
 
1648
 
        for child in children:
1649
 
            childpath = joinpath(path, child)
1650
 
            if self._tree.is_control_filename(childpath):
1651
 
                continue
1652
 
            yield self.trans_id_tree_path(childpath)
1653
 
 
1654
 
    def _generate_limbo_path(self, trans_id):
1655
 
        """Generate a limbo path using the final path if possible.
1656
 
 
1657
 
        This optimizes the performance of applying the tree transform by
1658
 
        avoiding renames.  These renames can be avoided only when the parent
1659
 
        directory is already scheduled for creation.
1660
 
 
1661
 
        If the final path cannot be used, falls back to using the trans_id as
1662
 
        the relpath.
1663
 
        """
1664
 
        parent = self._new_parent.get(trans_id)
1665
 
        # if the parent directory is already in limbo (e.g. when building a
1666
 
        # tree), choose a limbo name inside the parent, to reduce further
1667
 
        # renames.
1668
 
        use_direct_path = False
1669
 
        if self._new_contents.get(parent) == 'directory':
1670
 
            filename = self._new_name.get(trans_id)
1671
 
            if filename is not None:
1672
 
                if parent not in self._limbo_children:
1673
 
                    self._limbo_children[parent] = set()
1674
 
                    self._limbo_children_names[parent] = {}
1675
 
                    use_direct_path = True
1676
 
                # the direct path can only be used if no other file has
1677
 
                # already taken this pathname, i.e. if the name is unused, or
1678
 
                # if it is already associated with this trans_id.
1679
 
                elif self._case_sensitive_target:
1680
 
                    if (self._limbo_children_names[parent].get(filename)
1681
 
                        in (trans_id, None)):
1682
 
                        use_direct_path = True
1683
 
                else:
1684
 
                    for l_filename, l_trans_id in\
1685
 
                        self._limbo_children_names[parent].iteritems():
1686
 
                        if l_trans_id == trans_id:
1687
 
                            continue
1688
 
                        if l_filename.lower() == filename.lower():
1689
 
                            break
1690
 
                    else:
1691
 
                        use_direct_path = True
1692
 
 
1693
 
        if not use_direct_path:
1694
 
            return DiskTreeTransform._generate_limbo_path(self, trans_id)
1695
 
 
1696
 
        limbo_name = pathjoin(self._limbo_files[parent], filename)
1697
 
        self._limbo_children[parent].add(trans_id)
1698
 
        self._limbo_children_names[parent][filename] = trans_id
1699
 
        return limbo_name
1700
 
 
1701
 
 
1702
1176
    def apply(self, no_conflicts=False, precomputed_delta=None, _mover=None):
1703
1177
        """Apply all changes to the inventory and filesystem.
1704
1178
 
1713
1187
            calculating one.
1714
1188
        :param _mover: Supply an alternate FileMover, for testing
1715
1189
        """
1716
 
        for hook in MutableTree.hooks['pre_transform']:
1717
 
            hook(self._tree, self)
1718
1190
        if not no_conflicts:
1719
 
            self._check_malformed()
1720
 
        child_pb = ui.ui_factory.nested_progress_bar()
 
1191
            conflicts = self.find_conflicts()
 
1192
            if len(conflicts) != 0:
 
1193
                raise MalformedTransform(conflicts=conflicts)
 
1194
        if precomputed_delta is None:
 
1195
            new_inventory_delta = []
 
1196
            inventory_delta = new_inventory_delta
 
1197
        else:
 
1198
            new_inventory_delta = None
 
1199
            inventory_delta = precomputed_delta
 
1200
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1721
1201
        try:
1722
 
            if precomputed_delta is None:
1723
 
                child_pb.update(gettext('Apply phase'), 0, 2)
1724
 
                inventory_delta = self._generate_inventory_delta()
1725
 
                offset = 1
1726
 
            else:
1727
 
                inventory_delta = precomputed_delta
1728
 
                offset = 0
1729
1202
            if _mover is None:
1730
1203
                mover = _FileMover()
1731
1204
            else:
1732
1205
                mover = _mover
1733
1206
            try:
1734
 
                child_pb.update(gettext('Apply phase'), 0 + offset, 2 + offset)
1735
 
                self._apply_removals(mover)
1736
 
                child_pb.update(gettext('Apply phase'), 1 + offset, 2 + offset)
1737
 
                modified_paths = self._apply_insertions(mover)
 
1207
                child_pb.update('Apply phase', 0, 2)
 
1208
                self._apply_removals(new_inventory_delta, mover)
 
1209
                child_pb.update('Apply phase', 1, 2)
 
1210
                modified_paths = self._apply_insertions(new_inventory_delta,
 
1211
                                                        mover)
1738
1212
            except:
1739
1213
                mover.rollback()
1740
1214
                raise
1742
1216
                mover.apply_deletions()
1743
1217
        finally:
1744
1218
            child_pb.finished()
1745
 
        if self.final_file_id(self.root) is None:
1746
 
            inventory_delta = [e for e in inventory_delta if e[0] != '']
1747
1219
        self._tree.apply_inventory_delta(inventory_delta)
1748
 
        self._apply_observed_sha1s()
1749
1220
        self._done = True
1750
1221
        self.finalize()
1751
1222
        return _TransformResults(modified_paths, self.rename_count)
1752
1223
 
1753
 
    def _generate_inventory_delta(self):
1754
 
        """Generate an inventory delta for the current transform."""
1755
 
        inventory_delta = []
1756
 
        child_pb = ui.ui_factory.nested_progress_bar()
1757
 
        new_paths = self._inventory_altered()
1758
 
        total_entries = len(new_paths) + len(self._removed_id)
1759
 
        try:
1760
 
            for num, trans_id in enumerate(self._removed_id):
1761
 
                if (num % 10) == 0:
1762
 
                    child_pb.update(gettext('removing file'), num, total_entries)
1763
 
                if trans_id == self._new_root:
1764
 
                    file_id = self._tree.get_root_id()
1765
 
                else:
1766
 
                    file_id = self.tree_file_id(trans_id)
1767
 
                # File-id isn't really being deleted, just moved
1768
 
                if file_id in self._r_new_id:
1769
 
                    continue
1770
 
                path = self._tree_id_paths[trans_id]
1771
 
                inventory_delta.append((path, None, file_id, None))
1772
 
            new_path_file_ids = dict((t, self.final_file_id(t)) for p, t in
1773
 
                                     new_paths)
1774
 
            entries = self._tree.iter_entries_by_dir(
1775
 
                new_path_file_ids.values())
1776
 
            old_paths = dict((e.file_id, p) for p, e in entries)
1777
 
            final_kinds = {}
1778
 
            for num, (path, trans_id) in enumerate(new_paths):
1779
 
                if (num % 10) == 0:
1780
 
                    child_pb.update(gettext('adding file'),
1781
 
                                    num + len(self._removed_id), total_entries)
1782
 
                file_id = new_path_file_ids[trans_id]
1783
 
                if file_id is None:
1784
 
                    continue
1785
 
                needs_entry = False
1786
 
                kind = self.final_kind(trans_id)
1787
 
                if kind is None:
1788
 
                    kind = self._tree.stored_kind(file_id)
1789
 
                parent_trans_id = self.final_parent(trans_id)
1790
 
                parent_file_id = new_path_file_ids.get(parent_trans_id)
1791
 
                if parent_file_id is None:
1792
 
                    parent_file_id = self.final_file_id(parent_trans_id)
1793
 
                if trans_id in self._new_reference_revision:
1794
 
                    new_entry = inventory.TreeReference(
1795
 
                        file_id,
1796
 
                        self._new_name[trans_id],
1797
 
                        self.final_file_id(self._new_parent[trans_id]),
1798
 
                        None, self._new_reference_revision[trans_id])
1799
 
                else:
1800
 
                    new_entry = inventory.make_entry(kind,
1801
 
                        self.final_name(trans_id),
1802
 
                        parent_file_id, file_id)
1803
 
                old_path = old_paths.get(new_entry.file_id)
1804
 
                new_executability = self._new_executability.get(trans_id)
1805
 
                if new_executability is not None:
1806
 
                    new_entry.executable = new_executability
1807
 
                inventory_delta.append(
1808
 
                    (old_path, path, new_entry.file_id, new_entry))
1809
 
        finally:
1810
 
            child_pb.finished()
1811
 
        return inventory_delta
1812
 
 
1813
 
    def _apply_removals(self, mover):
 
1224
    def _apply_removals(self, inventory_delta, mover):
1814
1225
        """Perform tree operations that remove directory/inventory names.
1815
1226
 
1816
1227
        That is, delete files that are to be deleted, and put any files that
1821
1232
        """
1822
1233
        tree_paths = list(self._tree_path_ids.iteritems())
1823
1234
        tree_paths.sort(reverse=True)
1824
 
        child_pb = ui.ui_factory.nested_progress_bar()
 
1235
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1825
1236
        try:
1826
 
            for num, (path, trans_id) in enumerate(tree_paths):
1827
 
                # do not attempt to move root into a subdirectory of itself.
1828
 
                if path == '':
1829
 
                    continue
1830
 
                child_pb.update(gettext('removing file'), num, len(tree_paths))
 
1237
            for num, data in enumerate(tree_paths):
 
1238
                path, trans_id = data
 
1239
                child_pb.update('removing file', num, len(tree_paths))
1831
1240
                full_path = self._tree.abspath(path)
1832
1241
                if trans_id in self._removed_contents:
1833
 
                    delete_path = os.path.join(self._deletiondir, trans_id)
1834
 
                    mover.pre_delete(full_path, delete_path)
1835
 
                elif (trans_id in self._new_name
1836
 
                      or trans_id in self._new_parent):
 
1242
                    mover.pre_delete(full_path, os.path.join(self._deletiondir,
 
1243
                                     trans_id))
 
1244
                elif trans_id in self._new_name or trans_id in \
 
1245
                    self._new_parent:
1837
1246
                    try:
1838
1247
                        mover.rename(full_path, self._limbo_name(trans_id))
1839
 
                    except errors.TransformRenameFailed, e:
 
1248
                    except OSError, e:
1840
1249
                        if e.errno != errno.ENOENT:
1841
1250
                            raise
1842
1251
                    else:
1843
1252
                        self.rename_count += 1
 
1253
                if (trans_id in self._removed_id
 
1254
                    and inventory_delta is not None):
 
1255
                    if trans_id == self._new_root:
 
1256
                        file_id = self._tree.get_root_id()
 
1257
                    else:
 
1258
                        file_id = self.tree_file_id(trans_id)
 
1259
                    # File-id isn't really being deleted, just moved
 
1260
                    if file_id in self._r_new_id:
 
1261
                        continue
 
1262
                    inventory_delta.append((path, None, file_id, None))
1844
1263
        finally:
1845
1264
            child_pb.finished()
1846
1265
 
1847
 
    def _apply_insertions(self, mover):
 
1266
    def _apply_insertions(self, inventory_delta, mover):
1848
1267
        """Perform tree operations that insert directory/inventory names.
1849
1268
 
1850
1269
        That is, create any files that need to be created, and restore from
1854
1273
        If inventory_delta is None, no inventory delta is calculated, and
1855
1274
        no list of modified paths is returned.
1856
1275
        """
1857
 
        new_paths = self.new_paths(filesystem_only=True)
 
1276
        new_paths = self.new_paths(filesystem_only=(inventory_delta is None))
1858
1277
        modified_paths = []
 
1278
        completed_new = []
1859
1279
        new_path_file_ids = dict((t, self.final_file_id(t)) for p, t in
1860
1280
                                 new_paths)
1861
 
        child_pb = ui.ui_factory.nested_progress_bar()
 
1281
        if inventory_delta is not None:
 
1282
            entries = self._tree.iter_entries_by_dir(
 
1283
                new_path_file_ids.values())
 
1284
            old_paths = dict((e.file_id, p) for p, e in entries)
 
1285
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1862
1286
        try:
1863
1287
            for num, (path, trans_id) in enumerate(new_paths):
 
1288
                new_entry = None
1864
1289
                if (num % 10) == 0:
1865
 
                    child_pb.update(gettext('adding file'), num, len(new_paths))
 
1290
                    child_pb.update('adding file', num, len(new_paths))
1866
1291
                full_path = self._tree.abspath(path)
1867
1292
                if trans_id in self._needs_rename:
1868
1293
                    try:
1869
1294
                        mover.rename(self._limbo_name(trans_id), full_path)
1870
 
                    except errors.TransformRenameFailed, e:
 
1295
                    except OSError, e:
1871
1296
                        # We may be renaming a dangling inventory id
1872
1297
                        if e.errno != errno.ENOENT:
1873
1298
                            raise
1874
1299
                    else:
1875
1300
                        self.rename_count += 1
1876
 
                    # TODO: if trans_id in self._observed_sha1s, we should
1877
 
                    #       re-stat the final target, since ctime will be
1878
 
                    #       updated by the change.
1879
 
                if (trans_id in self._new_contents or
1880
 
                    self.path_changed(trans_id)):
1881
 
                    if trans_id in self._new_contents:
1882
 
                        modified_paths.append(full_path)
 
1301
                if inventory_delta is not None:
 
1302
                    if (trans_id in self._new_contents or
 
1303
                        self.path_changed(trans_id)):
 
1304
                        if trans_id in self._new_contents:
 
1305
                            modified_paths.append(full_path)
 
1306
                            completed_new.append(trans_id)
 
1307
                    file_id = new_path_file_ids[trans_id]
 
1308
                    if file_id is not None and (trans_id in self._new_id or
 
1309
                        trans_id in self._new_name or
 
1310
                        trans_id in self._new_parent
 
1311
                        or trans_id in self._new_executability):
 
1312
                        try:
 
1313
                            kind = self.final_kind(trans_id)
 
1314
                        except NoSuchFile:
 
1315
                            kind = self._tree.stored_kind(file_id)
 
1316
                        parent_trans_id = self.final_parent(trans_id)
 
1317
                        parent_file_id = new_path_file_ids.get(parent_trans_id)
 
1318
                        if parent_file_id is None:
 
1319
                            parent_file_id = self.final_file_id(
 
1320
                                parent_trans_id)
 
1321
                        if trans_id in self._new_reference_revision:
 
1322
                            new_entry = inventory.TreeReference(
 
1323
                                file_id,
 
1324
                                self._new_name[trans_id],
 
1325
                                self.final_file_id(self._new_parent[trans_id]),
 
1326
                                None, self._new_reference_revision[trans_id])
 
1327
                        else:
 
1328
                            new_entry = inventory.make_entry(kind,
 
1329
                                self.final_name(trans_id),
 
1330
                                parent_file_id, file_id)
 
1331
                        old_path = old_paths.get(new_entry.file_id)
 
1332
                        inventory_delta.append(
 
1333
                            (old_path, path, new_entry.file_id, new_entry))
 
1334
 
1883
1335
                if trans_id in self._new_executability:
1884
 
                    self._set_executability(path, trans_id)
1885
 
                if trans_id in self._observed_sha1s:
1886
 
                    o_sha1, o_st_val = self._observed_sha1s[trans_id]
1887
 
                    st = osutils.lstat(full_path)
1888
 
                    self._observed_sha1s[trans_id] = (o_sha1, st)
 
1336
                    self._set_executability(path, new_entry, trans_id)
1889
1337
        finally:
1890
1338
            child_pb.finished()
1891
 
        for path, trans_id in new_paths:
1892
 
            # new_paths includes stuff like workingtree conflicts. Only the
1893
 
            # stuff in new_contents actually comes from limbo.
1894
 
            if trans_id in self._limbo_files:
1895
 
                del self._limbo_files[trans_id]
1896
 
        self._new_contents.clear()
 
1339
        if inventory_delta is None:
 
1340
            self._new_contents.clear()
 
1341
        else:
 
1342
            for trans_id in completed_new:
 
1343
                del self._new_contents[trans_id]
1897
1344
        return modified_paths
1898
1345
 
1899
 
    def _apply_observed_sha1s(self):
1900
 
        """After we have finished renaming everything, update observed sha1s
1901
 
 
1902
 
        This has to be done after self._tree.apply_inventory_delta, otherwise
1903
 
        it doesn't know anything about the files we are updating. Also, we want
1904
 
        to do this as late as possible, so that most entries end up cached.
1905
 
        """
1906
 
        # TODO: this doesn't update the stat information for directories. So
1907
 
        #       the first 'bzr status' will still need to rewrite
1908
 
        #       .bzr/checkout/dirstate. However, we at least don't need to
1909
 
        #       re-read all of the files.
1910
 
        # TODO: If the operation took a while, we could do a time.sleep(3) here
1911
 
        #       to allow the clock to tick over and ensure we won't have any
1912
 
        #       problems. (we could observe start time, and finish time, and if
1913
 
        #       it is less than eg 10% overhead, add a sleep call.)
1914
 
        paths = FinalPaths(self)
1915
 
        for trans_id, observed in self._observed_sha1s.iteritems():
1916
 
            path = paths.get_path(trans_id)
1917
 
            # We could get the file_id, but dirstate prefers to use the path
1918
 
            # anyway, and it is 'cheaper' to determine.
1919
 
            # file_id = self._new_id[trans_id]
1920
 
            self._tree._observed_sha1(None, path, observed)
1921
 
 
1922
 
 
1923
 
class TransformPreview(DiskTreeTransform):
 
1346
 
 
1347
class TransformPreview(TreeTransformBase):
1924
1348
    """A TreeTransform for generating preview trees.
1925
1349
 
1926
1350
    Unlike TreeTransform, this version works when the input tree is a
1928
1352
    unversioned files in the input tree.
1929
1353
    """
1930
1354
 
1931
 
    def __init__(self, tree, pb=None, case_sensitive=True):
 
1355
    def __init__(self, tree, pb=DummyProgress(), case_sensitive=True):
1932
1356
        tree.lock_read()
1933
 
        limbodir = osutils.mkdtemp(prefix='bzr-limbo-')
1934
 
        DiskTreeTransform.__init__(self, tree, limbodir, pb, case_sensitive)
 
1357
        limbodir = tempfile.mkdtemp(prefix='bzr-limbo-')
 
1358
        TreeTransformBase.__init__(self, tree, limbodir, pb, case_sensitive)
1935
1359
 
1936
1360
    def canonical_path(self, path):
1937
1361
        return path
1939
1363
    def tree_kind(self, trans_id):
1940
1364
        path = self._tree_id_paths.get(trans_id)
1941
1365
        if path is None:
1942
 
            return None
1943
 
        kind = self._tree.path_content_summary(path)[0]
1944
 
        if kind == 'missing':
1945
 
            kind = None
1946
 
        return kind
 
1366
            raise NoSuchFile(None)
 
1367
        file_id = self._tree.path2id(path)
 
1368
        return self._tree.kind(file_id)
1947
1369
 
1948
1370
    def _set_mode(self, trans_id, mode_id, typefunc):
1949
1371
        """Set the mode of new file contents.
1961
1383
        except KeyError:
1962
1384
            return
1963
1385
        file_id = self.tree_file_id(parent_id)
1964
 
        if file_id is None:
1965
 
            return
1966
 
        entry = self._tree.iter_entries_by_dir([file_id]).next()[1]
1967
 
        children = getattr(entry, 'children', {})
1968
 
        for child in children:
 
1386
        for child in self._tree.inventory[file_id].children.iterkeys():
1969
1387
            childpath = joinpath(path, child)
1970
1388
            yield self.trans_id_tree_path(childpath)
1971
1389
 
1972
 
    def new_orphan(self, trans_id, parent_id):
1973
 
        raise NotImplementedError(self.new_orphan)
1974
 
 
1975
 
 
1976
 
class _PreviewTree(tree.InventoryTree):
 
1390
 
 
1391
class _PreviewTree(tree.Tree):
1977
1392
    """Partial implementation of Tree to support show_diff_trees"""
1978
1393
 
1979
1394
    def __init__(self, transform):
1980
1395
        self._transform = transform
1981
1396
        self._final_paths = FinalPaths(transform)
1982
 
        self.__by_parent = None
1983
 
        self._parent_ids = []
1984
 
        self._all_children_cache = {}
1985
 
        self._path2trans_id_cache = {}
1986
 
        self._final_name_cache = {}
1987
 
        self._iter_changes_cache = dict((c[0], c) for c in
1988
 
                                        self._transform.iter_changes())
 
1397
 
 
1398
    def _changes(self, file_id):
 
1399
        for changes in self._transform.iter_changes():
 
1400
            if changes[0] == file_id:
 
1401
                return changes
1989
1402
 
1990
1403
    def _content_change(self, file_id):
1991
1404
        """Return True if the content of this file changed"""
1992
 
        changes = self._iter_changes_cache.get(file_id)
 
1405
        changes = self._changes(file_id)
1993
1406
        # changes[2] is true if the file content changed.  See
1994
1407
        # InterTree.iter_changes.
1995
1408
        return (changes is not None and changes[2])
1996
1409
 
1997
 
    def _get_repository(self):
1998
 
        repo = getattr(self._transform._tree, '_repository', None)
1999
 
        if repo is None:
2000
 
            repo = self._transform._tree.branch.repository
2001
 
        return repo
2002
 
 
2003
 
    def _iter_parent_trees(self):
2004
 
        for revision_id in self.get_parent_ids():
2005
 
            try:
2006
 
                yield self.revision_tree(revision_id)
2007
 
            except errors.NoSuchRevisionInTree:
2008
 
                yield self._get_repository().revision_tree(revision_id)
2009
 
 
2010
1410
    def _get_file_revision(self, file_id, vf, tree_revision):
2011
 
        parent_keys = [(file_id, t.get_file_revision(file_id)) for t in
2012
 
                       self._iter_parent_trees()]
2013
 
        vf.add_lines((file_id, tree_revision), parent_keys,
2014
 
                     self.get_file_lines(file_id))
2015
 
        repo = self._get_repository()
2016
 
        base_vf = repo.texts
2017
 
        if base_vf not in vf.fallback_versionedfiles:
2018
 
            vf.fallback_versionedfiles.append(base_vf)
2019
 
        return tree_revision
 
1411
        return self._transform._tree._get_file_revision(file_id, vf,
 
1412
                                                        tree_revision)
2020
1413
 
2021
 
    def _stat_limbo_file(self, file_id=None, trans_id=None):
2022
 
        if trans_id is None:
2023
 
            trans_id = self._transform.trans_id_file_id(file_id)
 
1414
    def _stat_limbo_file(self, file_id):
 
1415
        trans_id = self._transform.trans_id_file_id(file_id)
2024
1416
        name = self._transform._limbo_name(trans_id)
2025
1417
        return os.lstat(name)
2026
1418
 
2027
 
    @property
2028
 
    def _by_parent(self):
2029
 
        if self.__by_parent is None:
2030
 
            self.__by_parent = self._transform.by_parent()
2031
 
        return self.__by_parent
2032
 
 
2033
 
    def _comparison_data(self, entry, path):
2034
 
        kind, size, executable, link_or_sha1 = self.path_content_summary(path)
2035
 
        if kind == 'missing':
2036
 
            kind = None
2037
 
            executable = False
2038
 
        else:
2039
 
            file_id = self._transform.final_file_id(self._path2trans_id(path))
2040
 
            executable = self.is_executable(file_id, path)
2041
 
        return kind, executable, None
2042
 
 
2043
 
    def is_locked(self):
2044
 
        return False
2045
 
 
2046
1419
    def lock_read(self):
2047
1420
        # Perhaps in theory, this should lock the TreeTransform?
2048
 
        return self
 
1421
        pass
2049
1422
 
2050
1423
    def unlock(self):
2051
1424
        pass
2052
1425
 
2053
1426
    @property
2054
 
    @deprecated_method(deprecated_in((2, 5, 0)))
2055
1427
    def inventory(self):
2056
1428
        """This Tree does not use inventory as its backing data."""
2057
1429
        raise NotImplementedError(_PreviewTree.inventory)
2058
1430
 
2059
 
    @property
2060
 
    def root_inventory(self):
2061
 
        """This Tree does not use inventory as its backing data."""
2062
 
        raise NotImplementedError(_PreviewTree.root_inventory)
2063
 
 
2064
1431
    def get_root_id(self):
2065
1432
        return self._transform.final_file_id(self._transform.root)
2066
1433
 
2067
1434
    def all_file_ids(self):
2068
 
        tree_ids = set(self._transform._tree.all_file_ids())
2069
 
        tree_ids.difference_update(self._transform.tree_file_id(t)
2070
 
                                   for t in self._transform._removed_id)
2071
 
        tree_ids.update(self._transform._new_id.values())
2072
 
        return tree_ids
 
1435
        return self._transform._tree.all_file_ids()
2073
1436
 
2074
1437
    def __iter__(self):
2075
1438
        return iter(self.all_file_ids())
2076
1439
 
2077
 
    def _has_id(self, file_id, fallback_check):
2078
 
        if file_id in self._transform._r_new_id:
2079
 
            return True
2080
 
        elif file_id in set([self._transform.tree_file_id(trans_id) for
2081
 
            trans_id in self._transform._removed_id]):
2082
 
            return False
2083
 
        else:
2084
 
            return fallback_check(file_id)
2085
 
 
2086
 
    def has_id(self, file_id):
2087
 
        return self._has_id(file_id, self._transform._tree.has_id)
2088
 
 
2089
 
    def has_or_had_id(self, file_id):
2090
 
        return self._has_id(file_id, self._transform._tree.has_or_had_id)
2091
 
 
2092
 
    def _path2trans_id(self, path):
2093
 
        # We must not use None here, because that is a valid value to store.
2094
 
        trans_id = self._path2trans_id_cache.get(path, object)
2095
 
        if trans_id is not object:
2096
 
            return trans_id
2097
 
        segments = splitpath(path)
2098
 
        cur_parent = self._transform.root
2099
 
        for cur_segment in segments:
2100
 
            for child in self._all_children(cur_parent):
2101
 
                final_name = self._final_name_cache.get(child)
2102
 
                if final_name is None:
2103
 
                    final_name = self._transform.final_name(child)
2104
 
                    self._final_name_cache[child] = final_name
2105
 
                if final_name == cur_segment:
2106
 
                    cur_parent = child
2107
 
                    break
2108
 
            else:
2109
 
                self._path2trans_id_cache[path] = None
2110
 
                return None
2111
 
        self._path2trans_id_cache[path] = cur_parent
2112
 
        return cur_parent
 
1440
    def paths2ids(self, specific_files, trees=None, require_versioned=False):
 
1441
        """See Tree.paths2ids"""
 
1442
        to_find = set(specific_files)
 
1443
        result = set()
 
1444
        for (file_id, paths, changed, versioned, parent, name, kind,
 
1445
             executable) in self._transform.iter_changes():
 
1446
            if paths[1] in to_find:
 
1447
                result.append(file_id)
 
1448
                to_find.remove(paths[1])
 
1449
        result.update(self._transform._tree.paths2ids(to_find,
 
1450
                      trees=[], require_versioned=require_versioned))
 
1451
        return result
2113
1452
 
2114
1453
    def path2id(self, path):
2115
 
        if isinstance(path, list):
2116
 
            if path == []:
2117
 
                path = [""]
2118
 
            path = osutils.pathjoin(*path)
2119
 
        return self._transform.final_file_id(self._path2trans_id(path))
 
1454
        return self._transform._tree.path2id(path)
2120
1455
 
2121
1456
    def id2path(self, file_id):
2122
1457
        trans_id = self._transform.trans_id_file_id(file_id)
2125
1460
        except NoFinalPath:
2126
1461
            raise errors.NoSuchId(self, file_id)
2127
1462
 
2128
 
    def _all_children(self, trans_id):
2129
 
        children = self._all_children_cache.get(trans_id)
2130
 
        if children is not None:
2131
 
            return children
2132
 
        children = set(self._transform.iter_tree_children(trans_id))
2133
 
        # children in the _new_parent set are provided by _by_parent.
2134
 
        children.difference_update(self._transform._new_parent.keys())
2135
 
        children.update(self._by_parent.get(trans_id, []))
2136
 
        self._all_children_cache[trans_id] = children
2137
 
        return children
2138
 
 
2139
 
    def iter_children(self, file_id):
2140
 
        trans_id = self._transform.trans_id_file_id(file_id)
2141
 
        for child_trans_id in self._all_children(trans_id):
2142
 
            yield self._transform.final_file_id(child_trans_id)
2143
 
 
2144
 
    def extras(self):
2145
 
        possible_extras = set(self._transform.trans_id_tree_path(p) for p
2146
 
                              in self._transform._tree.extras())
2147
 
        possible_extras.update(self._transform._new_contents)
2148
 
        possible_extras.update(self._transform._removed_id)
2149
 
        for trans_id in possible_extras:
2150
 
            if self._transform.final_file_id(trans_id) is None:
2151
 
                yield self._final_paths._determine_path(trans_id)
2152
 
 
2153
 
    def _make_inv_entries(self, ordered_entries, specific_file_ids=None,
2154
 
        yield_parents=False):
2155
 
        for trans_id, parent_file_id in ordered_entries:
2156
 
            file_id = self._transform.final_file_id(trans_id)
2157
 
            if file_id is None:
2158
 
                continue
2159
 
            if (specific_file_ids is not None
2160
 
                and file_id not in specific_file_ids):
2161
 
                continue
2162
 
            kind = self._transform.final_kind(trans_id)
2163
 
            if kind is None:
2164
 
                kind = self._transform._tree.stored_kind(file_id)
2165
 
            new_entry = inventory.make_entry(
2166
 
                kind,
2167
 
                self._transform.final_name(trans_id),
2168
 
                parent_file_id, file_id)
2169
 
            yield new_entry, trans_id
2170
 
 
2171
 
    def _list_files_by_dir(self):
2172
 
        todo = [ROOT_PARENT]
2173
 
        ordered_ids = []
2174
 
        while len(todo) > 0:
2175
 
            parent = todo.pop()
2176
 
            parent_file_id = self._transform.final_file_id(parent)
2177
 
            children = list(self._all_children(parent))
2178
 
            paths = dict(zip(children, self._final_paths.get_paths(children)))
2179
 
            children.sort(key=paths.get)
2180
 
            todo.extend(reversed(children))
2181
 
            for trans_id in children:
2182
 
                ordered_ids.append((trans_id, parent_file_id))
2183
 
        return ordered_ids
2184
 
 
2185
 
    def iter_child_entries(self, file_id, path=None):
2186
 
        self.id2path(file_id)
2187
 
        trans_id = self._transform.trans_id_file_id(file_id)
2188
 
        todo = [(child_trans_id, trans_id) for child_trans_id in
2189
 
                self._all_children(trans_id)]
2190
 
        for entry, trans_id in self._make_inv_entries(todo):
2191
 
            yield entry
2192
 
 
2193
 
    def iter_entries_by_dir(self, specific_file_ids=None, yield_parents=False):
2194
 
        # This may not be a maximally efficient implementation, but it is
2195
 
        # reasonably straightforward.  An implementation that grafts the
2196
 
        # TreeTransform changes onto the tree's iter_entries_by_dir results
2197
 
        # might be more efficient, but requires tricky inferences about stack
2198
 
        # position.
2199
 
        ordered_ids = self._list_files_by_dir()
2200
 
        for entry, trans_id in self._make_inv_entries(ordered_ids,
2201
 
            specific_file_ids, yield_parents=yield_parents):
2202
 
            yield unicode(self._final_paths.get_path(trans_id)), entry
2203
 
 
2204
 
    def _iter_entries_for_dir(self, dir_path):
2205
 
        """Return path, entry for items in a directory without recursing down."""
2206
 
        dir_file_id = self.path2id(dir_path)
2207
 
        ordered_ids = []
2208
 
        for file_id in self.iter_children(dir_file_id):
2209
 
            trans_id = self._transform.trans_id_file_id(file_id)
2210
 
            ordered_ids.append((trans_id, file_id))
2211
 
        for entry, trans_id in self._make_inv_entries(ordered_ids):
2212
 
            yield unicode(self._final_paths.get_path(trans_id)), entry
2213
 
 
2214
 
    def list_files(self, include_root=False, from_dir=None, recursive=True):
2215
 
        """See WorkingTree.list_files."""
2216
 
        # XXX This should behave like WorkingTree.list_files, but is really
2217
 
        # more like RevisionTree.list_files.
2218
 
        if recursive:
2219
 
            prefix = None
2220
 
            if from_dir:
2221
 
                prefix = from_dir + '/'
2222
 
            entries = self.iter_entries_by_dir()
2223
 
            for path, entry in entries:
2224
 
                if entry.name == '' and not include_root:
2225
 
                    continue
2226
 
                if prefix:
2227
 
                    if not path.startswith(prefix):
2228
 
                        continue
2229
 
                    path = path[len(prefix):]
2230
 
                yield path, 'V', entry.kind, entry.file_id, entry
2231
 
        else:
2232
 
            if from_dir is None and include_root is True:
2233
 
                root_entry = inventory.make_entry('directory', '',
2234
 
                    ROOT_PARENT, self.get_root_id())
2235
 
                yield '', 'V', 'directory', root_entry.file_id, root_entry
2236
 
            entries = self._iter_entries_for_dir(from_dir or '')
2237
 
            for path, entry in entries:
2238
 
                yield path, 'V', entry.kind, entry.file_id, entry
 
1463
    def iter_entries_by_dir(self, specific_file_ids=None):
 
1464
        return self._transform._tree.iter_entries_by_dir(specific_file_ids)
2239
1465
 
2240
1466
    def kind(self, file_id):
2241
1467
        trans_id = self._transform.trans_id_file_id(file_id)
2242
1468
        return self._transform.final_kind(trans_id)
2243
1469
 
2244
1470
    def stored_kind(self, file_id):
2245
 
        trans_id = self._transform.trans_id_file_id(file_id)
2246
 
        try:
2247
 
            return self._transform._new_contents[trans_id]
2248
 
        except KeyError:
2249
 
            return self._transform._tree.stored_kind(file_id)
 
1471
        return self._transform._tree.stored_kind(file_id)
2250
1472
 
2251
1473
    def get_file_mtime(self, file_id, path=None):
2252
1474
        """See Tree.get_file_mtime"""
2253
1475
        if not self._content_change(file_id):
2254
 
            return self._transform._tree.get_file_mtime(file_id)
 
1476
            return self._transform._tree.get_file_mtime(file_id, path)
2255
1477
        return self._stat_limbo_file(file_id).st_mtime
2256
1478
 
2257
 
    def _file_size(self, entry, stat_value):
2258
 
        return self.get_file_size(entry.file_id)
2259
 
 
2260
1479
    def get_file_size(self, file_id):
2261
1480
        """See Tree.get_file_size"""
2262
 
        trans_id = self._transform.trans_id_file_id(file_id)
2263
 
        kind = self._transform.final_kind(trans_id)
2264
 
        if kind != 'file':
2265
 
            return None
2266
 
        if trans_id in self._transform._new_contents:
2267
 
            return self._stat_limbo_file(trans_id=trans_id).st_size
2268
1481
        if self.kind(file_id) == 'file':
2269
1482
            return self._transform._tree.get_file_size(file_id)
2270
1483
        else:
2271
1484
            return None
2272
1485
 
2273
 
    def get_file_verifier(self, file_id, path=None, stat_value=None):
2274
 
        trans_id = self._transform.trans_id_file_id(file_id)
2275
 
        kind = self._transform._new_contents.get(trans_id)
2276
 
        if kind is None:
2277
 
            return self._transform._tree.get_file_verifier(file_id)
2278
 
        if kind == 'file':
2279
 
            fileobj = self.get_file(file_id)
2280
 
            try:
2281
 
                return ("SHA1", sha_file(fileobj))
2282
 
            finally:
2283
 
                fileobj.close()
2284
 
 
2285
1486
    def get_file_sha1(self, file_id, path=None, stat_value=None):
2286
 
        trans_id = self._transform.trans_id_file_id(file_id)
2287
 
        kind = self._transform._new_contents.get(trans_id)
2288
 
        if kind is None:
2289
 
            return self._transform._tree.get_file_sha1(file_id)
2290
 
        if kind == 'file':
2291
 
            fileobj = self.get_file(file_id)
2292
 
            try:
2293
 
                return sha_file(fileobj)
2294
 
            finally:
2295
 
                fileobj.close()
 
1487
        return self._transform._tree.get_file_sha1(file_id)
2296
1488
 
2297
1489
    def is_executable(self, file_id, path=None):
2298
 
        if file_id is None:
2299
 
            return False
2300
 
        trans_id = self._transform.trans_id_file_id(file_id)
2301
 
        try:
2302
 
            return self._transform._new_executability[trans_id]
2303
 
        except KeyError:
2304
 
            try:
2305
 
                return self._transform._tree.is_executable(file_id, path)
2306
 
            except OSError, e:
2307
 
                if e.errno == errno.ENOENT:
2308
 
                    return False
2309
 
                raise
2310
 
            except errors.NoSuchId:
2311
 
                return False
2312
 
 
2313
 
    def has_filename(self, path):
2314
 
        trans_id = self._path2trans_id(path)
2315
 
        if trans_id in self._transform._new_contents:
2316
 
            return True
2317
 
        elif trans_id in self._transform._removed_contents:
2318
 
            return False
2319
 
        else:
2320
 
            return self._transform._tree.has_filename(path)
 
1490
        return self._transform._tree.is_executable(file_id, path)
2321
1491
 
2322
1492
    def path_content_summary(self, path):
2323
 
        trans_id = self._path2trans_id(path)
2324
 
        tt = self._transform
2325
 
        tree_path = tt._tree_id_paths.get(trans_id)
2326
 
        kind = tt._new_contents.get(trans_id)
2327
 
        if kind is None:
2328
 
            if tree_path is None or trans_id in tt._removed_contents:
2329
 
                return 'missing', None, None, None
2330
 
            summary = tt._tree.path_content_summary(tree_path)
2331
 
            kind, size, executable, link_or_sha1 = summary
2332
 
        else:
2333
 
            link_or_sha1 = None
2334
 
            limbo_name = tt._limbo_name(trans_id)
2335
 
            if trans_id in tt._new_reference_revision:
2336
 
                kind = 'tree-reference'
2337
 
            if kind == 'file':
2338
 
                statval = os.lstat(limbo_name)
2339
 
                size = statval.st_size
2340
 
                if not tt._limbo_supports_executable():
2341
 
                    executable = False
2342
 
                else:
2343
 
                    executable = statval.st_mode & S_IEXEC
2344
 
            else:
2345
 
                size = None
2346
 
                executable = None
2347
 
            if kind == 'symlink':
2348
 
                link_or_sha1 = os.readlink(limbo_name).decode(osutils._fs_enc)
2349
 
        executable = tt._new_executability.get(trans_id, executable)
2350
 
        return kind, size, executable, link_or_sha1
 
1493
        return self._transform._tree.path_content_summary(path)
2351
1494
 
2352
1495
    def iter_changes(self, from_tree, include_unchanged=False,
2353
1496
                      specific_files=None, pb=None, extra_trees=None,
2354
1497
                      require_versioned=True, want_unversioned=False):
2355
1498
        """See InterTree.iter_changes.
2356
1499
 
2357
 
        This has a fast path that is only used when the from_tree matches
2358
 
        the transform tree, and no fancy options are supplied.
 
1500
        This implementation does not support include_unchanged, specific_files,
 
1501
        or want_unversioned.  extra_trees, require_versioned, and pb are
 
1502
        ignored.
2359
1503
        """
2360
 
        if (from_tree is not self._transform._tree or include_unchanged or
2361
 
            specific_files or want_unversioned):
2362
 
            return tree.InterTree(from_tree, self).iter_changes(
2363
 
                include_unchanged=include_unchanged,
2364
 
                specific_files=specific_files,
2365
 
                pb=pb,
2366
 
                extra_trees=extra_trees,
2367
 
                require_versioned=require_versioned,
2368
 
                want_unversioned=want_unversioned)
 
1504
        if from_tree is not self._transform._tree:
 
1505
            raise ValueError('from_tree must be transform source tree.')
 
1506
        if include_unchanged:
 
1507
            raise ValueError('include_unchanged is not supported')
 
1508
        if specific_files is not None:
 
1509
            raise ValueError('specific_files is not supported')
2369
1510
        if want_unversioned:
2370
1511
            raise ValueError('want_unversioned is not supported')
2371
1512
        return self._transform.iter_changes()
2378
1519
        name = self._transform._limbo_name(trans_id)
2379
1520
        return open(name, 'rb')
2380
1521
 
2381
 
    def get_file_with_stat(self, file_id, path=None):
2382
 
        return self.get_file(file_id, path), None
 
1522
    def get_file_text(self, file_id):
 
1523
        text_file = self.get_file(file_id)
 
1524
        try:
 
1525
            return text_file.read()
 
1526
        finally:
 
1527
            text_file.close()
2383
1528
 
2384
1529
    def annotate_iter(self, file_id,
2385
1530
                      default_revision=_mod_revision.CURRENT_REVISION):
2386
 
        changes = self._iter_changes_cache.get(file_id)
2387
 
        if changes is None:
2388
 
            get_old = True
2389
 
        else:
2390
 
            changed_content, versioned, kind = (changes[2], changes[3],
2391
 
                                                changes[6])
2392
 
            if kind[1] is None:
2393
 
                return None
2394
 
            get_old = (kind[0] == 'file' and versioned[0])
2395
 
        if get_old:
2396
 
            old_annotation = self._transform._tree.annotate_iter(file_id,
2397
 
                default_revision=default_revision)
2398
 
        else:
2399
 
            old_annotation = []
2400
 
        if changes is None:
2401
 
            return old_annotation
2402
 
        if not changed_content:
2403
 
            return old_annotation
2404
 
        # TODO: This is doing something similar to what WT.annotate_iter is
2405
 
        #       doing, however it fails slightly because it doesn't know what
2406
 
        #       the *other* revision_id is, so it doesn't know how to give the
2407
 
        #       other as the origin for some lines, they all get
2408
 
        #       'default_revision'
2409
 
        #       It would be nice to be able to use the new Annotator based
2410
 
        #       approach, as well.
2411
 
        return annotate.reannotate([old_annotation],
2412
 
                                   self.get_file(file_id).readlines(),
2413
 
                                   default_revision)
 
1531
        return self._transform._tree.annotate_iter(file_id,
 
1532
            default_revision=default_revision)
2414
1533
 
2415
 
    def get_symlink_target(self, file_id, path=None):
 
1534
    def get_symlink_target(self, file_id):
2416
1535
        """See Tree.get_symlink_target"""
2417
1536
        if not self._content_change(file_id):
2418
1537
            return self._transform._tree.get_symlink_target(file_id)
2419
1538
        trans_id = self._transform.trans_id_file_id(file_id)
2420
1539
        name = self._transform._limbo_name(trans_id)
2421
 
        return osutils.readlink(name)
2422
 
 
2423
 
    def walkdirs(self, prefix=''):
2424
 
        pending = [self._transform.root]
2425
 
        while len(pending) > 0:
2426
 
            parent_id = pending.pop()
2427
 
            children = []
2428
 
            subdirs = []
2429
 
            prefix = prefix.rstrip('/')
2430
 
            parent_path = self._final_paths.get_path(parent_id)
2431
 
            parent_file_id = self._transform.final_file_id(parent_id)
2432
 
            for child_id in self._all_children(parent_id):
2433
 
                path_from_root = self._final_paths.get_path(child_id)
2434
 
                basename = self._transform.final_name(child_id)
2435
 
                file_id = self._transform.final_file_id(child_id)
2436
 
                kind  = self._transform.final_kind(child_id)
2437
 
                if kind is not None:
2438
 
                    versioned_kind = kind
2439
 
                else:
2440
 
                    kind = 'unknown'
2441
 
                    versioned_kind = self._transform._tree.stored_kind(file_id)
2442
 
                if versioned_kind == 'directory':
2443
 
                    subdirs.append(child_id)
2444
 
                children.append((path_from_root, basename, kind, None,
2445
 
                                 file_id, versioned_kind))
2446
 
            children.sort()
2447
 
            if parent_path.startswith(prefix):
2448
 
                yield (parent_path, parent_file_id), children
2449
 
            pending.extend(sorted(subdirs, key=self._final_paths.get_path,
2450
 
                                  reverse=True))
 
1540
        return os.readlink(name)
 
1541
 
 
1542
    def list_files(self, include_root=False):
 
1543
        return self._transform._tree.list_files(include_root)
 
1544
 
 
1545
    def walkdirs(self, prefix=""):
 
1546
        return self._transform._tree.walkdirs(prefix)
2451
1547
 
2452
1548
    def get_parent_ids(self):
2453
 
        return self._parent_ids
2454
 
 
2455
 
    def set_parent_ids(self, parent_ids):
2456
 
        self._parent_ids = parent_ids
 
1549
        return self._transform._tree.get_parent_ids()
2457
1550
 
2458
1551
    def get_revision_tree(self, revision_id):
2459
1552
        return self._transform._tree.get_revision_tree(revision_id)
2479
1572
        self.transform = transform
2480
1573
 
2481
1574
    def _determine_path(self, trans_id):
2482
 
        if (trans_id == self.transform.root or trans_id == ROOT_PARENT):
 
1575
        if trans_id == self.transform.root:
2483
1576
            return ""
2484
1577
        name = self.transform.final_name(trans_id)
2485
1578
        parent_id = self.transform.final_parent(trans_id)
2509
1602
def build_tree(tree, wt, accelerator_tree=None, hardlink=False,
2510
1603
               delta_from_tree=False):
2511
1604
    """Create working tree for a branch, using a TreeTransform.
2512
 
 
 
1605
    
2513
1606
    This function should be used on empty trees, having a tree root at most.
2514
1607
    (see merge and revert functionality for working with existing trees)
2515
1608
 
2516
1609
    Existing files are handled like so:
2517
 
 
 
1610
    
2518
1611
    - Existing bzrdirs take precedence over creating new items.  They are
2519
1612
      created as '%s.diverted' % name.
2520
1613
    - Otherwise, if the content on disk matches the content we are building,
2555
1648
    for num, _unused in enumerate(wt.all_file_ids()):
2556
1649
        if num > 0:  # more than just a root
2557
1650
            raise errors.WorkingTreeAlreadyPopulated(base=wt.basedir)
 
1651
    existing_files = set()
 
1652
    for dir, files in wt.walkdirs():
 
1653
        existing_files.update(f[0] for f in files)
2558
1654
    file_trans_id = {}
2559
 
    top_pb = ui.ui_factory.nested_progress_bar()
 
1655
    top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
2560
1656
    pp = ProgressPhase("Build phase", 2, top_pb)
2561
 
    if tree.get_root_id() is not None:
 
1657
    if tree.inventory.root is not None:
2562
1658
        # This is kind of a hack: we should be altering the root
2563
1659
        # as part of the regular tree shape diff logic.
2564
1660
        # The conditional test here is to avoid doing an
2575
1671
        pp.next_phase()
2576
1672
        file_trans_id[wt.get_root_id()] = \
2577
1673
            tt.trans_id_tree_file_id(wt.get_root_id())
2578
 
        pb = ui.ui_factory.nested_progress_bar()
 
1674
        pb = bzrlib.ui.ui_factory.nested_progress_bar()
2579
1675
        try:
2580
1676
            deferred_contents = []
2581
1677
            num = 0
2582
 
            total = len(tree.all_file_ids())
 
1678
            total = len(tree.inventory)
2583
1679
            if delta_from_tree:
2584
1680
                precomputed_delta = []
2585
1681
            else:
2586
1682
                precomputed_delta = None
2587
 
            # Check if tree inventory has content. If so, we populate
2588
 
            # existing_files with the directory content. If there are no
2589
 
            # entries we skip populating existing_files as its not used.
2590
 
            # This improves performance and unncessary work on large
2591
 
            # directory trees. (#501307)
2592
 
            if total > 0:
2593
 
                existing_files = set()
2594
 
                for dir, files in wt.walkdirs():
2595
 
                    existing_files.update(f[0] for f in files)
2596
1683
            for num, (tree_path, entry) in \
2597
 
                enumerate(tree.iter_entries_by_dir()):
2598
 
                pb.update(gettext("Building tree"), num - len(deferred_contents), total)
 
1684
                enumerate(tree.inventory.iter_entries_by_dir()):
 
1685
                pb.update("Building tree", num - len(deferred_contents), total)
2599
1686
                if entry.parent_id is None:
2600
1687
                    continue
2601
1688
                reparent = False
2607
1694
                    kind = file_kind(target_path)
2608
1695
                    if kind == "directory":
2609
1696
                        try:
2610
 
                            controldir.ControlDir.open(target_path)
 
1697
                            bzrdir.BzrDir.open(target_path)
2611
1698
                        except errors.NotBranchError:
2612
1699
                            pass
2613
1700
                        else:
2628
1715
                    executable = tree.is_executable(file_id, tree_path)
2629
1716
                    if executable:
2630
1717
                        tt.set_executability(executable, trans_id)
2631
 
                    trans_data = (trans_id, tree_path, entry.text_sha1)
2632
 
                    deferred_contents.append((file_id, trans_data))
 
1718
                    deferred_contents.append((file_id, trans_id))
2633
1719
                else:
2634
1720
                    file_trans_id[file_id] = new_by_entry(tt, entry, parent_id,
2635
1721
                                                          tree)
2650
1736
            precomputed_delta = None
2651
1737
        conflicts = cook_conflicts(raw_conflicts, tt)
2652
1738
        for conflict in conflicts:
2653
 
            trace.warning(unicode(conflict))
 
1739
            warning(conflict)
2654
1740
        try:
2655
1741
            wt.add_conflicts(conflicts)
2656
1742
        except errors.UnsupportedOperation:
2666
1752
def _create_files(tt, tree, desired_files, pb, offset, accelerator_tree,
2667
1753
                  hardlink):
2668
1754
    total = len(desired_files) + offset
2669
 
    wt = tt._tree
2670
1755
    if accelerator_tree is None:
2671
1756
        new_desired_files = desired_files
2672
1757
    else:
2673
1758
        iter = accelerator_tree.iter_changes(tree, include_unchanged=True)
2674
 
        unchanged = [(f, p[1]) for (f, p, c, v, d, n, k, e)
2675
 
                     in iter if not (c or e[0] != e[1])]
2676
 
        if accelerator_tree.supports_content_filtering():
2677
 
            unchanged = [(f, p) for (f, p) in unchanged
2678
 
                         if not accelerator_tree.iter_search_rules([p]).next()]
2679
 
        unchanged = dict(unchanged)
 
1759
        unchanged = dict((f, p[1]) for (f, p, c, v, d, n, k, e)
 
1760
                         in iter if not (c or e[0] != e[1]))
2680
1761
        new_desired_files = []
2681
1762
        count = 0
2682
 
        for file_id, (trans_id, tree_path, text_sha1) in desired_files:
 
1763
        for file_id, trans_id in desired_files:
2683
1764
            accelerator_path = unchanged.get(file_id)
2684
1765
            if accelerator_path is None:
2685
 
                new_desired_files.append((file_id,
2686
 
                    (trans_id, tree_path, text_sha1)))
 
1766
                new_desired_files.append((file_id, trans_id))
2687
1767
                continue
2688
 
            pb.update(gettext('Adding file contents'), count + offset, total)
 
1768
            pb.update('Adding file contents', count + offset, total)
2689
1769
            if hardlink:
2690
1770
                tt.create_hardlink(accelerator_tree.abspath(accelerator_path),
2691
1771
                                   trans_id)
2692
1772
            else:
2693
1773
                contents = accelerator_tree.get_file(file_id, accelerator_path)
2694
 
                if wt.supports_content_filtering():
2695
 
                    filters = wt._content_filter_stack(tree_path)
2696
 
                    contents = filtered_output_bytes(contents, filters,
2697
 
                        ContentFilterContext(tree_path, tree))
2698
1774
                try:
2699
 
                    tt.create_file(contents, trans_id, sha1=text_sha1)
 
1775
                    tt.create_file(contents, trans_id)
2700
1776
                finally:
2701
 
                    try:
2702
 
                        contents.close()
2703
 
                    except AttributeError:
2704
 
                        # after filtering, contents may no longer be file-like
2705
 
                        pass
 
1777
                    contents.close()
2706
1778
            count += 1
2707
1779
        offset += count
2708
 
    for count, ((trans_id, tree_path, text_sha1), contents) in enumerate(
2709
 
            tree.iter_files_bytes(new_desired_files)):
2710
 
        if wt.supports_content_filtering():
2711
 
            filters = wt._content_filter_stack(tree_path)
2712
 
            contents = filtered_output_bytes(contents, filters,
2713
 
                ContentFilterContext(tree_path, tree))
2714
 
        tt.create_file(contents, trans_id, sha1=text_sha1)
2715
 
        pb.update(gettext('Adding file contents'), count + offset, total)
 
1780
    for count, (trans_id, contents) in enumerate(tree.iter_files_bytes(
 
1781
                                                 new_desired_files)):
 
1782
        tt.create_file(contents, trans_id)
 
1783
        pb.update('Adding file contents', count + offset, total)
2716
1784
 
2717
1785
 
2718
1786
def _reparent_children(tt, old_parent, new_parent):
2719
1787
    for child in tt.iter_tree_children(old_parent):
2720
1788
        tt.adjust_path(tt.final_name(child), new_parent, child)
2721
1789
 
2722
 
 
2723
1790
def _reparent_transform_children(tt, old_parent, new_parent):
2724
1791
    by_parent = tt.by_parent()
2725
1792
    for child in by_parent[old_parent]:
2726
1793
        tt.adjust_path(tt.final_name(child), new_parent, child)
2727
1794
    return by_parent[old_parent]
2728
1795
 
2729
 
 
2730
1796
def _content_match(tree, entry, file_id, kind, target_path):
2731
1797
    if entry.kind != kind:
2732
1798
        return False
2733
1799
    if entry.kind == "directory":
2734
1800
        return True
2735
1801
    if entry.kind == "file":
2736
 
        f = file(target_path, 'rb')
2737
 
        try:
2738
 
            if tree.get_file_text(file_id) == f.read():
2739
 
                return True
2740
 
        finally:
2741
 
            f.close()
 
1802
        if tree.get_file(file_id).read() == file(target_path, 'rb').read():
 
1803
            return True
2742
1804
    elif entry.kind == "symlink":
2743
1805
        if tree.get_symlink_target(file_id) == os.readlink(target_path):
2744
1806
            return True
2782
1844
    if kind == 'file':
2783
1845
        contents = tree.get_file(entry.file_id).readlines()
2784
1846
        executable = tree.is_executable(entry.file_id)
2785
 
        return tt.new_file(name, parent_id, contents, entry.file_id,
 
1847
        return tt.new_file(name, parent_id, contents, entry.file_id, 
2786
1848
                           executable)
2787
1849
    elif kind in ('directory', 'tree-reference'):
2788
1850
        trans_id = tt.new_directory(name, parent_id, entry.file_id)
2789
1851
        if kind == 'tree-reference':
2790
1852
            tt.set_tree_reference(entry.reference_revision, trans_id)
2791
 
        return trans_id
 
1853
        return trans_id 
2792
1854
    elif kind == 'symlink':
2793
1855
        target = tree.get_symlink_target(entry.file_id)
2794
1856
        return tt.new_symlink(name, parent_id, target, entry.file_id)
2796
1858
        raise errors.BadFileKindError(name, kind)
2797
1859
 
2798
1860
 
2799
 
def create_from_tree(tt, trans_id, tree, file_id, bytes=None,
2800
 
    filter_tree_path=None):
2801
 
    """Create new file contents according to tree contents.
2802
 
    
2803
 
    :param filter_tree_path: the tree path to use to lookup
2804
 
      content filters to apply to the bytes output in the working tree.
2805
 
      This only applies if the working tree supports content filtering.
2806
 
    """
2807
 
    kind = tree.kind(file_id)
2808
 
    if kind == 'directory':
 
1861
def create_by_entry(tt, entry, tree, trans_id, lines=None, mode_id=None):
 
1862
    """Create new file contents according to an inventory entry."""
 
1863
    if entry.kind == "file":
 
1864
        if lines is None:
 
1865
            lines = tree.get_file(entry.file_id).readlines()
 
1866
        tt.create_file(lines, trans_id, mode_id=mode_id)
 
1867
    elif entry.kind == "symlink":
 
1868
        tt.create_symlink(tree.get_symlink_target(entry.file_id), trans_id)
 
1869
    elif entry.kind == "directory":
2809
1870
        tt.create_directory(trans_id)
2810
 
    elif kind == "file":
2811
 
        if bytes is None:
2812
 
            tree_file = tree.get_file(file_id)
2813
 
            try:
2814
 
                bytes = tree_file.readlines()
2815
 
            finally:
2816
 
                tree_file.close()
2817
 
        wt = tt._tree
2818
 
        if wt.supports_content_filtering() and filter_tree_path is not None:
2819
 
            filters = wt._content_filter_stack(filter_tree_path)
2820
 
            bytes = filtered_output_bytes(bytes, filters,
2821
 
                ContentFilterContext(filter_tree_path, tree))
2822
 
        tt.create_file(bytes, trans_id)
2823
 
    elif kind == "symlink":
2824
 
        tt.create_symlink(tree.get_symlink_target(file_id), trans_id)
2825
 
    else:
2826
 
        raise AssertionError('Unknown kind %r' % kind)
2827
1871
 
2828
1872
 
2829
1873
def create_entry_executability(tt, entry, trans_id):
2832
1876
        tt.set_executability(entry.executable, trans_id)
2833
1877
 
2834
1878
 
 
1879
def get_backup_name(entry, by_parent, parent_trans_id, tt):
 
1880
    return _get_backup_name(entry.name, by_parent, parent_trans_id, tt)
 
1881
 
 
1882
 
 
1883
def _get_backup_name(name, by_parent, parent_trans_id, tt):
 
1884
    """Produce a backup-style name that appears to be available"""
 
1885
    def name_gen():
 
1886
        counter = 1
 
1887
        while True:
 
1888
            yield "%s.~%d~" % (name, counter)
 
1889
            counter += 1
 
1890
    for new_name in name_gen():
 
1891
        if not tt.has_named_child(by_parent, parent_trans_id, new_name):
 
1892
            return new_name
 
1893
 
 
1894
 
 
1895
def _entry_changes(file_id, entry, working_tree):
 
1896
    """Determine in which ways the inventory entry has changed.
 
1897
 
 
1898
    Returns booleans: has_contents, content_mod, meta_mod
 
1899
    has_contents means there are currently contents, but they differ
 
1900
    contents_mod means contents need to be modified
 
1901
    meta_mod means the metadata needs to be modified
 
1902
    """
 
1903
    cur_entry = working_tree.inventory[file_id]
 
1904
    try:
 
1905
        working_kind = working_tree.kind(file_id)
 
1906
        has_contents = True
 
1907
    except NoSuchFile:
 
1908
        has_contents = False
 
1909
        contents_mod = True
 
1910
        meta_mod = False
 
1911
    if has_contents is True:
 
1912
        if entry.kind != working_kind:
 
1913
            contents_mod, meta_mod = True, False
 
1914
        else:
 
1915
            cur_entry._read_tree_state(working_tree.id2path(file_id), 
 
1916
                                       working_tree)
 
1917
            contents_mod, meta_mod = entry.detect_changes(cur_entry)
 
1918
            cur_entry._forget_tree_state()
 
1919
    return has_contents, contents_mod, meta_mod
 
1920
 
 
1921
 
2835
1922
def revert(working_tree, target_tree, filenames, backups=False,
2836
 
           pb=None, change_reporter=None):
 
1923
           pb=DummyProgress(), change_reporter=None):
2837
1924
    """Revert a working tree's contents to those of a target tree."""
2838
1925
    target_tree.lock_read()
2839
 
    pb = ui.ui_factory.nested_progress_bar()
2840
1926
    tt = TreeTransform(working_tree, pb)
2841
1927
    try:
2842
1928
        pp = ProgressPhase("Revert phase", 3, pb)
2843
 
        conflicts, merge_modified = _prepare_revert_transform(
2844
 
            working_tree, target_tree, tt, filenames, backups, pp)
 
1929
        pp.next_phase()
 
1930
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
1931
        try:
 
1932
            merge_modified = _alter_files(working_tree, target_tree, tt,
 
1933
                                          child_pb, filenames, backups)
 
1934
        finally:
 
1935
            child_pb.finished()
 
1936
        pp.next_phase()
 
1937
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
1938
        try:
 
1939
            raw_conflicts = resolve_conflicts(tt, child_pb,
 
1940
                lambda t, c: conflict_pass(t, c, target_tree))
 
1941
        finally:
 
1942
            child_pb.finished()
 
1943
        conflicts = cook_conflicts(raw_conflicts, tt)
2845
1944
        if change_reporter:
2846
1945
            change_reporter = delta._ChangeReporter(
2847
1946
                unversioned_filter=working_tree.is_ignored)
2848
1947
            delta.report_changes(tt.iter_changes(), change_reporter)
2849
1948
        for conflict in conflicts:
2850
 
            trace.warning(unicode(conflict))
 
1949
            warning(conflict)
2851
1950
        pp.next_phase()
2852
1951
        tt.apply()
2853
1952
        working_tree.set_merge_modified(merge_modified)
2858
1957
    return conflicts
2859
1958
 
2860
1959
 
2861
 
def _prepare_revert_transform(working_tree, target_tree, tt, filenames,
2862
 
                              backups, pp, basis_tree=None,
2863
 
                              merge_modified=None):
2864
 
    child_pb = ui.ui_factory.nested_progress_bar()
2865
 
    try:
2866
 
        if merge_modified is None:
2867
 
            merge_modified = working_tree.merge_modified()
2868
 
        merge_modified = _alter_files(working_tree, target_tree, tt,
2869
 
                                      child_pb, filenames, backups,
2870
 
                                      merge_modified, basis_tree)
2871
 
    finally:
2872
 
        child_pb.finished()
2873
 
    child_pb = ui.ui_factory.nested_progress_bar()
2874
 
    try:
2875
 
        raw_conflicts = resolve_conflicts(tt, child_pb,
2876
 
            lambda t, c: conflict_pass(t, c, target_tree))
2877
 
    finally:
2878
 
        child_pb.finished()
2879
 
    conflicts = cook_conflicts(raw_conflicts, tt)
2880
 
    return conflicts, merge_modified
2881
 
 
2882
 
 
2883
1960
def _alter_files(working_tree, target_tree, tt, pb, specific_files,
2884
 
                 backups, merge_modified, basis_tree=None):
2885
 
    if basis_tree is not None:
2886
 
        basis_tree.lock_read()
2887
 
    # We ask the working_tree for its changes relative to the target, rather
2888
 
    # than the target changes relative to the working tree. Because WT4 has an
2889
 
    # optimizer to compare itself to a target, but no optimizer for the
2890
 
    # reverse.
2891
 
    change_list = working_tree.iter_changes(target_tree,
 
1961
                 backups):
 
1962
    merge_modified = working_tree.merge_modified()
 
1963
    change_list = target_tree.iter_changes(working_tree,
2892
1964
        specific_files=specific_files, pb=pb)
2893
 
    if target_tree.get_root_id() is None:
 
1965
    if target_tree.inventory.root is None:
2894
1966
        skip_root = True
2895
1967
    else:
2896
1968
        skip_root = False
 
1969
    basis_tree = None
2897
1970
    try:
2898
1971
        deferred_files = []
2899
1972
        for id_num, (file_id, path, changed_content, versioned, parent, name,
2900
1973
                kind, executable) in enumerate(change_list):
2901
 
            target_path, wt_path = path
2902
 
            target_versioned, wt_versioned = versioned
2903
 
            target_parent, wt_parent = parent
2904
 
            target_name, wt_name = name
2905
 
            target_kind, wt_kind = kind
2906
 
            target_executable, wt_executable = executable
2907
 
            if skip_root and wt_parent is None:
 
1974
            if skip_root and file_id[0] is not None and parent[0] is None:
2908
1975
                continue
2909
1976
            trans_id = tt.trans_id_file_id(file_id)
2910
1977
            mode_id = None
2911
1978
            if changed_content:
2912
1979
                keep_content = False
2913
 
                if wt_kind == 'file' and (backups or target_kind is None):
 
1980
                if kind[0] == 'file' and (backups or kind[1] is None):
2914
1981
                    wt_sha1 = working_tree.get_file_sha1(file_id)
2915
1982
                    if merge_modified.get(file_id) != wt_sha1:
2916
1983
                        # acquire the basis tree lazily to prevent the
2919
1986
                        if basis_tree is None:
2920
1987
                            basis_tree = working_tree.basis_tree()
2921
1988
                            basis_tree.lock_read()
2922
 
                        if basis_tree.has_id(file_id):
 
1989
                        if file_id in basis_tree:
2923
1990
                            if wt_sha1 != basis_tree.get_file_sha1(file_id):
2924
1991
                                keep_content = True
2925
 
                        elif target_kind is None and not target_versioned:
 
1992
                        elif kind[1] is None and not versioned[1]:
2926
1993
                            keep_content = True
2927
 
                if wt_kind is not None:
 
1994
                if kind[0] is not None:
2928
1995
                    if not keep_content:
2929
1996
                        tt.delete_contents(trans_id)
2930
 
                    elif target_kind is not None:
2931
 
                        parent_trans_id = tt.trans_id_file_id(wt_parent)
2932
 
                        backup_name = tt._available_backup_name(
2933
 
                            wt_name, parent_trans_id)
 
1997
                    elif kind[1] is not None:
 
1998
                        parent_trans_id = tt.trans_id_file_id(parent[0])
 
1999
                        by_parent = tt.by_parent()
 
2000
                        backup_name = _get_backup_name(name[0], by_parent,
 
2001
                                                       parent_trans_id, tt)
2934
2002
                        tt.adjust_path(backup_name, parent_trans_id, trans_id)
2935
 
                        new_trans_id = tt.create_path(wt_name, parent_trans_id)
2936
 
                        if wt_versioned and target_versioned:
 
2003
                        new_trans_id = tt.create_path(name[0], parent_trans_id)
 
2004
                        if versioned == (True, True):
2937
2005
                            tt.unversion_file(trans_id)
2938
2006
                            tt.version_file(file_id, new_trans_id)
2939
2007
                        # New contents should have the same unix perms as old
2940
2008
                        # contents
2941
2009
                        mode_id = trans_id
2942
2010
                        trans_id = new_trans_id
2943
 
                if target_kind in ('directory', 'tree-reference'):
 
2011
                if kind[1] == 'directory':
2944
2012
                    tt.create_directory(trans_id)
2945
 
                    if target_kind == 'tree-reference':
2946
 
                        revision = target_tree.get_reference_revision(file_id,
2947
 
                                                                      target_path)
2948
 
                        tt.set_tree_reference(revision, trans_id)
2949
 
                elif target_kind == 'symlink':
 
2013
                elif kind[1] == 'symlink':
2950
2014
                    tt.create_symlink(target_tree.get_symlink_target(file_id),
2951
2015
                                      trans_id)
2952
 
                elif target_kind == 'file':
 
2016
                elif kind[1] == 'file':
2953
2017
                    deferred_files.append((file_id, (trans_id, mode_id)))
2954
2018
                    if basis_tree is None:
2955
2019
                        basis_tree = working_tree.basis_tree()
2956
2020
                        basis_tree.lock_read()
2957
2021
                    new_sha1 = target_tree.get_file_sha1(file_id)
2958
 
                    if (basis_tree.has_id(file_id) and
2959
 
                        new_sha1 == basis_tree.get_file_sha1(file_id)):
 
2022
                    if (file_id in basis_tree and new_sha1 ==
 
2023
                        basis_tree.get_file_sha1(file_id)):
2960
2024
                        if file_id in merge_modified:
2961
2025
                            del merge_modified[file_id]
2962
2026
                    else:
2963
2027
                        merge_modified[file_id] = new_sha1
2964
2028
 
2965
2029
                    # preserve the execute bit when backing up
2966
 
                    if keep_content and wt_executable == target_executable:
2967
 
                        tt.set_executability(target_executable, trans_id)
2968
 
                elif target_kind is not None:
2969
 
                    raise AssertionError(target_kind)
2970
 
            if not wt_versioned and target_versioned:
 
2030
                    if keep_content and executable[0] == executable[1]:
 
2031
                        tt.set_executability(executable[1], trans_id)
 
2032
                elif kind[1] is not None:
 
2033
                    raise AssertionError(kind[1])
 
2034
            if versioned == (False, True):
2971
2035
                tt.version_file(file_id, trans_id)
2972
 
            if wt_versioned and not target_versioned:
 
2036
            if versioned == (True, False):
2973
2037
                tt.unversion_file(trans_id)
2974
 
            if (target_name is not None and
2975
 
                (wt_name != target_name or wt_parent != target_parent)):
2976
 
                if target_name == '' and target_parent is None:
2977
 
                    parent_trans = ROOT_PARENT
2978
 
                else:
2979
 
                    parent_trans = tt.trans_id_file_id(target_parent)
2980
 
                if wt_parent is None and wt_versioned:
2981
 
                    tt.adjust_root_path(target_name, parent_trans)
2982
 
                else:
2983
 
                    tt.adjust_path(target_name, parent_trans, trans_id)
2984
 
            if wt_executable != target_executable and target_kind == "file":
2985
 
                tt.set_executability(target_executable, trans_id)
2986
 
        if working_tree.supports_content_filtering():
2987
 
            for index, ((trans_id, mode_id), bytes) in enumerate(
2988
 
                target_tree.iter_files_bytes(deferred_files)):
2989
 
                file_id = deferred_files[index][0]
2990
 
                # We're reverting a tree to the target tree so using the
2991
 
                # target tree to find the file path seems the best choice
2992
 
                # here IMO - Ian C 27/Oct/2009
2993
 
                filter_tree_path = target_tree.id2path(file_id)
2994
 
                filters = working_tree._content_filter_stack(filter_tree_path)
2995
 
                bytes = filtered_output_bytes(bytes, filters,
2996
 
                    ContentFilterContext(filter_tree_path, working_tree))
2997
 
                tt.create_file(bytes, trans_id, mode_id)
2998
 
        else:
2999
 
            for (trans_id, mode_id), bytes in target_tree.iter_files_bytes(
3000
 
                deferred_files):
3001
 
                tt.create_file(bytes, trans_id, mode_id)
3002
 
        tt.fixup_new_roots()
 
2038
            if (name[1] is not None and 
 
2039
                (name[0] != name[1] or parent[0] != parent[1])):
 
2040
                tt.adjust_path(
 
2041
                    name[1], tt.trans_id_file_id(parent[1]), trans_id)
 
2042
            if executable[0] != executable[1] and kind[1] == "file":
 
2043
                tt.set_executability(executable[1], trans_id)
 
2044
        for (trans_id, mode_id), bytes in target_tree.iter_files_bytes(
 
2045
            deferred_files):
 
2046
            tt.create_file(bytes, trans_id, mode_id)
3003
2047
    finally:
3004
2048
        if basis_tree is not None:
3005
2049
            basis_tree.unlock()
3006
2050
    return merge_modified
3007
2051
 
3008
2052
 
3009
 
def resolve_conflicts(tt, pb=None, pass_func=None):
 
2053
def resolve_conflicts(tt, pb=DummyProgress(), pass_func=None):
3010
2054
    """Make many conflict-resolution attempts, but die if they fail"""
3011
2055
    if pass_func is None:
3012
2056
        pass_func = conflict_pass
3013
2057
    new_conflicts = set()
3014
 
    pb = ui.ui_factory.nested_progress_bar()
3015
2058
    try:
3016
2059
        for n in range(10):
3017
 
            pb.update(gettext('Resolution pass'), n+1, 10)
 
2060
            pb.update('Resolution pass', n+1, 10)
3018
2061
            conflicts = tt.find_conflicts()
3019
2062
            if len(conflicts) == 0:
3020
2063
                return new_conflicts
3021
2064
            new_conflicts.update(pass_func(tt, conflicts))
3022
2065
        raise MalformedTransform(conflicts=conflicts)
3023
2066
    finally:
3024
 
        pb.finished()
 
2067
        pb.clear()
3025
2068
 
3026
2069
 
3027
2070
def conflict_pass(tt, conflicts, path_tree=None):
3044
2087
                existing_file, new_file = conflict[2], conflict[1]
3045
2088
            else:
3046
2089
                existing_file, new_file = conflict[1], conflict[2]
3047
 
            new_name = tt.final_name(existing_file) + '.moved'
 
2090
            new_name = tt.final_name(existing_file)+'.moved'
3048
2091
            tt.adjust_path(new_name, final_parent, existing_file)
3049
 
            new_conflicts.add((c_type, 'Moved existing file to',
 
2092
            new_conflicts.add((c_type, 'Moved existing file to', 
3050
2093
                               existing_file, new_file))
3051
2094
        elif c_type == 'parent loop':
3052
2095
            # break the loop by undoing one of the ops that caused the loop
3056
2099
            new_conflicts.add((c_type, 'Cancelled move', cur,
3057
2100
                               tt.final_parent(cur),))
3058
2101
            tt.adjust_path(tt.final_name(cur), tt.get_tree_parent(cur), cur)
3059
 
 
 
2102
            
3060
2103
        elif c_type == 'missing parent':
3061
2104
            trans_id = conflict[1]
3062
 
            if trans_id in tt._removed_contents:
3063
 
                cancel_deletion = True
3064
 
                orphans = tt._get_potential_orphans(trans_id)
3065
 
                if orphans:
3066
 
                    cancel_deletion = False
3067
 
                    # All children are orphans
3068
 
                    for o in orphans:
3069
 
                        try:
3070
 
                            tt.new_orphan(o, trans_id)
3071
 
                        except OrphaningError:
3072
 
                            # Something bad happened so we cancel the directory
3073
 
                            # deletion which will leave it in place with a
3074
 
                            # conflict. The user can deal with it from there.
3075
 
                            # Note that this also catch the case where we don't
3076
 
                            # want to create orphans and leave the directory in
3077
 
                            # place.
3078
 
                            cancel_deletion = True
3079
 
                            break
3080
 
                if cancel_deletion:
3081
 
                    # Cancel the directory deletion
3082
 
                    tt.cancel_deletion(trans_id)
3083
 
                    new_conflicts.add(('deleting parent', 'Not deleting',
3084
 
                                       trans_id))
3085
 
            else:
 
2105
            try:
 
2106
                tt.cancel_deletion(trans_id)
 
2107
                new_conflicts.add(('deleting parent', 'Not deleting', 
 
2108
                                   trans_id))
 
2109
            except KeyError:
3086
2110
                create = True
3087
2111
                try:
3088
2112
                    tt.final_name(trans_id)
3091
2115
                        file_id = tt.final_file_id(trans_id)
3092
2116
                        if file_id is None:
3093
2117
                            file_id = tt.inactive_file_id(trans_id)
3094
 
                        _, entry = path_tree.iter_entries_by_dir(
3095
 
                            [file_id]).next()
 
2118
                        entry = path_tree.inventory[file_id]
3096
2119
                        # special-case the other tree root (move its
3097
2120
                        # children to current root)
3098
2121
                        if entry.parent_id is None:
3099
 
                            create = False
 
2122
                            create=False
3100
2123
                            moved = _reparent_transform_children(
3101
2124
                                tt, trans_id, tt.root)
3102
2125
                            for child in moved:
3113
2136
        elif c_type == 'unversioned parent':
3114
2137
            file_id = tt.inactive_file_id(conflict[1])
3115
2138
            # special-case the other tree root (move its children instead)
3116
 
            if path_tree and path_tree.has_id(file_id):
3117
 
                if path_tree.path2id('') == file_id:
3118
 
                    # This is the root entry, skip it
 
2139
            if path_tree and file_id in path_tree:
 
2140
                if path_tree.inventory[file_id].parent_id is None:
3119
2141
                    continue
3120
2142
            tt.version_file(file_id, conflict[1])
3121
2143
            new_conflicts.add((c_type, 'Versioned directory', conflict[1]))
3130
2152
            if parent_file_id is not None:
3131
2153
                tt.unversion_file(parent_id)
3132
2154
            new_conflicts.add((c_type, 'Created directory', new_parent_id))
3133
 
        elif c_type == 'versioning no contents':
3134
 
            tt.cancel_versioning(conflict[1])
3135
2155
    return new_conflicts
3136
2156
 
3137
2157
 
3138
2158
def cook_conflicts(raw_conflicts, tt):
3139
2159
    """Generate a list of cooked conflicts, sorted by file path"""
 
2160
    from bzrlib.conflicts import Conflict
3140
2161
    conflict_iter = iter_cook_conflicts(raw_conflicts, tt)
3141
 
    return sorted(conflict_iter, key=conflicts.Conflict.sort_key)
 
2162
    return sorted(conflict_iter, key=Conflict.sort_key)
3142
2163
 
3143
2164
 
3144
2165
def iter_cook_conflicts(raw_conflicts, tt):
 
2166
    from bzrlib.conflicts import Conflict
3145
2167
    fp = FinalPaths(tt)
3146
2168
    for conflict in raw_conflicts:
3147
2169
        c_type = conflict[0]
3149
2171
        modified_path = fp.get_path(conflict[2])
3150
2172
        modified_id = tt.final_file_id(conflict[2])
3151
2173
        if len(conflict) == 3:
3152
 
            yield conflicts.Conflict.factory(
3153
 
                c_type, action=action, path=modified_path, file_id=modified_id)
3154
 
 
 
2174
            yield Conflict.factory(c_type, action=action, path=modified_path,
 
2175
                                     file_id=modified_id)
 
2176
             
3155
2177
        else:
3156
2178
            conflicting_path = fp.get_path(conflict[3])
3157
2179
            conflicting_id = tt.final_file_id(conflict[3])
3158
 
            yield conflicts.Conflict.factory(
3159
 
                c_type, action=action, path=modified_path,
3160
 
                file_id=modified_id,
3161
 
                conflict_path=conflicting_path,
3162
 
                conflict_file_id=conflicting_id)
 
2180
            yield Conflict.factory(c_type, action=action, path=modified_path,
 
2181
                                   file_id=modified_id, 
 
2182
                                   conflict_path=conflicting_path,
 
2183
                                   conflict_file_id=conflicting_id)
3163
2184
 
3164
2185
 
3165
2186
class _FileMover(object):
3170
2191
        self.pending_deletions = []
3171
2192
 
3172
2193
    def rename(self, from_, to):
3173
 
        """Rename a file from one path to another."""
 
2194
        """Rename a file from one path to another.  Functions like os.rename"""
3174
2195
        try:
3175
2196
            os.rename(from_, to)
3176
2197
        except OSError, e:
3177
2198
            if e.errno in (errno.EEXIST, errno.ENOTEMPTY):
3178
2199
                raise errors.FileExists(to, str(e))
3179
 
            # normal OSError doesn't include filenames so it's hard to see where
3180
 
            # the problem is, see https://bugs.launchpad.net/bzr/+bug/491763
3181
 
            raise errors.TransformRenameFailed(from_, to, str(e), e.errno)
 
2200
            raise
3182
2201
        self.past_renames.append((from_, to))
3183
2202
 
3184
2203
    def pre_delete(self, from_, to):
3194
2213
    def rollback(self):
3195
2214
        """Reverse all renames that have been performed"""
3196
2215
        for from_, to in reversed(self.past_renames):
3197
 
            try:
3198
 
                os.rename(to, from_)
3199
 
            except OSError, e:
3200
 
                raise errors.TransformRenameFailed(to, from_, str(e), e.errno)
 
2216
            os.rename(to, from_)
3201
2217
        # after rollback, don't reuse _FileMover
3202
2218
        past_renames = None
3203
2219
        pending_deletions = None