~bzr-pqm/bzr/bzr.dev

2255.2.152 by Martin Pool
(broken) merge aaron's workingtree format changes
1
# Copyright (C) 2006, 2007 Canonical Ltd
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
2
#
1534.7.106 by Aaron Bentley
Cleaned up imports, added copyright statements
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
7
#
1534.7.106 by Aaron Bentley
Cleaned up imports, added copyright statements
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
12
#
1534.7.106 by Aaron Bentley
Cleaned up imports, added copyright statements
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
17
import os
1534.7.106 by Aaron Bentley
Cleaned up imports, added copyright statements
18
import errno
1534.7.117 by Aaron Bentley
Simplified permission handling of existing files in transform.
19
from stat import S_ISREG
1534.7.106 by Aaron Bentley
Cleaned up imports, added copyright statements
20
1551.11.12 by Aaron Bentley
Changes from review
21
from bzrlib.lazy_import import lazy_import
22
lazy_import(globals(), """
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
23
from bzrlib import (
24
    bzrdir,
2100.3.31 by Aaron Bentley
Merged bzr.dev (17 tests failing)
25
    delta,
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
26
    errors,
27
    inventory
28
    )
1551.11.12 by Aaron Bentley
Changes from review
29
""")
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
30
from bzrlib.errors import (DuplicateKey, MalformedTransform, NoSuchFile,
1534.7.162 by Aaron Bentley
Handle failures creating/deleting the Limbo directory
31
                           ReusingTransform, NotVersionedError, CantMoveRoot,
1731.1.33 by Aaron Bentley
Revert no-special-root changes
32
                           ExistingLimbo, ImmortalLimbo, NoFinalPath)
1534.7.106 by Aaron Bentley
Cleaned up imports, added copyright statements
33
from bzrlib.inventory import InventoryEntry
1558.12.9 by Aaron Bentley
Handle resolving conflicts with directories properly
34
from bzrlib.osutils import (file_kind, supports_executable, pathjoin, lexists,
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
35
                            delete_any)
1551.2.34 by Aaron Bentley
Refactored the revert phases
36
from bzrlib.progress import DummyProgress, ProgressPhase
2255.7.48 by Robert Collins
Deprecated and make work with DirState trees 'transform.find_interesting'.
37
from bzrlib.symbol_versioning import deprecated_function, zero_fifteen
1534.7.173 by Aaron Bentley
Added conflict warnings to revert
38
from bzrlib.trace import mutter, warning
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
39
from bzrlib import tree
2255.2.152 by Martin Pool
(broken) merge aaron's workingtree format changes
40
import bzrlib.ui
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
41
import bzrlib.urlutils as urlutils
1534.7.31 by Aaron Bentley
Changed tree root parent to ROOT_PARENT
42
1534.7.167 by Aaron Bentley
PEP8 and comment cleanups
43
1534.7.31 by Aaron Bentley
Changed tree root parent to ROOT_PARENT
44
ROOT_PARENT = "root-parent"
45
1534.7.167 by Aaron Bentley
PEP8 and comment cleanups
46
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
47
def unique_add(map, key, value):
48
    if key in map:
1534.7.5 by Aaron Bentley
Got unique_add under test
49
        raise DuplicateKey(key=key)
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
50
    map[key] = value
51
1534.7.167 by Aaron Bentley
PEP8 and comment cleanups
52
1534.7.191 by Aaron Bentley
Got transform.apply to list modified paths
53
class _TransformResults(object):
54
    def __init__(self, modified_paths):
55
        object.__init__(self)
56
        self.modified_paths = modified_paths
57
58
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
59
class TreeTransform(object):
1534.7.179 by Aaron Bentley
Added Transform docs
60
    """Represent a tree transformation.
61
    
62
    This object is designed to support incremental generation of the transform,
63
    in any order.  
64
    
65
    It is easy to produce malformed transforms, but they are generally
66
    harmless.  Attempting to apply a malformed transform will cause an
67
    exception to be raised before any modifications are made to the tree.  
68
69
    Many kinds of malformed transforms can be corrected with the 
70
    resolve_conflicts function.  The remaining ones indicate programming error,
71
    such as trying to create a file with no path.
72
73
    Two sets of file creation methods are supplied.  Convenience methods are:
74
     * new_file
75
     * new_directory
76
     * new_symlink
77
78
    These are composed of the low-level methods:
79
     * create_path
80
     * create_file or create_directory or create_symlink
81
     * version_file
82
     * set_executability
83
    """
1534.9.1 by Aaron Bentley
Added progress bars to merge
84
    def __init__(self, tree, pb=DummyProgress()):
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
85
        """Note: a tree_write lock is taken on the tree.
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
86
        
87
        Use TreeTransform.finalize() to release the lock
88
        """
89
        object.__init__(self)
90
        self._tree = tree
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
91
        self._tree.lock_tree_write()
1534.7.162 by Aaron Bentley
Handle failures creating/deleting the Limbo directory
92
        try:
93
            control_files = self._tree._control_files
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
94
            self._limbodir = urlutils.local_path_from_url(
1685.1.9 by John Arbash Meinel
Updated LocalTransport so that it's base is now a URL rather than a local path. This helps consistency with all other functions. To do so, I added local_abspath() which returns the local path, and local_path_to/from_url
95
                control_files.controlfilename('limbo'))
1534.7.162 by Aaron Bentley
Handle failures creating/deleting the Limbo directory
96
            try:
97
                os.mkdir(self._limbodir)
98
            except OSError, e:
99
                if e.errno == errno.EEXIST:
100
                    raise ExistingLimbo(self._limbodir)
101
        except: 
102
            self._tree.unlock()
103
            raise
104
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
105
        self._id_number = 0
106
        self._new_name = {}
107
        self._new_parent = {}
1534.7.4 by Aaron Bentley
Unified all file types as 'contents'
108
        self._new_contents = {}
1534.7.34 by Aaron Bentley
Proper conflicts for removals
109
        self._removed_contents = set()
1534.7.25 by Aaron Bentley
Added set_executability
110
        self._new_executability = {}
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
111
        self._new_reference_revision = {}
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
112
        self._new_id = {}
1534.7.143 by Aaron Bentley
Prevented get_trans_id from automatically versioning file ids
113
        self._non_present_ids = {}
1534.7.75 by Aaron Bentley
Added reverse-lookup for versioned files and get_trans_id
114
        self._r_new_id = {}
1534.7.39 by Aaron Bentley
Ensured that files can be unversioned (de-versioned?)
115
        self._removed_id = set()
1534.7.7 by Aaron Bentley
Added support for all-file path ids
116
        self._tree_path_ids = {}
1534.7.8 by Aaron Bentley
Added TreeTransform.final_kind
117
        self._tree_id_paths = {}
1534.10.31 by Aaron Bentley
Add caching to speed canonical_path
118
        self._realpaths = {}
119
        # Cache of realpath results, to speed up canonical_path
120
        self._relpaths = {}
121
        # Cache of relpath results, to speed up canonical_path
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
122
        self._new_root = self.trans_id_tree_file_id(tree.get_root_id())
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
123
        self.__done = False
1534.9.1 by Aaron Bentley
Added progress bars to merge
124
        self._pb = pb
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
125
1534.7.132 by Aaron Bentley
Got cooked conflicts working
126
    def __get_root(self):
127
        return self._new_root
128
129
    root = property(__get_root)
130
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
131
    def finalize(self):
1534.7.157 by Aaron Bentley
Added more docs
132
        """Release the working tree lock, if held, clean up limbo dir."""
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
133
        if self._tree is None:
134
            return
1534.7.162 by Aaron Bentley
Handle failures creating/deleting the Limbo directory
135
        try:
136
            for trans_id, kind in self._new_contents.iteritems():
137
                path = self._limbo_name(trans_id)
138
                if kind == "directory":
139
                    os.rmdir(path)
140
                else:
141
                    os.unlink(path)
142
            try:
143
                os.rmdir(self._limbodir)
144
            except OSError:
145
                # We don't especially care *why* the dir is immortal.
146
                raise ImmortalLimbo(self._limbodir)
147
        finally:
148
            self._tree.unlock()
149
            self._tree = None
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
150
151
    def _assign_id(self):
152
        """Produce a new tranform id"""
153
        new_id = "new-%s" % self._id_number
154
        self._id_number +=1
155
        return new_id
156
157
    def create_path(self, name, parent):
158
        """Assign a transaction id to a new path"""
159
        trans_id = self._assign_id()
160
        unique_add(self._new_name, trans_id, name)
161
        unique_add(self._new_parent, trans_id, parent)
162
        return trans_id
163
1534.7.6 by Aaron Bentley
Added conflict handling
164
    def adjust_path(self, name, parent, trans_id):
1534.7.21 by Aaron Bentley
Updated docstrings
165
        """Change the path that is assigned to a transaction id."""
1534.7.66 by Aaron Bentley
Ensured we don't accidentally move the root directory
166
        if trans_id == self._new_root:
167
            raise CantMoveRoot
1534.7.6 by Aaron Bentley
Added conflict handling
168
        self._new_name[trans_id] = name
169
        self._new_parent[trans_id] = parent
170
1534.7.68 by Aaron Bentley
Got semi-reasonable root directory renaming working
171
    def adjust_root_path(self, name, parent):
172
        """Emulate moving the root by moving all children, instead.
173
        
174
        We do this by undoing the association of root's transaction id with the
175
        current tree.  This allows us to create a new directory with that
1534.7.69 by Aaron Bentley
Got real root moves working
176
        transaction id.  We unversion the root directory and version the 
177
        physically new directory, and hope someone versions the tree root
178
        later.
1534.7.68 by Aaron Bentley
Got semi-reasonable root directory renaming working
179
        """
180
        old_root = self._new_root
181
        old_root_file_id = self.final_file_id(old_root)
182
        # force moving all children of root
183
        for child_id in self.iter_tree_children(old_root):
184
            if child_id != parent:
185
                self.adjust_path(self.final_name(child_id), 
186
                                 self.final_parent(child_id), child_id)
1534.7.69 by Aaron Bentley
Got real root moves working
187
            file_id = self.final_file_id(child_id)
188
            if file_id is not None:
189
                self.unversion_file(child_id)
190
            self.version_file(file_id, child_id)
1534.7.68 by Aaron Bentley
Got semi-reasonable root directory renaming working
191
        
192
        # the physical root needs a new transaction id
193
        self._tree_path_ids.pop("")
194
        self._tree_id_paths.pop(old_root)
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
195
        self._new_root = self.trans_id_tree_file_id(self._tree.get_root_id())
1534.7.68 by Aaron Bentley
Got semi-reasonable root directory renaming working
196
        if parent == old_root:
197
            parent = self._new_root
198
        self.adjust_path(name, parent, old_root)
199
        self.create_directory(old_root)
1534.7.69 by Aaron Bentley
Got real root moves working
200
        self.version_file(old_root_file_id, old_root)
201
        self.unversion_file(self._new_root)
1534.7.68 by Aaron Bentley
Got semi-reasonable root directory renaming working
202
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
203
    def trans_id_tree_file_id(self, inventory_id):
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
204
        """Determine the transaction id of a working tree file.
205
        
206
        This reflects only files that already exist, not ones that will be
207
        added by transactions.
208
        """
1534.7.148 by Aaron Bentley
Handled the remaining file versioning case
209
        path = self._tree.inventory.id2path(inventory_id)
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
210
        return self.trans_id_tree_path(path)
1534.7.7 by Aaron Bentley
Added support for all-file path ids
211
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
212
    def trans_id_file_id(self, file_id):
1534.7.156 by Aaron Bentley
PEP8 fixes
213
        """Determine or set the transaction id associated with a file ID.
1534.7.75 by Aaron Bentley
Added reverse-lookup for versioned files and get_trans_id
214
        A new id is only created for file_ids that were never present.  If
215
        a transaction has been unversioned, it is deliberately still returned.
216
        (this will likely lead to an unversioned parent conflict.)
217
        """
218
        if file_id in self._r_new_id and self._r_new_id[file_id] is not None:
219
            return self._r_new_id[file_id]
220
        elif file_id in self._tree.inventory:
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
221
            return self.trans_id_tree_file_id(file_id)
1534.7.143 by Aaron Bentley
Prevented get_trans_id from automatically versioning file ids
222
        elif file_id in self._non_present_ids:
223
            return self._non_present_ids[file_id]
1534.7.75 by Aaron Bentley
Added reverse-lookup for versioned files and get_trans_id
224
        else:
225
            trans_id = self._assign_id()
1534.7.143 by Aaron Bentley
Prevented get_trans_id from automatically versioning file ids
226
            self._non_present_ids[file_id] = trans_id
1534.7.75 by Aaron Bentley
Added reverse-lookup for versioned files and get_trans_id
227
            return trans_id
228
1534.7.12 by Aaron Bentley
Added canonical_path function
229
    def canonical_path(self, path):
230
        """Get the canonical tree-relative path"""
231
        # don't follow final symlinks
1534.10.31 by Aaron Bentley
Add caching to speed canonical_path
232
        abs = self._tree.abspath(path)
233
        if abs in self._relpaths:
234
            return self._relpaths[abs]
235
        dirname, basename = os.path.split(abs)
236
        if dirname not in self._realpaths:
237
            self._realpaths[dirname] = os.path.realpath(dirname)
238
        dirname = self._realpaths[dirname]
239
        abs = pathjoin(dirname, basename)
240
        if dirname in self._relpaths:
241
            relpath = pathjoin(self._relpaths[dirname], basename)
1534.10.32 by Aaron Bentley
Test and fix case where name has trailing slash
242
            relpath = relpath.rstrip('/\\')
1534.10.31 by Aaron Bentley
Add caching to speed canonical_path
243
        else:
244
            relpath = self._tree.relpath(abs)
245
        self._relpaths[abs] = relpath
246
        return relpath
1534.7.12 by Aaron Bentley
Added canonical_path function
247
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
248
    def trans_id_tree_path(self, path):
1534.7.7 by Aaron Bentley
Added support for all-file path ids
249
        """Determine (and maybe set) the transaction ID for a tree path."""
1534.7.12 by Aaron Bentley
Added canonical_path function
250
        path = self.canonical_path(path)
1534.7.7 by Aaron Bentley
Added support for all-file path ids
251
        if path not in self._tree_path_ids:
252
            self._tree_path_ids[path] = self._assign_id()
1534.7.8 by Aaron Bentley
Added TreeTransform.final_kind
253
            self._tree_id_paths[self._tree_path_ids[path]] = path
1534.7.7 by Aaron Bentley
Added support for all-file path ids
254
        return self._tree_path_ids[path]
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
255
1534.7.16 by Aaron Bentley
Added get_tree_parent
256
    def get_tree_parent(self, trans_id):
1534.7.31 by Aaron Bentley
Changed tree root parent to ROOT_PARENT
257
        """Determine id of the parent in the tree."""
1534.7.16 by Aaron Bentley
Added get_tree_parent
258
        path = self._tree_id_paths[trans_id]
259
        if path == "":
1534.7.31 by Aaron Bentley
Changed tree root parent to ROOT_PARENT
260
            return ROOT_PARENT
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
261
        return self.trans_id_tree_path(os.path.dirname(path))
1534.7.16 by Aaron Bentley
Added get_tree_parent
262
1534.7.117 by Aaron Bentley
Simplified permission handling of existing files in transform.
263
    def create_file(self, contents, trans_id, mode_id=None):
1534.7.21 by Aaron Bentley
Updated docstrings
264
        """Schedule creation of a new file.
265
266
        See also new_file.
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
267
        
268
        Contents is an iterator of strings, all of which will be written
1534.7.21 by Aaron Bentley
Updated docstrings
269
        to the target destination.
1534.7.117 by Aaron Bentley
Simplified permission handling of existing files in transform.
270
271
        New file takes the permissions of any existing file with that id,
272
        unless mode_id is specified.
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
273
        """
1711.7.22 by John Arbash Meinel
transform: cleanup the temporary file even if unique_add fails.
274
        name = self._limbo_name(trans_id)
275
        f = open(name, 'wb')
1711.7.8 by John Arbash Meinel
Use try/finally inside create_file for TreeTransform to ensure the file handle gets closed
276
        try:
1711.7.22 by John Arbash Meinel
transform: cleanup the temporary file even if unique_add fails.
277
            try:
278
                unique_add(self._new_contents, trans_id, 'file')
279
            except:
280
                # Clean up the file, it never got registered so
281
                # TreeTransform.finalize() won't clean it up.
282
                f.close()
283
                os.unlink(name)
284
                raise
285
2247.1.2 by John Arbash Meinel
Switch from for line in foo: f.write(line) to f.writelines(foo)
286
            f.writelines(contents)
1711.7.8 by John Arbash Meinel
Use try/finally inside create_file for TreeTransform to ensure the file handle gets closed
287
        finally:
288
            f.close()
1534.7.117 by Aaron Bentley
Simplified permission handling of existing files in transform.
289
        self._set_mode(trans_id, mode_id, S_ISREG)
290
291
    def _set_mode(self, trans_id, mode_id, typefunc):
1534.7.157 by Aaron Bentley
Added more docs
292
        """Set the mode of new file contents.
293
        The mode_id is the existing file to get the mode from (often the same
294
        as trans_id).  The operation is only performed if there's a mode match
295
        according to typefunc.
296
        """
1534.7.117 by Aaron Bentley
Simplified permission handling of existing files in transform.
297
        if mode_id is None:
298
            mode_id = trans_id
299
        try:
300
            old_path = self._tree_id_paths[mode_id]
301
        except KeyError:
302
            return
303
        try:
2027.1.1 by John Arbash Meinel
Fix bug #56549, and write a direct test that the right path is being statted
304
            mode = os.stat(self._tree.abspath(old_path)).st_mode
1534.7.117 by Aaron Bentley
Simplified permission handling of existing files in transform.
305
        except OSError, e:
306
            if e.errno == errno.ENOENT:
307
                return
308
            else:
309
                raise
310
        if typefunc(mode):
311
            os.chmod(self._limbo_name(trans_id), mode)
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
312
1534.7.20 by Aaron Bentley
Added directory handling
313
    def create_directory(self, trans_id):
1534.7.21 by Aaron Bentley
Updated docstrings
314
        """Schedule creation of a new directory.
315
        
316
        See also new_directory.
317
        """
1534.7.73 by Aaron Bentley
Changed model again. Now iterator is used immediately.
318
        os.mkdir(self._limbo_name(trans_id))
319
        unique_add(self._new_contents, trans_id, 'directory')
1534.7.20 by Aaron Bentley
Added directory handling
320
1534.7.22 by Aaron Bentley
Added symlink support
321
    def create_symlink(self, target, trans_id):
322
        """Schedule creation of a new symbolic link.
323
324
        target is a bytestring.
325
        See also new_symlink.
326
        """
1534.7.73 by Aaron Bentley
Changed model again. Now iterator is used immediately.
327
        os.symlink(target, self._limbo_name(trans_id))
328
        unique_add(self._new_contents, trans_id, 'symlink')
1534.7.22 by Aaron Bentley
Added symlink support
329
1534.7.129 by Aaron Bentley
Converted test cases to Tree Transform
330
    def cancel_creation(self, trans_id):
1534.7.157 by Aaron Bentley
Added more docs
331
        """Cancel the creation of new file contents."""
1534.7.129 by Aaron Bentley
Converted test cases to Tree Transform
332
        del self._new_contents[trans_id]
1558.12.9 by Aaron Bentley
Handle resolving conflicts with directories properly
333
        delete_any(self._limbo_name(trans_id))
1534.7.129 by Aaron Bentley
Converted test cases to Tree Transform
334
1534.7.34 by Aaron Bentley
Proper conflicts for removals
335
    def delete_contents(self, trans_id):
336
        """Schedule the contents of a path entry for deletion"""
1534.7.130 by Aaron Bentley
More conflict handling, test porting
337
        self.tree_kind(trans_id)
1534.7.34 by Aaron Bentley
Proper conflicts for removals
338
        self._removed_contents.add(trans_id)
339
1534.7.61 by Aaron Bentley
Handled parent loops, missing parents, unversioned parents
340
    def cancel_deletion(self, trans_id):
341
        """Cancel a scheduled deletion"""
342
        self._removed_contents.remove(trans_id)
343
1534.7.39 by Aaron Bentley
Ensured that files can be unversioned (de-versioned?)
344
    def unversion_file(self, trans_id):
345
        """Schedule a path entry to become unversioned"""
346
        self._removed_id.add(trans_id)
347
348
    def delete_versioned(self, trans_id):
349
        """Delete and unversion a versioned file"""
350
        self.delete_contents(trans_id)
351
        self.unversion_file(trans_id)
352
1534.7.25 by Aaron Bentley
Added set_executability
353
    def set_executability(self, executability, trans_id):
1534.7.167 by Aaron Bentley
PEP8 and comment cleanups
354
        """Schedule setting of the 'execute' bit
355
        To unschedule, set to None
356
        """
1534.7.26 by Aaron Bentley
Added conflicts for setting executability on unversioned/non-file entries
357
        if executability is None:
358
            del self._new_executability[trans_id]
359
        else:
360
            unique_add(self._new_executability, trans_id, executability)
1534.7.25 by Aaron Bentley
Added set_executability
361
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
362
    def set_tree_reference(self, revision_id, trans_id):
363
        """Set the reference associated with a directory"""
364
        unique_add(self._new_reference_revision, trans_id, revision_id)
365
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
366
    def version_file(self, file_id, trans_id):
1534.7.21 by Aaron Bentley
Updated docstrings
367
        """Schedule a file to become versioned."""
1534.7.148 by Aaron Bentley
Handled the remaining file versioning case
368
        assert file_id is not None
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
369
        unique_add(self._new_id, trans_id, file_id)
1534.7.75 by Aaron Bentley
Added reverse-lookup for versioned files and get_trans_id
370
        unique_add(self._r_new_id, file_id, trans_id)
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
371
1534.7.105 by Aaron Bentley
Got merge with rename working
372
    def cancel_versioning(self, trans_id):
373
        """Undo a previous versioning of a file"""
374
        file_id = self._new_id[trans_id]
375
        del self._new_id[trans_id]
376
        del self._r_new_id[file_id]
377
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
378
    def new_paths(self):
1534.7.21 by Aaron Bentley
Updated docstrings
379
        """Determine the paths of all new and changed files"""
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
380
        new_ids = set()
1534.7.132 by Aaron Bentley
Got cooked conflicts working
381
        fp = FinalPaths(self)
1534.7.4 by Aaron Bentley
Unified all file types as 'contents'
382
        for id_set in (self._new_name, self._new_parent, self._new_contents,
1534.7.25 by Aaron Bentley
Added set_executability
383
                       self._new_id, self._new_executability):
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
384
            new_ids.update(id_set)
385
        new_paths = [(fp.get_path(t), t) for t in new_ids]
386
        new_paths.sort()
387
        return new_paths
1534.7.6 by Aaron Bentley
Added conflict handling
388
1534.7.34 by Aaron Bentley
Proper conflicts for removals
389
    def tree_kind(self, trans_id):
1534.7.40 by Aaron Bentley
Updated docs
390
        """Determine the file kind in the working tree.
391
392
        Raises NoSuchFile if the file does not exist
393
        """
1534.7.34 by Aaron Bentley
Proper conflicts for removals
394
        path = self._tree_id_paths.get(trans_id)
395
        if path is None:
396
            raise NoSuchFile(None)
397
        try:
398
            return file_kind(self._tree.abspath(path))
399
        except OSError, e:
400
            if e.errno != errno.ENOENT:
401
                raise
402
            else:
403
                raise NoSuchFile(path)
404
1534.7.8 by Aaron Bentley
Added TreeTransform.final_kind
405
    def final_kind(self, trans_id):
1534.7.156 by Aaron Bentley
PEP8 fixes
406
        """Determine the final file kind, after any changes applied.
1534.7.8 by Aaron Bentley
Added TreeTransform.final_kind
407
        
408
        Raises NoSuchFile if the file does not exist/has no contents.
409
        (It is conceivable that a path would be created without the
410
        corresponding contents insertion command)
411
        """
412
        if trans_id in self._new_contents:
1534.7.73 by Aaron Bentley
Changed model again. Now iterator is used immediately.
413
            return self._new_contents[trans_id]
1534.7.34 by Aaron Bentley
Proper conflicts for removals
414
        elif trans_id in self._removed_contents:
415
            raise NoSuchFile(None)
1534.7.8 by Aaron Bentley
Added TreeTransform.final_kind
416
        else:
1534.7.34 by Aaron Bentley
Proper conflicts for removals
417
            return self.tree_kind(trans_id)
1534.7.8 by Aaron Bentley
Added TreeTransform.final_kind
418
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
419
    def tree_file_id(self, trans_id):
1534.7.41 by Aaron Bentley
Got inventory ID movement working
420
        """Determine the file id associated with the trans_id in the tree"""
421
        try:
422
            path = self._tree_id_paths[trans_id]
423
        except KeyError:
424
            # the file is a new, unversioned file, or invalid trans_id
425
            return None
426
        # the file is old; the old id is still valid
1534.7.68 by Aaron Bentley
Got semi-reasonable root directory renaming working
427
        if self._new_root == trans_id:
428
            return self._tree.inventory.root.file_id
1534.7.148 by Aaron Bentley
Handled the remaining file versioning case
429
        return self._tree.inventory.path2id(path)
1534.7.41 by Aaron Bentley
Got inventory ID movement working
430
1534.7.13 by Aaron Bentley
Implemented final_file_id
431
    def final_file_id(self, trans_id):
1534.7.156 by Aaron Bentley
PEP8 fixes
432
        """Determine the file id after any changes are applied, or None.
1534.7.21 by Aaron Bentley
Updated docstrings
433
        
434
        None indicates that the file will not be versioned after changes are
435
        applied.
436
        """
1534.7.13 by Aaron Bentley
Implemented final_file_id
437
        try:
438
            # there is a new id for this file
1534.7.148 by Aaron Bentley
Handled the remaining file versioning case
439
            assert self._new_id[trans_id] is not None
1534.7.13 by Aaron Bentley
Implemented final_file_id
440
            return self._new_id[trans_id]
441
        except KeyError:
1534.7.39 by Aaron Bentley
Ensured that files can be unversioned (de-versioned?)
442
            if trans_id in self._removed_id:
443
                return None
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
444
        return self.tree_file_id(trans_id)
1534.7.13 by Aaron Bentley
Implemented final_file_id
445
1534.7.148 by Aaron Bentley
Handled the remaining file versioning case
446
    def inactive_file_id(self, trans_id):
1534.7.157 by Aaron Bentley
Added more docs
447
        """Return the inactive file_id associated with a transaction id.
1534.7.148 by Aaron Bentley
Handled the remaining file versioning case
448
        That is, the one in the tree or in non_present_ids.
449
        The file_id may actually be active, too.
450
        """
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
451
        file_id = self.tree_file_id(trans_id)
1534.7.148 by Aaron Bentley
Handled the remaining file versioning case
452
        if file_id is not None:
453
            return file_id
454
        for key, value in self._non_present_ids.iteritems():
455
            if value == trans_id:
456
                return key
457
1534.7.17 by Aaron Bentley
Added final_parent function
458
    def final_parent(self, trans_id):
1534.7.156 by Aaron Bentley
PEP8 fixes
459
        """Determine the parent file_id, after any changes are applied.
1534.7.21 by Aaron Bentley
Updated docstrings
460
1534.7.31 by Aaron Bentley
Changed tree root parent to ROOT_PARENT
461
        ROOT_PARENT is returned for the tree root.
1534.7.21 by Aaron Bentley
Updated docstrings
462
        """
1534.7.17 by Aaron Bentley
Added final_parent function
463
        try:
464
            return self._new_parent[trans_id]
465
        except KeyError:
466
            return self.get_tree_parent(trans_id)
467
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
468
    def final_name(self, trans_id):
1534.7.40 by Aaron Bentley
Updated docs
469
        """Determine the final filename, after all changes are applied."""
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
470
        try:
471
            return self._new_name[trans_id]
472
        except KeyError:
1731.1.33 by Aaron Bentley
Revert no-special-root changes
473
            try:
474
                return os.path.basename(self._tree_id_paths[trans_id])
475
            except KeyError:
476
                raise NoFinalPath(trans_id, self)
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
477
1534.10.28 by Aaron Bentley
Use numbered backup files
478
    def by_parent(self):
1534.7.40 by Aaron Bentley
Updated docs
479
        """Return a map of parent: children for known parents.
480
        
481
        Only new paths and parents of tree files with assigned ids are used.
482
        """
1534.7.6 by Aaron Bentley
Added conflict handling
483
        by_parent = {}
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
484
        items = list(self._new_parent.iteritems())
1534.7.76 by Aaron Bentley
Fixed final_parent, for the case where finding a parent adds tree id paths.
485
        items.extend((t, self.final_parent(t)) for t in 
486
                      self._tree_id_paths.keys())
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
487
        for trans_id, parent_id in items:
1534.7.6 by Aaron Bentley
Added conflict handling
488
            if parent_id not in by_parent:
489
                by_parent[parent_id] = set()
490
            by_parent[parent_id].add(trans_id)
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
491
        return by_parent
1534.7.11 by Aaron Bentley
Refactored conflict handling
492
1534.7.57 by Aaron Bentley
Enhanced conflict resolution.
493
    def path_changed(self, trans_id):
1534.7.157 by Aaron Bentley
Added more docs
494
        """Return True if a trans_id's path has changed."""
1711.9.11 by John Arbash Meinel
change return foo in bar to return (foo in bar)
495
        return (trans_id in self._new_name) or (trans_id in self._new_parent)
1534.7.57 by Aaron Bentley
Enhanced conflict resolution.
496
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
497
    def new_contents(self, trans_id):
498
        return (trans_id in self._new_contents)
499
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
500
    def find_conflicts(self):
1534.7.40 by Aaron Bentley
Updated docs
501
        """Find any violations of inventory or filesystem invariants"""
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
502
        if self.__done is True:
503
            raise ReusingTransform()
504
        conflicts = []
505
        # ensure all children of all existent parents are known
506
        # all children of non-existent parents are known, by definition.
507
        self._add_tree_children()
1534.10.28 by Aaron Bentley
Use numbered backup files
508
        by_parent = self.by_parent()
1534.7.15 by Aaron Bentley
Add conflict types related to versioning
509
        conflicts.extend(self._unversioned_parents(by_parent))
1534.7.19 by Aaron Bentley
Added tests for parent loops
510
        conflicts.extend(self._parent_loops())
1534.7.11 by Aaron Bentley
Refactored conflict handling
511
        conflicts.extend(self._duplicate_entries(by_parent))
1534.7.50 by Aaron Bentley
Detect duplicate inventory ids
512
        conflicts.extend(self._duplicate_ids())
1534.7.11 by Aaron Bentley
Refactored conflict handling
513
        conflicts.extend(self._parent_type_conflicts(by_parent))
1534.7.15 by Aaron Bentley
Add conflict types related to versioning
514
        conflicts.extend(self._improper_versioning())
1534.7.26 by Aaron Bentley
Added conflicts for setting executability on unversioned/non-file entries
515
        conflicts.extend(self._executability_conflicts())
1534.7.152 by Aaron Bentley
Fixed overwrites
516
        conflicts.extend(self._overwrite_conflicts())
1534.7.15 by Aaron Bentley
Add conflict types related to versioning
517
        return conflicts
518
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
519
    def _add_tree_children(self):
1534.7.156 by Aaron Bentley
PEP8 fixes
520
        """Add all the children of all active parents to the known paths.
1534.7.40 by Aaron Bentley
Updated docs
521
522
        Active parents are those which gain children, and those which are
523
        removed.  This is a necessary first step in detecting conflicts.
524
        """
1534.10.28 by Aaron Bentley
Use numbered backup files
525
        parents = self.by_parent().keys()
1534.7.34 by Aaron Bentley
Proper conflicts for removals
526
        parents.extend([t for t in self._removed_contents if 
527
                        self.tree_kind(t) == 'directory'])
1534.7.50 by Aaron Bentley
Detect duplicate inventory ids
528
        for trans_id in self._removed_id:
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
529
            file_id = self.tree_file_id(trans_id)
1731.1.2 by Aaron Bentley
Removed all remaining uses of root_directory
530
            if self._tree.inventory[file_id].kind == 'directory':
1534.7.50 by Aaron Bentley
Detect duplicate inventory ids
531
                parents.append(trans_id)
532
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
533
        for parent_id in parents:
1534.7.67 by Aaron Bentley
Refactored _add_tree_children
534
            # ensure that all children are registered with the transaction
535
            list(self.iter_tree_children(parent_id))
536
537
    def iter_tree_children(self, parent_id):
538
        """Iterate through the entry's tree children, if any"""
539
        try:
540
            path = self._tree_id_paths[parent_id]
541
        except KeyError:
542
            return
543
        try:
544
            children = os.listdir(self._tree.abspath(path))
545
        except OSError, e:
1534.7.71 by abentley
All tests pass under Windows
546
            if e.errno != errno.ENOENT and e.errno != errno.ESRCH:
1534.7.67 by Aaron Bentley
Refactored _add_tree_children
547
                raise
548
            return
549
            
550
        for child in children:
551
            childpath = joinpath(path, child)
1534.7.180 by Aaron Bentley
Merge from mainline
552
            if self._tree.is_control_filename(childpath):
1534.7.67 by Aaron Bentley
Refactored _add_tree_children
553
                continue
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
554
            yield self.trans_id_tree_path(childpath)
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
555
1534.10.28 by Aaron Bentley
Use numbered backup files
556
    def has_named_child(self, by_parent, parent_id, name):
557
        try:
558
            children = by_parent[parent_id]
559
        except KeyError:
560
            children = []
561
        for child in children:
562
            if self.final_name(child) == name:
563
                return True
564
        try:
565
            path = self._tree_id_paths[parent_id]
566
        except KeyError:
567
            return False
568
        childpath = joinpath(path, name)
569
        child_id = self._tree_path_ids.get(childpath)
570
        if child_id is None:
571
            return lexists(self._tree.abspath(childpath))
572
        else:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
573
            if self.final_parent(child_id) != parent_id:
1534.10.28 by Aaron Bentley
Use numbered backup files
574
                return False
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
575
            if child_id in self._removed_contents:
1534.10.28 by Aaron Bentley
Use numbered backup files
576
                # XXX What about dangling file-ids?
577
                return False
578
            else:
579
                return True
580
1534.7.19 by Aaron Bentley
Added tests for parent loops
581
    def _parent_loops(self):
582
        """No entry should be its own ancestor"""
583
        conflicts = []
584
        for trans_id in self._new_parent:
585
            seen = set()
586
            parent_id = trans_id
1534.7.31 by Aaron Bentley
Changed tree root parent to ROOT_PARENT
587
            while parent_id is not ROOT_PARENT:
1534.7.19 by Aaron Bentley
Added tests for parent loops
588
                seen.add(parent_id)
1731.1.33 by Aaron Bentley
Revert no-special-root changes
589
                try:
590
                    parent_id = self.final_parent(parent_id)
591
                except KeyError:
592
                    break
1534.7.19 by Aaron Bentley
Added tests for parent loops
593
                if parent_id == trans_id:
594
                    conflicts.append(('parent loop', trans_id))
595
                if parent_id in seen:
596
                    break
597
        return conflicts
598
1534.7.15 by Aaron Bentley
Add conflict types related to versioning
599
    def _unversioned_parents(self, by_parent):
600
        """If parent directories are versioned, children must be versioned."""
601
        conflicts = []
602
        for parent_id, children in by_parent.iteritems():
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
603
            if parent_id is ROOT_PARENT:
604
                continue
1534.7.15 by Aaron Bentley
Add conflict types related to versioning
605
            if self.final_file_id(parent_id) is not None:
606
                continue
607
            for child_id in children:
608
                if self.final_file_id(child_id) is not None:
609
                    conflicts.append(('unversioned parent', parent_id))
610
                    break;
611
        return conflicts
612
613
    def _improper_versioning(self):
1534.7.156 by Aaron Bentley
PEP8 fixes
614
        """Cannot version a file with no contents, or a bad type.
1534.7.15 by Aaron Bentley
Add conflict types related to versioning
615
        
616
        However, existing entries with no contents are okay.
617
        """
618
        conflicts = []
619
        for trans_id in self._new_id.iterkeys():
620
            try:
621
                kind = self.final_kind(trans_id)
622
            except NoSuchFile:
623
                conflicts.append(('versioning no contents', trans_id))
624
                continue
625
            if not InventoryEntry.versionable_kind(kind):
1534.7.20 by Aaron Bentley
Added directory handling
626
                conflicts.append(('versioning bad kind', trans_id, kind))
1534.7.11 by Aaron Bentley
Refactored conflict handling
627
        return conflicts
628
1534.7.26 by Aaron Bentley
Added conflicts for setting executability on unversioned/non-file entries
629
    def _executability_conflicts(self):
1534.7.40 by Aaron Bentley
Updated docs
630
        """Check for bad executability changes.
631
        
632
        Only versioned files may have their executability set, because
633
        1. only versioned entries can have executability under windows
634
        2. only files can be executable.  (The execute bit on a directory
635
           does not indicate searchability)
636
        """
1534.7.26 by Aaron Bentley
Added conflicts for setting executability on unversioned/non-file entries
637
        conflicts = []
638
        for trans_id in self._new_executability:
639
            if self.final_file_id(trans_id) is None:
640
                conflicts.append(('unversioned executability', trans_id))
1534.7.34 by Aaron Bentley
Proper conflicts for removals
641
            else:
642
                try:
643
                    non_file = self.final_kind(trans_id) != "file"
644
                except NoSuchFile:
645
                    non_file = True
646
                if non_file is True:
647
                    conflicts.append(('non-file executability', trans_id))
1534.7.26 by Aaron Bentley
Added conflicts for setting executability on unversioned/non-file entries
648
        return conflicts
649
1534.7.152 by Aaron Bentley
Fixed overwrites
650
    def _overwrite_conflicts(self):
651
        """Check for overwrites (not permitted on Win32)"""
652
        conflicts = []
653
        for trans_id in self._new_contents:
654
            try:
655
                self.tree_kind(trans_id)
656
            except NoSuchFile:
657
                continue
658
            if trans_id not in self._removed_contents:
659
                conflicts.append(('overwrite', trans_id,
660
                                 self.final_name(trans_id)))
661
        return conflicts
662
1534.7.11 by Aaron Bentley
Refactored conflict handling
663
    def _duplicate_entries(self, by_parent):
664
        """No directory may have two entries with the same name."""
665
        conflicts = []
1534.7.6 by Aaron Bentley
Added conflict handling
666
        for children in by_parent.itervalues():
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
667
            name_ids = [(self.final_name(t), t) for t in children]
1534.7.6 by Aaron Bentley
Added conflict handling
668
            name_ids.sort()
669
            last_name = None
670
            last_trans_id = None
671
            for name, trans_id in name_ids:
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
672
                try:
673
                    kind = self.final_kind(trans_id)
674
                except NoSuchFile:
675
                    kind = None
676
                file_id = self.final_file_id(trans_id)
677
                if kind is None and file_id is None:
678
                    continue
1534.7.6 by Aaron Bentley
Added conflict handling
679
                if name == last_name:
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
680
                    conflicts.append(('duplicate', last_trans_id, trans_id,
681
                    name))
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
682
                last_name = name
683
                last_trans_id = trans_id
1534.7.11 by Aaron Bentley
Refactored conflict handling
684
        return conflicts
685
1534.7.50 by Aaron Bentley
Detect duplicate inventory ids
686
    def _duplicate_ids(self):
687
        """Each inventory id may only be used once"""
688
        conflicts = []
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
689
        removed_tree_ids = set((self.tree_file_id(trans_id) for trans_id in
1534.7.50 by Aaron Bentley
Detect duplicate inventory ids
690
                                self._removed_id))
691
        active_tree_ids = set((f for f in self._tree.inventory if
692
                               f not in removed_tree_ids))
693
        for trans_id, file_id in self._new_id.iteritems():
694
            if file_id in active_tree_ids:
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
695
                old_trans_id = self.trans_id_tree_file_id(file_id)
1534.7.50 by Aaron Bentley
Detect duplicate inventory ids
696
                conflicts.append(('duplicate id', old_trans_id, trans_id))
697
        return conflicts
698
1534.7.11 by Aaron Bentley
Refactored conflict handling
699
    def _parent_type_conflicts(self, by_parent):
700
        """parents must have directory 'contents'."""
701
        conflicts = []
1534.7.37 by Aaron Bentley
Allowed removed dirs to have content-free children.
702
        for parent_id, children in by_parent.iteritems():
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
703
            if parent_id is ROOT_PARENT:
704
                continue
1534.7.37 by Aaron Bentley
Allowed removed dirs to have content-free children.
705
            if not self._any_contents(children):
706
                continue
707
            for child in children:
708
                try:
709
                    self.final_kind(child)
710
                except NoSuchFile:
711
                    continue
1534.7.10 by Aaron Bentley
Implemented missing parent and non-directory parent conflicts
712
            try:
713
                kind = self.final_kind(parent_id)
714
            except NoSuchFile:
715
                kind = None
716
            if kind is None:
717
                conflicts.append(('missing parent', parent_id))
718
            elif kind != "directory":
719
                conflicts.append(('non-directory parent', parent_id))
1534.7.6 by Aaron Bentley
Added conflict handling
720
        return conflicts
1534.7.37 by Aaron Bentley
Allowed removed dirs to have content-free children.
721
722
    def _any_contents(self, trans_ids):
723
        """Return true if any of the trans_ids, will have contents."""
724
        for trans_id in trans_ids:
725
            try:
726
                kind = self.final_kind(trans_id)
727
            except NoSuchFile:
728
                continue
729
            return True
730
        return False
1534.7.6 by Aaron Bentley
Added conflict handling
731
            
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
732
    def apply(self):
1534.7.156 by Aaron Bentley
PEP8 fixes
733
        """Apply all changes to the inventory and filesystem.
1534.7.21 by Aaron Bentley
Updated docstrings
734
        
735
        If filesystem or inventory conflicts are present, MalformedTransform
736
        will be thrown.
737
        """
1534.7.49 by Aaron Bentley
Printed conflicts in MalformedTransform
738
        conflicts = self.find_conflicts()
739
        if len(conflicts) != 0:
740
            raise MalformedTransform(conflicts=conflicts)
1534.7.41 by Aaron Bentley
Got inventory ID movement working
741
        limbo_inv = {}
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
742
        inv = self._tree.inventory
1551.2.31 by Aaron Bentley
Got merge and revert using nested pbs
743
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
744
        try:
745
            child_pb.update('Apply phase', 0, 2)
746
            self._apply_removals(inv, limbo_inv)
747
            child_pb.update('Apply phase', 1, 2)
748
            modified_paths = self._apply_insertions(inv, limbo_inv)
749
        finally:
750
            child_pb.finished()
1534.7.35 by Aaron Bentley
Got file renaming working
751
        self._tree._write_inventory(inv)
752
        self.__done = True
1534.7.59 by Aaron Bentley
Simplified tests
753
        self.finalize()
1534.7.191 by Aaron Bentley
Got transform.apply to list modified paths
754
        return _TransformResults(modified_paths)
1534.7.35 by Aaron Bentley
Got file renaming working
755
1534.7.72 by Aaron Bentley
Moved new content generation to pre-renames
756
    def _limbo_name(self, trans_id):
757
        """Generate the limbo name of a file"""
1534.7.166 by Aaron Bentley
Swapped os.path.join for pathjoin everywhere
758
        return pathjoin(self._limbodir, trans_id)
1534.7.72 by Aaron Bentley
Moved new content generation to pre-renames
759
1534.7.41 by Aaron Bentley
Got inventory ID movement working
760
    def _apply_removals(self, inv, limbo_inv):
1534.7.36 by Aaron Bentley
Added rename tests
761
        """Perform tree operations that remove directory/inventory names.
762
        
763
        That is, delete files that are to be deleted, and put any files that
764
        need renaming into limbo.  This must be done in strict child-to-parent
765
        order.
766
        """
1534.7.35 by Aaron Bentley
Got file renaming working
767
        tree_paths = list(self._tree_path_ids.iteritems())
768
        tree_paths.sort(reverse=True)
1551.2.31 by Aaron Bentley
Got merge and revert using nested pbs
769
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
770
        try:
771
            for num, data in enumerate(tree_paths):
772
                path, trans_id = data
773
                child_pb.update('removing file', num, len(tree_paths))
774
                full_path = self._tree.abspath(path)
775
                if trans_id in self._removed_contents:
1558.12.9 by Aaron Bentley
Handle resolving conflicts with directories properly
776
                    delete_any(full_path)
1551.2.31 by Aaron Bentley
Got merge and revert using nested pbs
777
                elif trans_id in self._new_name or trans_id in \
778
                    self._new_parent:
779
                    try:
780
                        os.rename(full_path, self._limbo_name(trans_id))
781
                    except OSError, e:
782
                        if e.errno != errno.ENOENT:
783
                            raise
784
                if trans_id in self._removed_id:
785
                    if trans_id == self._new_root:
786
                        file_id = self._tree.inventory.root.file_id
787
                    else:
788
                        file_id = self.tree_file_id(trans_id)
789
                    del inv[file_id]
790
                elif trans_id in self._new_name or trans_id in self._new_parent:
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
791
                    file_id = self.tree_file_id(trans_id)
1551.2.31 by Aaron Bentley
Got merge and revert using nested pbs
792
                    if file_id is not None:
793
                        limbo_inv[trans_id] = inv[file_id]
2100.3.6 by Aaron Bentley
Make add recursive for children of added entries
794
                        inv.remove_recursive_id(file_id)
1551.2.31 by Aaron Bentley
Got merge and revert using nested pbs
795
        finally:
796
            child_pb.finished()
1534.7.34 by Aaron Bentley
Proper conflicts for removals
797
1534.7.41 by Aaron Bentley
Got inventory ID movement working
798
    def _apply_insertions(self, inv, limbo_inv):
1534.7.36 by Aaron Bentley
Added rename tests
799
        """Perform tree operations that insert directory/inventory names.
800
        
801
        That is, create any files that need to be created, and restore from
802
        limbo any files that needed renaming.  This must be done in strict
803
        parent-to-child order.
804
        """
1534.9.1 by Aaron Bentley
Added progress bars to merge
805
        new_paths = self.new_paths()
1534.7.191 by Aaron Bentley
Got transform.apply to list modified paths
806
        modified_paths = []
1551.2.31 by Aaron Bentley
Got merge and revert using nested pbs
807
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
808
        try:
809
            for num, (path, trans_id) in enumerate(new_paths):
810
                child_pb.update('adding file', num, len(new_paths))
1534.7.48 by Aaron Bentley
Ensured we can move/rename dangling inventory entries
811
                try:
1551.2.31 by Aaron Bentley
Got merge and revert using nested pbs
812
                    kind = self._new_contents[trans_id]
813
                except KeyError:
814
                    kind = contents = None
815
                if trans_id in self._new_contents or \
816
                    self.path_changed(trans_id):
817
                    full_path = self._tree.abspath(path)
818
                    try:
819
                        os.rename(self._limbo_name(trans_id), full_path)
820
                    except OSError, e:
821
                        # We may be renaming a dangling inventory id
822
                        if e.errno != errno.ENOENT:
823
                            raise
824
                    if trans_id in self._new_contents:
825
                        modified_paths.append(full_path)
826
                        del self._new_contents[trans_id]
827
828
                if trans_id in self._new_id:
829
                    if kind is None:
830
                        kind = file_kind(self._tree.abspath(path))
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
831
                    if trans_id in self._new_reference_revision:
832
                        entry = inventory.TreeReference(self._new_id[trans_id], 
833
                            self._new_name[trans_id], 
834
                            self.final_file_id(self._new_parent[trans_id]),
835
                            None, self._new_reference_revision[trans_id])
836
                        inv.add(entry)
837
                    else:
838
                        inv.add_path(path, kind, self._new_id[trans_id])
1551.2.31 by Aaron Bentley
Got merge and revert using nested pbs
839
                elif trans_id in self._new_name or trans_id in\
840
                    self._new_parent:
841
                    entry = limbo_inv.get(trans_id)
842
                    if entry is not None:
843
                        entry.name = self.final_name(trans_id)
844
                        parent_path = os.path.dirname(path)
845
                        entry.parent_id = \
846
                            self._tree.inventory.path2id(parent_path)
847
                        inv.add(entry)
848
849
                # requires files and inventory entries to be in place
850
                if trans_id in self._new_executability:
851
                    self._set_executability(path, inv, trans_id)
852
        finally:
853
            child_pb.finished()
1534.7.191 by Aaron Bentley
Got transform.apply to list modified paths
854
        return modified_paths
1534.7.40 by Aaron Bentley
Updated docs
855
1534.7.25 by Aaron Bentley
Added set_executability
856
    def _set_executability(self, path, inv, trans_id):
1534.7.40 by Aaron Bentley
Updated docs
857
        """Set the executability of versioned files """
1534.7.25 by Aaron Bentley
Added set_executability
858
        file_id = inv.path2id(path)
859
        new_executability = self._new_executability[trans_id]
860
        inv[file_id].executable = new_executability
861
        if supports_executable():
862
            abspath = self._tree.abspath(path)
863
            current_mode = os.stat(abspath).st_mode
864
            if new_executability:
865
                umask = os.umask(0)
866
                os.umask(umask)
867
                to_mode = current_mode | (0100 & ~umask)
868
                # Enable x-bit for others only if they can read it.
869
                if current_mode & 0004:
870
                    to_mode |= 0001 & ~umask
871
                if current_mode & 0040:
872
                    to_mode |= 0010 & ~umask
873
            else:
874
                to_mode = current_mode & ~0111
875
            os.chmod(abspath, to_mode)
876
1534.7.23 by Aaron Bentley
Transform.new_entry -> Transform._new_entry
877
    def _new_entry(self, name, parent_id, file_id):
1534.7.21 by Aaron Bentley
Updated docstrings
878
        """Helper function to create a new filesystem entry."""
1534.7.2 by Aaron Bentley
Added convenience function
879
        trans_id = self.create_path(name, parent_id)
880
        if file_id is not None:
881
            self.version_file(file_id, trans_id)
882
        return trans_id
883
1534.7.27 by Aaron Bentley
Added execute bit to new_file method
884
    def new_file(self, name, parent_id, contents, file_id=None, 
885
                 executable=None):
1534.7.156 by Aaron Bentley
PEP8 fixes
886
        """Convenience method to create files.
1534.7.21 by Aaron Bentley
Updated docstrings
887
        
888
        name is the name of the file to create.
889
        parent_id is the transaction id of the parent directory of the file.
890
        contents is an iterator of bytestrings, which will be used to produce
891
        the file.
1740.2.4 by Aaron Bentley
Update transform tests and docs
892
        :param file_id: The inventory ID of the file, if it is to be versioned.
893
        :param executable: Only valid when a file_id has been supplied.
1534.7.21 by Aaron Bentley
Updated docstrings
894
        """
1534.7.23 by Aaron Bentley
Transform.new_entry -> Transform._new_entry
895
        trans_id = self._new_entry(name, parent_id, file_id)
1740.2.4 by Aaron Bentley
Update transform tests and docs
896
        # TODO: rather than scheduling a set_executable call,
897
        # have create_file create the file with the right mode.
1534.7.20 by Aaron Bentley
Added directory handling
898
        self.create_file(contents, trans_id)
1534.7.27 by Aaron Bentley
Added execute bit to new_file method
899
        if executable is not None:
900
            self.set_executability(executable, trans_id)
1534.7.20 by Aaron Bentley
Added directory handling
901
        return trans_id
902
903
    def new_directory(self, name, parent_id, file_id=None):
1534.7.156 by Aaron Bentley
PEP8 fixes
904
        """Convenience method to create directories.
1534.7.21 by Aaron Bentley
Updated docstrings
905
906
        name is the name of the directory to create.
907
        parent_id is the transaction id of the parent directory of the
908
        directory.
909
        file_id is the inventory ID of the directory, if it is to be versioned.
910
        """
1534.7.23 by Aaron Bentley
Transform.new_entry -> Transform._new_entry
911
        trans_id = self._new_entry(name, parent_id, file_id)
1534.7.20 by Aaron Bentley
Added directory handling
912
        self.create_directory(trans_id)
913
        return trans_id 
914
1534.7.22 by Aaron Bentley
Added symlink support
915
    def new_symlink(self, name, parent_id, target, file_id=None):
1534.7.156 by Aaron Bentley
PEP8 fixes
916
        """Convenience method to create symbolic link.
1534.7.22 by Aaron Bentley
Added symlink support
917
        
918
        name is the name of the symlink to create.
919
        parent_id is the transaction id of the parent directory of the symlink.
920
        target is a bytestring of the target of the symlink.
921
        file_id is the inventory ID of the file, if it is to be versioned.
922
        """
1534.7.23 by Aaron Bentley
Transform.new_entry -> Transform._new_entry
923
        trans_id = self._new_entry(name, parent_id, file_id)
1534.7.22 by Aaron Bentley
Added symlink support
924
        self.create_symlink(target, trans_id)
925
        return trans_id
926
1551.11.12 by Aaron Bentley
Changes from review
927
    def _affected_ids(self):
928
        """Return the set of transform ids affected by the transform"""
1551.11.1 by Aaron Bentley
Initial work on converting TreeTransform to iter_changes format
929
        trans_ids = set(self._removed_id)
930
        trans_ids.update(self._new_id.keys())
1551.11.2 by Aaron Bentley
Get kind change detection working for iter_changes
931
        trans_ids.update(self._removed_contents)
932
        trans_ids.update(self._new_contents.keys())
933
        trans_ids.update(self._new_executability.keys())
934
        trans_ids.update(self._new_name.keys())
935
        trans_ids.update(self._new_parent.keys())
1551.11.12 by Aaron Bentley
Changes from review
936
        return trans_ids
937
938
    def _get_file_id_maps(self):
939
        """Return mapping of file_ids to trans_ids in the to and from states"""
940
        trans_ids = self._affected_ids()
1551.11.1 by Aaron Bentley
Initial work on converting TreeTransform to iter_changes format
941
        from_trans_ids = {}
942
        to_trans_ids = {}
943
        # Build up two dicts: trans_ids associated with file ids in the
944
        # FROM state, vs the TO state.
945
        for trans_id in trans_ids:
946
            from_file_id = self.tree_file_id(trans_id)
947
            if from_file_id is not None:
948
                from_trans_ids[from_file_id] = trans_id
949
            to_file_id = self.final_file_id(trans_id)
950
            if to_file_id is not None:
951
                to_trans_ids[to_file_id] = trans_id
1551.11.12 by Aaron Bentley
Changes from review
952
        return from_trans_ids, to_trans_ids
953
954
    def _from_file_data(self, from_trans_id, from_versioned, file_id):
955
        """Get data about a file in the from (tree) state
956
957
        Return a (name, parent, kind, executable) tuple
958
        """
959
        from_path = self._tree_id_paths.get(from_trans_id)
960
        if from_versioned:
961
            # get data from working tree if versioned
962
            from_entry = self._tree.inventory[file_id]
963
            from_name = from_entry.name
964
            from_parent = from_entry.parent_id
965
        else:
966
            from_entry = None
967
            if from_path is None:
968
                # File does not exist in FROM state
969
                from_name = None
970
                from_parent = None
971
            else:
972
                # File exists, but is not versioned.  Have to use path-
973
                # splitting stuff
974
                from_name = os.path.basename(from_path)
975
                tree_parent = self.get_tree_parent(from_trans_id)
976
                from_parent = self.tree_file_id(tree_parent)
977
        if from_path is not None:
978
            from_kind, from_executable, from_stats = \
979
                self._tree._comparison_data(from_entry, from_path)
980
        else:
981
            from_kind = None
982
            from_executable = False
983
        return from_name, from_parent, from_kind, from_executable
984
985
    def _to_file_data(self, to_trans_id, from_trans_id, from_executable):
986
        """Get data about a file in the to (target) state
987
988
        Return a (name, parent, kind, executable) tuple
989
        """
990
        to_name = self.final_name(to_trans_id)
991
        try:
992
            to_kind = self.final_kind(to_trans_id)
993
        except NoSuchFile:
994
            to_kind = None
995
        to_parent = self.final_file_id(self.final_parent(to_trans_id))
996
        if to_trans_id in self._new_executability:
997
            to_executable = self._new_executability[to_trans_id]
998
        elif to_trans_id == from_trans_id:
999
            to_executable = from_executable
1000
        else:
1001
            to_executable = False
1002
        return to_name, to_parent, to_kind, to_executable
1003
1004
    def _iter_changes(self):
1005
        """Produce output in the same format as Tree._iter_changes.
1006
1007
        Will produce nonsensical results if invoked while inventory/filesystem
1008
        conflicts (as reported by TreeTransform.find_conflicts()) are present.
1009
1010
        This reads the Transform, but only reproduces changes involving a
1011
        file_id.  Files that are not versioned in either of the FROM or TO
1012
        states are not reflected.
1013
        """
1014
        final_paths = FinalPaths(self)
1015
        from_trans_ids, to_trans_ids = self._get_file_id_maps()
1551.11.4 by Aaron Bentley
Sort output of Transform.iter_changes by path
1016
        results = []
1551.11.1 by Aaron Bentley
Initial work on converting TreeTransform to iter_changes format
1017
        # Now iterate through all active file_ids
1018
        for file_id in set(from_trans_ids.keys() + to_trans_ids.keys()):
1551.11.7 by Aaron Bentley
Stop modified flag bleeding into later changes
1019
            modified = False
1551.11.1 by Aaron Bentley
Initial work on converting TreeTransform to iter_changes format
1020
            from_trans_id = from_trans_ids.get(file_id)
1021
            # find file ids, and determine versioning state
1022
            if from_trans_id is None:
1023
                from_versioned = False
1024
                from_trans_id = to_trans_ids[file_id]
1025
            else:
1026
                from_versioned = True
1027
            to_trans_id = to_trans_ids.get(file_id)
1028
            if to_trans_id is None:
1029
                to_versioned = False
1030
                to_trans_id = from_trans_id
1031
            else:
1032
                to_versioned = True
1551.11.12 by Aaron Bentley
Changes from review
1033
1034
            from_name, from_parent, from_kind, from_executable = \
1035
                self._from_file_data(from_trans_id, from_versioned, file_id)
1036
1037
            to_name, to_parent, to_kind, to_executable = \
1038
                self._to_file_data(to_trans_id, from_trans_id, from_executable)
1039
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
1040
            if not from_versioned:
1041
                from_path = None
1042
            else:
1043
                from_path = self._tree_id_paths.get(from_trans_id)
1044
            if not to_versioned:
1045
                to_path = None
1046
            else:
1047
                to_path = final_paths.get_path(to_trans_id)
1551.11.1 by Aaron Bentley
Initial work on converting TreeTransform to iter_changes format
1048
            if from_kind != to_kind:
1049
                modified = True
1551.11.2 by Aaron Bentley
Get kind change detection working for iter_changes
1050
            elif to_kind in ('file' or 'symlink') and (
1051
                to_trans_id != from_trans_id or
1052
                to_trans_id in self._new_contents):
1053
                modified = True
1054
            if (not modified and from_versioned == to_versioned and
1055
                from_parent==to_parent and from_name == to_name and
1056
                from_executable == to_executable):
1057
                continue
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
1058
            results.append((file_id, (from_path, to_path), modified,
1551.11.1 by Aaron Bentley
Initial work on converting TreeTransform to iter_changes format
1059
                   (from_versioned, to_versioned),
1551.11.2 by Aaron Bentley
Get kind change detection working for iter_changes
1060
                   (from_parent, to_parent),
1551.11.1 by Aaron Bentley
Initial work on converting TreeTransform to iter_changes format
1061
                   (from_name, to_name),
1062
                   (from_kind, to_kind),
1551.11.4 by Aaron Bentley
Sort output of Transform.iter_changes by path
1063
                   (from_executable, to_executable)))
1064
        return iter(sorted(results, key=lambda x:x[1]))
1551.11.1 by Aaron Bentley
Initial work on converting TreeTransform to iter_changes format
1065
1066
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
1067
def joinpath(parent, child):
1534.7.40 by Aaron Bentley
Updated docs
1068
    """Join tree-relative paths, handling the tree root specially"""
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
1069
    if parent is None or parent == "":
1070
        return child
1071
    else:
1534.7.166 by Aaron Bentley
Swapped os.path.join for pathjoin everywhere
1072
        return pathjoin(parent, child)
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
1073
1534.7.167 by Aaron Bentley
PEP8 and comment cleanups
1074
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
1075
class FinalPaths(object):
1759.2.2 by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron.
1076
    """Make path calculation cheap by memoizing paths.
1534.7.21 by Aaron Bentley
Updated docstrings
1077
1078
    The underlying tree must not be manipulated between calls, or else
1079
    the results will likely be incorrect.
1080
    """
1534.7.132 by Aaron Bentley
Got cooked conflicts working
1081
    def __init__(self, transform):
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
1082
        object.__init__(self)
1083
        self._known_paths = {}
1534.7.33 by Aaron Bentley
Fixed naming
1084
        self.transform = transform
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
1085
1086
    def _determine_path(self, trans_id):
1534.7.132 by Aaron Bentley
Got cooked conflicts working
1087
        if trans_id == self.transform.root:
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
1088
            return ""
1534.7.33 by Aaron Bentley
Fixed naming
1089
        name = self.transform.final_name(trans_id)
1090
        parent_id = self.transform.final_parent(trans_id)
1534.7.132 by Aaron Bentley
Got cooked conflicts working
1091
        if parent_id == self.transform.root:
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
1092
            return name
1093
        else:
1534.7.166 by Aaron Bentley
Swapped os.path.join for pathjoin everywhere
1094
            return pathjoin(self.get_path(parent_id), name)
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
1095
1096
    def get_path(self, trans_id):
1534.7.157 by Aaron Bentley
Added more docs
1097
        """Find the final path associated with a trans_id"""
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
1098
        if trans_id not in self._known_paths:
1099
            self._known_paths[trans_id] = self._determine_path(trans_id)
1100
        return self._known_paths[trans_id]
1534.7.28 by Aaron Bentley
Nearly-working build_tree replacement
1101
1534.7.30 by Aaron Bentley
Factored out topological id sorting
1102
def topology_sorted_ids(tree):
1534.7.40 by Aaron Bentley
Updated docs
1103
    """Determine the topological order of the ids in a tree"""
1534.7.30 by Aaron Bentley
Factored out topological id sorting
1104
    file_ids = list(tree)
1105
    file_ids.sort(key=tree.id2path)
1106
    return file_ids
1534.7.28 by Aaron Bentley
Nearly-working build_tree replacement
1107
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1108
1534.7.165 by Aaron Bentley
Switched to build_tree instead of revert
1109
def build_tree(tree, wt):
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1110
    """Create working tree for a branch, using a TreeTransform.
1111
    
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
1112
    This function should be used on empty trees, having a tree root at most.
1113
    (see merge and revert functionality for working with existing trees)
1114
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1115
    Existing files are handled like so:
1116
    
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
1117
    - Existing bzrdirs take precedence over creating new items.  They are
1118
      created as '%s.diverted' % name.
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1119
    - Otherwise, if the content on disk matches the content we are building,
1120
      it is silently replaced.
1121
    - Otherwise, conflict resolution will move the old file to 'oldname.moved'.
1122
    """
2255.7.51 by Robert Collins
Lock build_tree trees in write-first order, to support older formats that dont do lock_tree_write nicely.
1123
    wt.lock_tree_write()
2255.7.49 by Robert Collins
Lock trees passed in to build_tree.
1124
    try:
2255.7.51 by Robert Collins
Lock build_tree trees in write-first order, to support older formats that dont do lock_tree_write nicely.
1125
        tree.lock_read()
2255.7.49 by Robert Collins
Lock trees passed in to build_tree.
1126
        try:
1127
            return _build_tree(tree, wt)
1128
        finally:
2255.7.51 by Robert Collins
Lock build_tree trees in write-first order, to support older formats that dont do lock_tree_write nicely.
1129
            tree.unlock()
2255.7.49 by Robert Collins
Lock trees passed in to build_tree.
1130
    finally:
2255.7.51 by Robert Collins
Lock build_tree trees in write-first order, to support older formats that dont do lock_tree_write nicely.
1131
        wt.unlock()
2255.7.49 by Robert Collins
Lock trees passed in to build_tree.
1132
1133
def _build_tree(tree, wt):
1134
    """See build_tree."""
2090.2.1 by Martin Pool
Fix some code which relies on assertions and breaks under python -O
1135
    if len(wt.inventory) > 1:  # more than just a root
1136
        raise errors.WorkingTreeAlreadyPopulated(base=wt.basedir)
1534.7.28 by Aaron Bentley
Nearly-working build_tree replacement
1137
    file_trans_id = {}
1558.11.1 by Aaron Bentley
Progress indicator for tree builts
1138
    top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1139
    pp = ProgressPhase("Build phase", 2, top_pb)
2255.2.183 by Martin Pool
add missing _must_be_locked and a better message
1140
    if tree.inventory.root is not None:
2255.2.194 by Robert Collins
[BROKEN] Many updates to stop using experimental formats in tests.
1141
        # this is kindof a hack: we should be altering the root 
1142
        # as partof the regular tree shape diff logic.
1143
        # the conditional test hereis to avoid doing an
1144
        # expensive operation (flush) every time the root id
1145
        # is set within the tree, nor setting the root and thus
1146
        # marking the tree as dirty, because we use two different
1147
        # idioms here: tree interfaces and inventory interfaces.
1148
        if wt.path2id('') != tree.inventory.root.file_id:
1149
            wt.set_root_id(tree.inventory.root.file_id)
1150
            wt.flush()
1534.7.28 by Aaron Bentley
Nearly-working build_tree replacement
1151
    tt = TreeTransform(wt)
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
1152
    divert = set()
1534.7.28 by Aaron Bentley
Nearly-working build_tree replacement
1153
    try:
1558.11.1 by Aaron Bentley
Progress indicator for tree builts
1154
        pp.next_phase()
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1155
        file_trans_id[wt.get_root_id()] = \
1156
            tt.trans_id_tree_file_id(wt.get_root_id())
1558.11.1 by Aaron Bentley
Progress indicator for tree builts
1157
        pb = bzrlib.ui.ui_factory.nested_progress_bar()
1158
        try:
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
1159
            for num, (tree_path, entry) in \
1160
                enumerate(tree.inventory.iter_entries_by_dir()):
1161
                pb.update("Building tree", num, len(tree.inventory))
1558.11.1 by Aaron Bentley
Progress indicator for tree builts
1162
                if entry.parent_id is None:
1163
                    continue
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1164
                reparent = False
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
1165
                file_id = entry.file_id
1166
                target_path = wt.abspath(tree_path)
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1167
                try:
1168
                    kind = file_kind(target_path)
1169
                except NoSuchFile:
1170
                    pass
1171
                else:
1172
                    if kind == "directory":
1173
                        try:
1174
                            bzrdir.BzrDir.open(target_path)
1175
                        except errors.NotBranchError:
1176
                            pass
1177
                        else:
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
1178
                            divert.add(file_id)
1179
                    if (file_id not in divert and
1180
                        _content_match(tree, entry, file_id, kind,
1181
                        target_path)):
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1182
                        tt.delete_contents(tt.trans_id_tree_path(tree_path))
1183
                        if kind == 'directory':
1184
                            reparent = True
1558.11.1 by Aaron Bentley
Progress indicator for tree builts
1185
                if entry.parent_id not in file_trans_id:
2255.2.183 by Martin Pool
add missing _must_be_locked and a better message
1186
                    raise AssertionError(
1187
                        'entry %s parent id %r is not in file_trans_id %r'
1188
                        % (entry, entry.parent_id, file_trans_id))
1558.11.1 by Aaron Bentley
Progress indicator for tree builts
1189
                parent_id = file_trans_id[entry.parent_id]
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
1190
                file_trans_id[file_id] = new_by_entry(tt, entry, parent_id,
1558.11.1 by Aaron Bentley
Progress indicator for tree builts
1191
                                                      tree)
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1192
                if reparent:
1193
                    new_trans_id = file_trans_id[file_id]
1194
                    old_parent = tt.trans_id_tree_path(tree_path)
1195
                    _reparent_children(tt, old_parent, new_trans_id)
1558.11.1 by Aaron Bentley
Progress indicator for tree builts
1196
        finally:
1197
            pb.finished()
1198
        pp.next_phase()
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
1199
        divert_trans = set(file_trans_id[f] for f in divert)
1200
        resolver = lambda t, c: resolve_checkout(t, c, divert_trans)
1201
        raw_conflicts = resolve_conflicts(tt, pass_func=resolver)
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1202
        conflicts = cook_conflicts(raw_conflicts, tt)
1203
        for conflict in conflicts:
1204
            warning(conflict)
1205
        try:
1206
            wt.add_conflicts(conflicts)
1207
        except errors.UnsupportedOperation:
1208
            pass
1534.7.47 by Aaron Bentley
Started work on 'revert'
1209
        tt.apply()
1210
    finally:
1211
        tt.finalize()
1558.11.1 by Aaron Bentley
Progress indicator for tree builts
1212
        top_pb.finished()
1534.7.47 by Aaron Bentley
Started work on 'revert'
1213
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1214
1215
def _reparent_children(tt, old_parent, new_parent):
1216
    for child in tt.iter_tree_children(old_parent):
1217
        tt.adjust_path(tt.final_name(child), new_parent, child)
1218
1219
1220
def _content_match(tree, entry, file_id, kind, target_path):
1221
    if entry.kind != kind:
1222
        return False
1223
    if entry.kind == "directory":
1224
        return True
1225
    if entry.kind == "file":
1226
        if tree.get_file(file_id).read() == file(target_path, 'rb').read():
1227
            return True
1228
    elif entry.kind == "symlink":
1229
        if tree.get_symlink_target(file_id) == os.readlink(target_path):
1230
            return True
1231
    return False
1232
1233
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
1234
def resolve_checkout(tt, conflicts, divert):
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1235
    new_conflicts = set()
1236
    for c_type, conflict in ((c[0], c) for c in conflicts):
1237
        # Anything but a 'duplicate' would indicate programmer error
1238
        assert c_type == 'duplicate', c_type
1239
        # Now figure out which is new and which is old
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
1240
        if tt.new_contents(conflict[1]):
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1241
            new_file = conflict[1]
1242
            old_file = conflict[2]
1243
        else:
1244
            new_file = conflict[2]
1245
            old_file = conflict[1]
1246
1247
        # We should only get here if the conflict wasn't completely
1248
        # resolved
1249
        final_parent = tt.final_parent(old_file)
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
1250
        if new_file in divert:
1251
            new_name = tt.final_name(old_file)+'.diverted'
1252
            tt.adjust_path(new_name, final_parent, new_file)
1253
            new_conflicts.add((c_type, 'Diverted to',
1254
                               new_file, old_file))
1255
        else:
1256
            new_name = tt.final_name(old_file)+'.moved'
1257
            tt.adjust_path(new_name, final_parent, old_file)
1258
            new_conflicts.add((c_type, 'Moved existing file to',
1259
                               old_file, new_file))
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1260
    return new_conflicts
1261
1262
1534.7.47 by Aaron Bentley
Started work on 'revert'
1263
def new_by_entry(tt, entry, parent_id, tree):
1534.7.157 by Aaron Bentley
Added more docs
1264
    """Create a new file according to its inventory entry"""
1534.7.47 by Aaron Bentley
Started work on 'revert'
1265
    name = entry.name
1266
    kind = entry.kind
1267
    if kind == 'file':
1534.7.79 by Aaron Bentley
Stopped calling get_file_lines on WorkingTree
1268
        contents = tree.get_file(entry.file_id).readlines()
1534.7.47 by Aaron Bentley
Started work on 'revert'
1269
        executable = tree.is_executable(entry.file_id)
1270
        return tt.new_file(name, parent_id, contents, entry.file_id, 
1271
                           executable)
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
1272
    elif kind in ('directory', 'tree-reference'):
1273
        trans_id = tt.new_directory(name, parent_id, entry.file_id)
1274
        if kind == 'tree-reference':
1275
            tt.set_tree_reference(entry.reference_revision, trans_id)
1276
        return trans_id 
1534.7.47 by Aaron Bentley
Started work on 'revert'
1277
    elif kind == 'symlink':
1534.7.183 by Aaron Bentley
Fixed build_tree with symlinks
1278
        target = tree.get_symlink_target(entry.file_id)
1279
        return tt.new_symlink(name, parent_id, target, entry.file_id)
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
1280
    else:
1281
        raise errors.BadFileKindError(name, kind)
1534.7.47 by Aaron Bentley
Started work on 'revert'
1282
1534.7.117 by Aaron Bentley
Simplified permission handling of existing files in transform.
1283
def create_by_entry(tt, entry, tree, trans_id, lines=None, mode_id=None):
1534.7.157 by Aaron Bentley
Added more docs
1284
    """Create new file contents according to an inventory entry."""
1534.7.47 by Aaron Bentley
Started work on 'revert'
1285
    if entry.kind == "file":
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
1286
        if lines is None:
1534.7.97 by Aaron Bentley
Ensured foo.BASE is a directory if there's a conflict
1287
            lines = tree.get_file(entry.file_id).readlines()
1534.7.117 by Aaron Bentley
Simplified permission handling of existing files in transform.
1288
        tt.create_file(lines, trans_id, mode_id=mode_id)
1534.7.47 by Aaron Bentley
Started work on 'revert'
1289
    elif entry.kind == "symlink":
1534.7.101 by Aaron Bentley
Got conflicts on symlinks working properly
1290
        tt.create_symlink(tree.get_symlink_target(entry.file_id), trans_id)
1534.7.47 by Aaron Bentley
Started work on 'revert'
1291
    elif entry.kind == "directory":
1534.7.51 by Aaron Bentley
New approach to revert
1292
        tt.create_directory(trans_id)
1534.7.47 by Aaron Bentley
Started work on 'revert'
1293
1534.7.89 by Aaron Bentley
Handle all content types in three-way
1294
def create_entry_executability(tt, entry, trans_id):
1534.7.157 by Aaron Bentley
Added more docs
1295
    """Set the executability of a trans_id according to an inventory entry"""
1534.7.89 by Aaron Bentley
Handle all content types in three-way
1296
    if entry.kind == "file":
1297
        tt.set_executability(entry.executable, trans_id)
1534.7.47 by Aaron Bentley
Started work on 'revert'
1298
1534.7.157 by Aaron Bentley
Added more docs
1299
2255.7.48 by Robert Collins
Deprecated and make work with DirState trees 'transform.find_interesting'.
1300
@deprecated_function(zero_fifteen)
1534.7.55 by Aaron Bentley
Fixed up the change detection
1301
def find_interesting(working_tree, target_tree, filenames):
2255.7.48 by Robert Collins
Deprecated and make work with DirState trees 'transform.find_interesting'.
1302
    """Find the ids corresponding to specified filenames.
1303
    
1304
    Deprecated: Please use tree1.paths2ids(filenames, [tree2]).
1305
    """
1306
    working_tree.lock_read()
1307
    try:
1308
        target_tree.lock_read()
1309
        try:
1310
            return working_tree.paths2ids(filenames, [target_tree])
1311
        finally:
1312
            target_tree.unlock()
1313
    finally:
1314
        working_tree.unlock()
1534.7.55 by Aaron Bentley
Fixed up the change detection
1315
1316
1534.7.56 by Aaron Bentley
Implemented the backup file detritus
1317
def change_entry(tt, file_id, working_tree, target_tree, 
1534.10.28 by Aaron Bentley
Use numbered backup files
1318
                 trans_id_file_id, backups, trans_id, by_parent):
1534.7.157 by Aaron Bentley
Added more docs
1319
    """Replace a file_id's contents with those from a target tree."""
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
1320
    e_trans_id = trans_id_file_id(file_id)
1534.7.55 by Aaron Bentley
Fixed up the change detection
1321
    entry = target_tree.inventory[file_id]
1322
    has_contents, contents_mod, meta_mod, = _entry_changes(file_id, entry, 
1323
                                                           working_tree)
1324
    if contents_mod:
1534.7.117 by Aaron Bentley
Simplified permission handling of existing files in transform.
1325
        mode_id = e_trans_id
1534.7.55 by Aaron Bentley
Fixed up the change detection
1326
        if has_contents:
1534.7.56 by Aaron Bentley
Implemented the backup file detritus
1327
            if not backups:
1328
                tt.delete_contents(e_trans_id)
1329
            else:
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
1330
                parent_trans_id = trans_id_file_id(entry.parent_id)
1534.10.28 by Aaron Bentley
Use numbered backup files
1331
                backup_name = get_backup_name(entry, by_parent,
1332
                                              parent_trans_id, tt)
1333
                tt.adjust_path(backup_name, parent_trans_id, e_trans_id)
1534.7.56 by Aaron Bentley
Implemented the backup file detritus
1334
                tt.unversion_file(e_trans_id)
1335
                e_trans_id = tt.create_path(entry.name, parent_trans_id)
1336
                tt.version_file(file_id, e_trans_id)
1337
                trans_id[file_id] = e_trans_id
1534.7.117 by Aaron Bentley
Simplified permission handling of existing files in transform.
1338
        create_by_entry(tt, entry, target_tree, e_trans_id, mode_id=mode_id)
1534.7.89 by Aaron Bentley
Handle all content types in three-way
1339
        create_entry_executability(tt, entry, e_trans_id)
1340
1711.4.26 by John Arbash Meinel
Fix #45010 correctly. Don't forget the execute bit.
1341
    elif meta_mod:
1342
        tt.set_executability(entry.executable, e_trans_id)
1534.7.55 by Aaron Bentley
Fixed up the change detection
1343
    if tt.final_name(e_trans_id) != entry.name:
1344
        adjust_path  = True
1345
    else:
1346
        parent_id = tt.final_parent(e_trans_id)
1347
        parent_file_id = tt.final_file_id(parent_id)
1348
        if parent_file_id != entry.parent_id:
1349
            adjust_path = True
1350
        else:
1351
            adjust_path = False
1352
    if adjust_path:
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
1353
        parent_trans_id = trans_id_file_id(entry.parent_id)
1534.7.56 by Aaron Bentley
Implemented the backup file detritus
1354
        tt.adjust_path(entry.name, parent_trans_id, e_trans_id)
1534.7.55 by Aaron Bentley
Fixed up the change detection
1355
1356
1534.10.28 by Aaron Bentley
Use numbered backup files
1357
def get_backup_name(entry, by_parent, parent_trans_id, tt):
2012.1.12 by Aaron Bentley
Use iter_changes for revert
1358
    return _get_backup_name(entry.name, by_parent, parent_trans_id, tt)
1359
1360
1361
def _get_backup_name(name, by_parent, parent_trans_id, tt):
1534.10.28 by Aaron Bentley
Use numbered backup files
1362
    """Produce a backup-style name that appears to be available"""
1363
    def name_gen():
1364
        counter = 1
1365
        while True:
2012.1.12 by Aaron Bentley
Use iter_changes for revert
1366
            yield "%s.~%d~" % (name, counter)
1534.10.28 by Aaron Bentley
Use numbered backup files
1367
            counter += 1
2012.1.12 by Aaron Bentley
Use iter_changes for revert
1368
    for new_name in name_gen():
1369
        if not tt.has_named_child(by_parent, parent_trans_id, new_name):
1370
            return new_name
1371
1534.10.28 by Aaron Bentley
Use numbered backup files
1372
1534.7.55 by Aaron Bentley
Fixed up the change detection
1373
def _entry_changes(file_id, entry, working_tree):
1534.7.156 by Aaron Bentley
PEP8 fixes
1374
    """Determine in which ways the inventory entry has changed.
1534.7.55 by Aaron Bentley
Fixed up the change detection
1375
1376
    Returns booleans: has_contents, content_mod, meta_mod
1377
    has_contents means there are currently contents, but they differ
1378
    contents_mod means contents need to be modified
1379
    meta_mod means the metadata needs to be modified
1380
    """
1381
    cur_entry = working_tree.inventory[file_id]
1382
    try:
1383
        working_kind = working_tree.kind(file_id)
1384
        has_contents = True
1757.2.4 by Robert Collins
Teach file_kind about NoSuchFile, reducing duplicate code, and add user files before entering the main loop in smart_add.
1385
    except NoSuchFile:
1534.7.55 by Aaron Bentley
Fixed up the change detection
1386
        has_contents = False
1387
        contents_mod = True
1388
        meta_mod = False
1389
    if has_contents is True:
1731.1.1 by Aaron Bentley
Make root entry an InventoryDirectory, make EmptyTree really empty
1390
        if entry.kind != working_kind:
1534.7.55 by Aaron Bentley
Fixed up the change detection
1391
            contents_mod, meta_mod = True, False
1392
        else:
1393
            cur_entry._read_tree_state(working_tree.id2path(file_id), 
1394
                                       working_tree)
1395
            contents_mod, meta_mod = entry.detect_changes(cur_entry)
1534.7.175 by Aaron Bentley
Ensured revert writes a normal inventory
1396
            cur_entry._forget_tree_state()
1534.7.55 by Aaron Bentley
Fixed up the change detection
1397
    return has_contents, contents_mod, meta_mod
1398
1534.7.56 by Aaron Bentley
Implemented the backup file detritus
1399
2255.2.53 by Robert Collins
Teach TreeTransform to lock basis_trees if it acquires them, fixing revert on a dirstate working tree.
1400
def revert(working_tree, target_tree, filenames, backups=False,
2225.1.1 by Aaron Bentley
Added revert change display, with tests
1401
           pb=DummyProgress(), change_reporter=None):
1534.7.157 by Aaron Bentley
Added more docs
1402
    """Revert a working tree's contents to those of a target tree."""
2255.2.53 by Robert Collins
Teach TreeTransform to lock basis_trees if it acquires them, fixing revert on a dirstate working tree.
1403
    target_tree.lock_read()
1534.9.7 by Aaron Bentley
Show progress bars in revert
1404
    tt = TreeTransform(working_tree, pb)
1534.7.47 by Aaron Bentley
Started work on 'revert'
1405
    try:
2012.1.12 by Aaron Bentley
Use iter_changes for revert
1406
        pp = ProgressPhase("Revert phase", 3, pb)
1407
        pp.next_phase()
1408
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1409
        try:
2255.2.53 by Robert Collins
Teach TreeTransform to lock basis_trees if it acquires them, fixing revert on a dirstate working tree.
1410
            _alter_files(working_tree, target_tree, tt, child_pb,
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
1411
                         filenames, backups)
1551.2.31 by Aaron Bentley
Got merge and revert using nested pbs
1412
        finally:
1413
            child_pb.finished()
1551.2.34 by Aaron Bentley
Refactored the revert phases
1414
        pp.next_phase()
1551.2.31 by Aaron Bentley
Got merge and revert using nested pbs
1415
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1416
        try:
1417
            raw_conflicts = resolve_conflicts(tt, child_pb)
1418
        finally:
1419
            child_pb.finished()
1558.7.13 by Aaron Bentley
WorkingTree.revert returns conflicts
1420
        conflicts = cook_conflicts(raw_conflicts, tt)
1551.11.5 by Aaron Bentley
cleanup
1421
        if change_reporter:
1551.10.25 by Aaron Bentley
Make ChangeReporter private
1422
            change_reporter = delta._ChangeReporter(
2255.7.98 by Robert Collins
Merge bzr.dev.
1423
                unversioned_filter=working_tree.is_ignored)
1551.11.5 by Aaron Bentley
cleanup
1424
            delta.report_changes(tt._iter_changes(), change_reporter)
1551.11.6 by Aaron Bentley
Emit change listings before conflict warnings
1425
        for conflict in conflicts:
1426
            warning(conflict)
1427
        pp.next_phase()
1534.7.28 by Aaron Bentley
Nearly-working build_tree replacement
1428
        tt.apply()
1534.7.193 by Aaron Bentley
Stopped revert from preserving file contents produced by merges
1429
        working_tree.set_merge_modified({})
1534.7.28 by Aaron Bentley
Nearly-working build_tree replacement
1430
    finally:
2255.2.53 by Robert Collins
Teach TreeTransform to lock basis_trees if it acquires them, fixing revert on a dirstate working tree.
1431
        target_tree.unlock()
1534.7.28 by Aaron Bentley
Nearly-working build_tree replacement
1432
        tt.finalize()
1534.9.4 by Aaron Bentley
Added progress bars to revert.
1433
        pb.clear()
1558.7.13 by Aaron Bentley
WorkingTree.revert returns conflicts
1434
    return conflicts
1534.7.51 by Aaron Bentley
New approach to revert
1435
1534.7.57 by Aaron Bentley
Enhanced conflict resolution.
1436
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
1437
def _alter_files(working_tree, target_tree, tt, pb, specific_files,
1551.11.3 by Aaron Bentley
Use tree transform to emit upcoming change list
1438
                 backups):
2012.1.12 by Aaron Bentley
Use iter_changes for revert
1439
    merge_modified = working_tree.merge_modified()
1551.11.3 by Aaron Bentley
Use tree transform to emit upcoming change list
1440
    change_list = target_tree._iter_changes(working_tree,
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
1441
        specific_files=specific_files, pb=pb)
2012.1.12 by Aaron Bentley
Use iter_changes for revert
1442
    if target_tree.inventory.root is None:
1443
        skip_root = True
1444
    else:
1445
        skip_root = False
1446
    basis_tree = None
2255.2.53 by Robert Collins
Teach TreeTransform to lock basis_trees if it acquires them, fixing revert on a dirstate working tree.
1447
    try:
1448
        for id_num, (file_id, path, changed_content, versioned, parent, name,
1449
                kind, executable) in enumerate(change_list):
1450
            if skip_root and file_id[0] is not None and parent[0] is None:
1451
                continue
1452
            trans_id = tt.trans_id_file_id(file_id)
1453
            mode_id = None
1454
            if changed_content:
1455
                keep_content = False
1456
                if kind[0] == 'file' and (backups or kind[1] is None):
1457
                    wt_sha1 = working_tree.get_file_sha1(file_id)
1458
                    if merge_modified.get(file_id) != wt_sha1:
1459
                        # acquire the basis tree lazyily to prevent the expense
1460
                        # of accessing it when its not needed ? (Guessing, RBC,
1461
                        # 200702)
1462
                        if basis_tree is None:
1463
                            basis_tree = working_tree.basis_tree()
1464
                            basis_tree.lock_read()
1465
                        if file_id in basis_tree:
1466
                            if wt_sha1 != basis_tree.get_file_sha1(file_id):
1467
                                keep_content = True
1468
                        elif kind[1] is None and not versioned[1]:
2012.1.12 by Aaron Bentley
Use iter_changes for revert
1469
                            keep_content = True
2255.2.53 by Robert Collins
Teach TreeTransform to lock basis_trees if it acquires them, fixing revert on a dirstate working tree.
1470
                if kind[0] is not None:
1471
                    if not keep_content:
1472
                        tt.delete_contents(trans_id)
1473
                    elif kind[1] is not None:
1474
                        parent_trans_id = tt.trans_id_file_id(parent[0])
1475
                        by_parent = tt.by_parent()
1476
                        backup_name = _get_backup_name(name[0], by_parent,
1477
                                                       parent_trans_id, tt)
1478
                        tt.adjust_path(backup_name, parent_trans_id, trans_id)
1479
                        new_trans_id = tt.create_path(name[0], parent_trans_id)
1480
                        if versioned == (True, True):
1481
                            tt.unversion_file(trans_id)
1482
                            tt.version_file(file_id, new_trans_id)
1483
                        # New contents should have the same unix perms as old
1484
                        # contents
1485
                        mode_id = trans_id
1486
                        trans_id = new_trans_id
1487
                if kind[1] == 'directory':
1488
                    tt.create_directory(trans_id)
1489
                elif kind[1] == 'symlink':
1490
                    tt.create_symlink(target_tree.get_symlink_target(file_id),
1491
                                      trans_id)
1492
                elif kind[1] == 'file':
1493
                    tt.create_file(target_tree.get_file_lines(file_id),
1494
                                   trans_id, mode_id)
1495
                    # preserve the execute bit when backing up
1496
                    if keep_content and executable[0] == executable[1]:
1497
                        tt.set_executability(executable[1], trans_id)
1498
                else:
1499
                    assert kind[1] is None
1500
            if versioned == (False, True):
1501
                tt.version_file(file_id, trans_id)
1502
            if versioned == (True, False):
1503
                tt.unversion_file(trans_id)
1504
            if (name[1] is not None and 
1505
                (name[0] != name[1] or parent[0] != parent[1])):
1506
                tt.adjust_path(
1507
                    name[1], tt.trans_id_file_id(parent[1]), trans_id)
1508
            if executable[0] != executable[1] and kind[1] == "file":
1509
                tt.set_executability(executable[1], trans_id)
1510
    finally:
1511
        if basis_tree is not None:
1512
            basis_tree.unlock()
2012.1.12 by Aaron Bentley
Use iter_changes for revert
1513
1514
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1515
def resolve_conflicts(tt, pb=DummyProgress(), pass_func=None):
1534.7.57 by Aaron Bentley
Enhanced conflict resolution.
1516
    """Make many conflict-resolution attempts, but die if they fail"""
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1517
    if pass_func is None:
1518
        pass_func = conflict_pass
1534.7.169 by Aaron Bentley
Add filesystem/inventory conflicts to conflict output
1519
    new_conflicts = set()
1534.9.1 by Aaron Bentley
Added progress bars to merge
1520
    try:
1521
        for n in range(10):
1522
            pb.update('Resolution pass', n+1, 10)
1523
            conflicts = tt.find_conflicts()
1524
            if len(conflicts) == 0:
1525
                return new_conflicts
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1526
            new_conflicts.update(pass_func(tt, conflicts))
1534.9.1 by Aaron Bentley
Added progress bars to merge
1527
        raise MalformedTransform(conflicts=conflicts)
1528
    finally:
1529
        pb.clear()
1534.7.57 by Aaron Bentley
Enhanced conflict resolution.
1530
1531
1532
def conflict_pass(tt, conflicts):
1534.7.157 by Aaron Bentley
Added more docs
1533
    """Resolve some classes of conflicts."""
1534.7.169 by Aaron Bentley
Add filesystem/inventory conflicts to conflict output
1534
    new_conflicts = set()
1534.7.61 by Aaron Bentley
Handled parent loops, missing parents, unversioned parents
1535
    for c_type, conflict in ((c[0], c) for c in conflicts):
1536
        if c_type == 'duplicate id':
1534.7.51 by Aaron Bentley
New approach to revert
1537
            tt.unversion_file(conflict[1])
1534.7.170 by Aaron Bentley
Cleaned up filesystem conflict handling
1538
            new_conflicts.add((c_type, 'Unversioned existing file',
1539
                               conflict[1], conflict[2], ))
1534.7.61 by Aaron Bentley
Handled parent loops, missing parents, unversioned parents
1540
        elif c_type == 'duplicate':
1534.7.57 by Aaron Bentley
Enhanced conflict resolution.
1541
            # files that were renamed take precedence
1542
            new_name = tt.final_name(conflict[1])+'.moved'
1543
            final_parent = tt.final_parent(conflict[1])
1544
            if tt.path_changed(conflict[1]):
1545
                tt.adjust_path(new_name, final_parent, conflict[2])
1534.7.171 by Aaron Bentley
Implemented stringifying filesystem conflicts
1546
                new_conflicts.add((c_type, 'Moved existing file to', 
1547
                                   conflict[2], conflict[1]))
1534.7.57 by Aaron Bentley
Enhanced conflict resolution.
1548
            else:
1549
                tt.adjust_path(new_name, final_parent, conflict[1])
1534.7.171 by Aaron Bentley
Implemented stringifying filesystem conflicts
1550
                new_conflicts.add((c_type, 'Moved existing file to', 
1551
                                  conflict[1], conflict[2]))
1534.7.61 by Aaron Bentley
Handled parent loops, missing parents, unversioned parents
1552
        elif c_type == 'parent loop':
1553
            # break the loop by undoing one of the ops that caused the loop
1554
            cur = conflict[1]
1555
            while not tt.path_changed(cur):
1556
                cur = tt.final_parent(cur)
1534.7.170 by Aaron Bentley
Cleaned up filesystem conflict handling
1557
            new_conflicts.add((c_type, 'Cancelled move', cur,
1558
                               tt.final_parent(cur),))
1534.7.61 by Aaron Bentley
Handled parent loops, missing parents, unversioned parents
1559
            tt.adjust_path(tt.final_name(cur), tt.get_tree_parent(cur), cur)
1534.7.169 by Aaron Bentley
Add filesystem/inventory conflicts to conflict output
1560
            
1534.7.61 by Aaron Bentley
Handled parent loops, missing parents, unversioned parents
1561
        elif c_type == 'missing parent':
1534.7.128 by Aaron Bentley
Got missing contents test working
1562
            trans_id = conflict[1]
1563
            try:
1564
                tt.cancel_deletion(trans_id)
1551.8.22 by Aaron Bentley
Improve message when OTHER deletes an in-use tree
1565
                new_conflicts.add(('deleting parent', 'Not deleting', 
1566
                                   trans_id))
1534.7.128 by Aaron Bentley
Got missing contents test working
1567
            except KeyError:
1568
                tt.create_directory(trans_id)
1551.8.22 by Aaron Bentley
Improve message when OTHER deletes an in-use tree
1569
                new_conflicts.add((c_type, 'Created directory', trans_id))
1534.7.61 by Aaron Bentley
Handled parent loops, missing parents, unversioned parents
1570
        elif c_type == 'unversioned parent':
1534.7.148 by Aaron Bentley
Handled the remaining file versioning case
1571
            tt.version_file(tt.inactive_file_id(conflict[1]), conflict[1])
1534.7.171 by Aaron Bentley
Implemented stringifying filesystem conflicts
1572
            new_conflicts.add((c_type, 'Versioned directory', conflict[1]))
1534.7.169 by Aaron Bentley
Add filesystem/inventory conflicts to conflict output
1573
    return new_conflicts
1574
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
1575
1534.7.169 by Aaron Bentley
Add filesystem/inventory conflicts to conflict output
1576
def cook_conflicts(raw_conflicts, tt):
1534.7.170 by Aaron Bentley
Cleaned up filesystem conflict handling
1577
    """Generate a list of cooked conflicts, sorted by file path"""
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
1578
    from bzrlib.conflicts import Conflict
1579
    conflict_iter = iter_cook_conflicts(raw_conflicts, tt)
1580
    return sorted(conflict_iter, key=Conflict.sort_key)
1534.7.170 by Aaron Bentley
Cleaned up filesystem conflict handling
1581
1534.7.169 by Aaron Bentley
Add filesystem/inventory conflicts to conflict output
1582
1583
def iter_cook_conflicts(raw_conflicts, tt):
1534.10.19 by Aaron Bentley
Stanza conversion, cooking
1584
    from bzrlib.conflicts import Conflict
1534.7.170 by Aaron Bentley
Cleaned up filesystem conflict handling
1585
    fp = FinalPaths(tt)
1534.7.169 by Aaron Bentley
Add filesystem/inventory conflicts to conflict output
1586
    for conflict in raw_conflicts:
1587
        c_type = conflict[0]
1534.7.170 by Aaron Bentley
Cleaned up filesystem conflict handling
1588
        action = conflict[1]
1589
        modified_path = fp.get_path(conflict[2])
1590
        modified_id = tt.final_file_id(conflict[2])
1591
        if len(conflict) == 3:
1534.10.19 by Aaron Bentley
Stanza conversion, cooking
1592
            yield Conflict.factory(c_type, action=action, path=modified_path,
1593
                                     file_id=modified_id)
1594
             
1534.7.170 by Aaron Bentley
Cleaned up filesystem conflict handling
1595
        else:
1596
            conflicting_path = fp.get_path(conflict[3])
1597
            conflicting_id = tt.final_file_id(conflict[3])
1534.10.19 by Aaron Bentley
Stanza conversion, cooking
1598
            yield Conflict.factory(c_type, action=action, path=modified_path,
1599
                                   file_id=modified_id, 
1600
                                   conflict_path=conflicting_path,
1601
                                   conflict_file_id=conflicting_id)