~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.1 by Aaron Bentley
Got creation of a versioned file working
741
        inv = self._tree.inventory
2376.2.5 by Aaron Bentley
Clean up apply methods
742
        inventory_delta = []
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)
2376.2.5 by Aaron Bentley
Clean up apply methods
746
            self._apply_removals(inv, inventory_delta)
1551.2.31 by Aaron Bentley
Got merge and revert using nested pbs
747
            child_pb.update('Apply phase', 1, 2)
2376.2.5 by Aaron Bentley
Clean up apply methods
748
            modified_paths = self._apply_insertions(inv, inventory_delta)
1551.2.31 by Aaron Bentley
Got merge and revert using nested pbs
749
        finally:
750
            child_pb.finished()
2376.2.5 by Aaron Bentley
Clean up apply methods
751
        self._tree.apply_inventory_delta(inventory_delta)
1534.7.35 by Aaron Bentley
Got file renaming working
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
2376.2.5 by Aaron Bentley
Clean up apply methods
760
    def _apply_removals(self, inv, inventory_delta):
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)
2376.2.4 by Aaron Bentley
Switch TreeTransform to use WT.apply_inventory_delta
789
                    assert file_id is not None
2376.2.5 by Aaron Bentley
Clean up apply methods
790
                    inventory_delta.append((path, None, file_id, None))
1551.2.31 by Aaron Bentley
Got merge and revert using nested pbs
791
        finally:
792
            child_pb.finished()
1534.7.34 by Aaron Bentley
Proper conflicts for removals
793
2376.2.5 by Aaron Bentley
Clean up apply methods
794
    def _apply_insertions(self, inv, inventory_delta):
1534.7.36 by Aaron Bentley
Added rename tests
795
        """Perform tree operations that insert directory/inventory names.
796
        
797
        That is, create any files that need to be created, and restore from
798
        limbo any files that needed renaming.  This must be done in strict
799
        parent-to-child order.
800
        """
1534.9.1 by Aaron Bentley
Added progress bars to merge
801
        new_paths = self.new_paths()
1534.7.191 by Aaron Bentley
Got transform.apply to list modified paths
802
        modified_paths = []
1551.2.31 by Aaron Bentley
Got merge and revert using nested pbs
803
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
804
        try:
805
            for num, (path, trans_id) in enumerate(new_paths):
2376.2.4 by Aaron Bentley
Switch TreeTransform to use WT.apply_inventory_delta
806
                new_entry = None
1551.2.31 by Aaron Bentley
Got merge and revert using nested pbs
807
                child_pb.update('adding file', num, len(new_paths))
1534.7.48 by Aaron Bentley
Ensured we can move/rename dangling inventory entries
808
                try:
1551.2.31 by Aaron Bentley
Got merge and revert using nested pbs
809
                    kind = self._new_contents[trans_id]
810
                except KeyError:
811
                    kind = contents = None
812
                if trans_id in self._new_contents or \
813
                    self.path_changed(trans_id):
814
                    full_path = self._tree.abspath(path)
815
                    try:
816
                        os.rename(self._limbo_name(trans_id), full_path)
817
                    except OSError, e:
818
                        # We may be renaming a dangling inventory id
819
                        if e.errno != errno.ENOENT:
820
                            raise
821
                    if trans_id in self._new_contents:
822
                        modified_paths.append(full_path)
823
                        del self._new_contents[trans_id]
824
825
                if trans_id in self._new_id:
826
                    if kind is None:
827
                        kind = file_kind(self._tree.abspath(path))
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
828
                    if trans_id in self._new_reference_revision:
2376.2.4 by Aaron Bentley
Switch TreeTransform to use WT.apply_inventory_delta
829
                        new_entry = inventory.TreeReference(
830
                            self._new_id[trans_id],
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
831
                            self._new_name[trans_id], 
832
                            self.final_file_id(self._new_parent[trans_id]),
833
                            None, self._new_reference_revision[trans_id])
834
                    else:
2376.2.4 by Aaron Bentley
Switch TreeTransform to use WT.apply_inventory_delta
835
                        new_entry = inventory.make_entry(kind,
836
                            self.final_name(trans_id),
837
                            self.final_file_id(self.final_parent(trans_id)),
838
                            self._new_id[trans_id])
839
                else:
840
                    if trans_id in self._new_name or trans_id in\
841
                        self._new_parent or\
842
                        trans_id in self._new_executability:
843
                        file_id = self.final_file_id(trans_id)
844
                        if file_id is not None:
845
                            entry = inv[file_id]
846
                            new_entry = entry.copy()
847
848
                    if trans_id in self._new_name or trans_id in\
849
                        self._new_parent:
850
                            if new_entry is not None:
851
                                new_entry.name = self.final_name(trans_id)
852
                                parent = self.final_parent(trans_id)
853
                                parent_id = self.final_file_id(parent)
854
                                new_entry.parent_id = parent_id
855
1551.2.31 by Aaron Bentley
Got merge and revert using nested pbs
856
                if trans_id in self._new_executability:
2376.2.4 by Aaron Bentley
Switch TreeTransform to use WT.apply_inventory_delta
857
                    self._set_executability(path, new_entry, trans_id)
858
                if new_entry is not None:
859
                    if new_entry.file_id in inv:
860
                        old_path = inv.id2path(new_entry.file_id)
861
                    else:
862
                        old_path = None
2376.2.5 by Aaron Bentley
Clean up apply methods
863
                    inventory_delta.append((old_path, path,
864
                                            new_entry.file_id,
865
                                            new_entry))
1551.2.31 by Aaron Bentley
Got merge and revert using nested pbs
866
        finally:
867
            child_pb.finished()
1534.7.191 by Aaron Bentley
Got transform.apply to list modified paths
868
        return modified_paths
1534.7.40 by Aaron Bentley
Updated docs
869
2376.2.4 by Aaron Bentley
Switch TreeTransform to use WT.apply_inventory_delta
870
    def _set_executability(self, path, entry, trans_id):
1534.7.40 by Aaron Bentley
Updated docs
871
        """Set the executability of versioned files """
1534.7.25 by Aaron Bentley
Added set_executability
872
        new_executability = self._new_executability[trans_id]
2376.2.4 by Aaron Bentley
Switch TreeTransform to use WT.apply_inventory_delta
873
        entry.executable = new_executability
1534.7.25 by Aaron Bentley
Added set_executability
874
        if supports_executable():
875
            abspath = self._tree.abspath(path)
876
            current_mode = os.stat(abspath).st_mode
877
            if new_executability:
878
                umask = os.umask(0)
879
                os.umask(umask)
880
                to_mode = current_mode | (0100 & ~umask)
881
                # Enable x-bit for others only if they can read it.
882
                if current_mode & 0004:
883
                    to_mode |= 0001 & ~umask
884
                if current_mode & 0040:
885
                    to_mode |= 0010 & ~umask
886
            else:
887
                to_mode = current_mode & ~0111
888
            os.chmod(abspath, to_mode)
889
1534.7.23 by Aaron Bentley
Transform.new_entry -> Transform._new_entry
890
    def _new_entry(self, name, parent_id, file_id):
1534.7.21 by Aaron Bentley
Updated docstrings
891
        """Helper function to create a new filesystem entry."""
1534.7.2 by Aaron Bentley
Added convenience function
892
        trans_id = self.create_path(name, parent_id)
893
        if file_id is not None:
894
            self.version_file(file_id, trans_id)
895
        return trans_id
896
1534.7.27 by Aaron Bentley
Added execute bit to new_file method
897
    def new_file(self, name, parent_id, contents, file_id=None, 
898
                 executable=None):
1534.7.156 by Aaron Bentley
PEP8 fixes
899
        """Convenience method to create files.
1534.7.21 by Aaron Bentley
Updated docstrings
900
        
901
        name is the name of the file to create.
902
        parent_id is the transaction id of the parent directory of the file.
903
        contents is an iterator of bytestrings, which will be used to produce
904
        the file.
1740.2.4 by Aaron Bentley
Update transform tests and docs
905
        :param file_id: The inventory ID of the file, if it is to be versioned.
906
        :param executable: Only valid when a file_id has been supplied.
1534.7.21 by Aaron Bentley
Updated docstrings
907
        """
1534.7.23 by Aaron Bentley
Transform.new_entry -> Transform._new_entry
908
        trans_id = self._new_entry(name, parent_id, file_id)
1740.2.4 by Aaron Bentley
Update transform tests and docs
909
        # TODO: rather than scheduling a set_executable call,
910
        # have create_file create the file with the right mode.
1534.7.20 by Aaron Bentley
Added directory handling
911
        self.create_file(contents, trans_id)
1534.7.27 by Aaron Bentley
Added execute bit to new_file method
912
        if executable is not None:
913
            self.set_executability(executable, trans_id)
1534.7.20 by Aaron Bentley
Added directory handling
914
        return trans_id
915
916
    def new_directory(self, name, parent_id, file_id=None):
1534.7.156 by Aaron Bentley
PEP8 fixes
917
        """Convenience method to create directories.
1534.7.21 by Aaron Bentley
Updated docstrings
918
919
        name is the name of the directory to create.
920
        parent_id is the transaction id of the parent directory of the
921
        directory.
922
        file_id is the inventory ID of the directory, if it is to be versioned.
923
        """
1534.7.23 by Aaron Bentley
Transform.new_entry -> Transform._new_entry
924
        trans_id = self._new_entry(name, parent_id, file_id)
1534.7.20 by Aaron Bentley
Added directory handling
925
        self.create_directory(trans_id)
926
        return trans_id 
927
1534.7.22 by Aaron Bentley
Added symlink support
928
    def new_symlink(self, name, parent_id, target, file_id=None):
1534.7.156 by Aaron Bentley
PEP8 fixes
929
        """Convenience method to create symbolic link.
1534.7.22 by Aaron Bentley
Added symlink support
930
        
931
        name is the name of the symlink to create.
932
        parent_id is the transaction id of the parent directory of the symlink.
933
        target is a bytestring of the target of the symlink.
934
        file_id is the inventory ID of the file, if it is to be versioned.
935
        """
1534.7.23 by Aaron Bentley
Transform.new_entry -> Transform._new_entry
936
        trans_id = self._new_entry(name, parent_id, file_id)
1534.7.22 by Aaron Bentley
Added symlink support
937
        self.create_symlink(target, trans_id)
938
        return trans_id
939
1551.11.12 by Aaron Bentley
Changes from review
940
    def _affected_ids(self):
941
        """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
942
        trans_ids = set(self._removed_id)
943
        trans_ids.update(self._new_id.keys())
1551.11.2 by Aaron Bentley
Get kind change detection working for iter_changes
944
        trans_ids.update(self._removed_contents)
945
        trans_ids.update(self._new_contents.keys())
946
        trans_ids.update(self._new_executability.keys())
947
        trans_ids.update(self._new_name.keys())
948
        trans_ids.update(self._new_parent.keys())
1551.11.12 by Aaron Bentley
Changes from review
949
        return trans_ids
950
951
    def _get_file_id_maps(self):
952
        """Return mapping of file_ids to trans_ids in the to and from states"""
953
        trans_ids = self._affected_ids()
1551.11.1 by Aaron Bentley
Initial work on converting TreeTransform to iter_changes format
954
        from_trans_ids = {}
955
        to_trans_ids = {}
956
        # Build up two dicts: trans_ids associated with file ids in the
957
        # FROM state, vs the TO state.
958
        for trans_id in trans_ids:
959
            from_file_id = self.tree_file_id(trans_id)
960
            if from_file_id is not None:
961
                from_trans_ids[from_file_id] = trans_id
962
            to_file_id = self.final_file_id(trans_id)
963
            if to_file_id is not None:
964
                to_trans_ids[to_file_id] = trans_id
1551.11.12 by Aaron Bentley
Changes from review
965
        return from_trans_ids, to_trans_ids
966
967
    def _from_file_data(self, from_trans_id, from_versioned, file_id):
968
        """Get data about a file in the from (tree) state
969
970
        Return a (name, parent, kind, executable) tuple
971
        """
972
        from_path = self._tree_id_paths.get(from_trans_id)
973
        if from_versioned:
974
            # get data from working tree if versioned
975
            from_entry = self._tree.inventory[file_id]
976
            from_name = from_entry.name
977
            from_parent = from_entry.parent_id
978
        else:
979
            from_entry = None
980
            if from_path is None:
981
                # File does not exist in FROM state
982
                from_name = None
983
                from_parent = None
984
            else:
985
                # File exists, but is not versioned.  Have to use path-
986
                # splitting stuff
987
                from_name = os.path.basename(from_path)
988
                tree_parent = self.get_tree_parent(from_trans_id)
989
                from_parent = self.tree_file_id(tree_parent)
990
        if from_path is not None:
991
            from_kind, from_executable, from_stats = \
992
                self._tree._comparison_data(from_entry, from_path)
993
        else:
994
            from_kind = None
995
            from_executable = False
996
        return from_name, from_parent, from_kind, from_executable
997
998
    def _to_file_data(self, to_trans_id, from_trans_id, from_executable):
999
        """Get data about a file in the to (target) state
1000
1001
        Return a (name, parent, kind, executable) tuple
1002
        """
1003
        to_name = self.final_name(to_trans_id)
1004
        try:
1005
            to_kind = self.final_kind(to_trans_id)
1006
        except NoSuchFile:
1007
            to_kind = None
1008
        to_parent = self.final_file_id(self.final_parent(to_trans_id))
1009
        if to_trans_id in self._new_executability:
1010
            to_executable = self._new_executability[to_trans_id]
1011
        elif to_trans_id == from_trans_id:
1012
            to_executable = from_executable
1013
        else:
1014
            to_executable = False
1015
        return to_name, to_parent, to_kind, to_executable
1016
1017
    def _iter_changes(self):
1018
        """Produce output in the same format as Tree._iter_changes.
1019
1020
        Will produce nonsensical results if invoked while inventory/filesystem
1021
        conflicts (as reported by TreeTransform.find_conflicts()) are present.
1022
1023
        This reads the Transform, but only reproduces changes involving a
1024
        file_id.  Files that are not versioned in either of the FROM or TO
1025
        states are not reflected.
1026
        """
1027
        final_paths = FinalPaths(self)
1028
        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
1029
        results = []
1551.11.1 by Aaron Bentley
Initial work on converting TreeTransform to iter_changes format
1030
        # Now iterate through all active file_ids
1031
        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
1032
            modified = False
1551.11.1 by Aaron Bentley
Initial work on converting TreeTransform to iter_changes format
1033
            from_trans_id = from_trans_ids.get(file_id)
1034
            # find file ids, and determine versioning state
1035
            if from_trans_id is None:
1036
                from_versioned = False
1037
                from_trans_id = to_trans_ids[file_id]
1038
            else:
1039
                from_versioned = True
1040
            to_trans_id = to_trans_ids.get(file_id)
1041
            if to_trans_id is None:
1042
                to_versioned = False
1043
                to_trans_id = from_trans_id
1044
            else:
1045
                to_versioned = True
1551.11.12 by Aaron Bentley
Changes from review
1046
1047
            from_name, from_parent, from_kind, from_executable = \
1048
                self._from_file_data(from_trans_id, from_versioned, file_id)
1049
1050
            to_name, to_parent, to_kind, to_executable = \
1051
                self._to_file_data(to_trans_id, from_trans_id, from_executable)
1052
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
1053
            if not from_versioned:
1054
                from_path = None
1055
            else:
1056
                from_path = self._tree_id_paths.get(from_trans_id)
1057
            if not to_versioned:
1058
                to_path = None
1059
            else:
1060
                to_path = final_paths.get_path(to_trans_id)
1551.11.1 by Aaron Bentley
Initial work on converting TreeTransform to iter_changes format
1061
            if from_kind != to_kind:
1062
                modified = True
1551.10.37 by Aaron Bentley
recommit of TreeTransform._iter_changes fix with missing files
1063
            elif to_kind in ('file', 'symlink') and (
1551.11.2 by Aaron Bentley
Get kind change detection working for iter_changes
1064
                to_trans_id != from_trans_id or
1065
                to_trans_id in self._new_contents):
1066
                modified = True
1067
            if (not modified and from_versioned == to_versioned and
1068
                from_parent==to_parent and from_name == to_name and
1069
                from_executable == to_executable):
1070
                continue
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
1071
            results.append((file_id, (from_path, to_path), modified,
1551.11.1 by Aaron Bentley
Initial work on converting TreeTransform to iter_changes format
1072
                   (from_versioned, to_versioned),
1551.11.2 by Aaron Bentley
Get kind change detection working for iter_changes
1073
                   (from_parent, to_parent),
1551.11.1 by Aaron Bentley
Initial work on converting TreeTransform to iter_changes format
1074
                   (from_name, to_name),
1075
                   (from_kind, to_kind),
1551.11.4 by Aaron Bentley
Sort output of Transform.iter_changes by path
1076
                   (from_executable, to_executable)))
1077
        return iter(sorted(results, key=lambda x:x[1]))
1551.11.1 by Aaron Bentley
Initial work on converting TreeTransform to iter_changes format
1078
1079
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
1080
def joinpath(parent, child):
1534.7.40 by Aaron Bentley
Updated docs
1081
    """Join tree-relative paths, handling the tree root specially"""
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
1082
    if parent is None or parent == "":
1083
        return child
1084
    else:
1534.7.166 by Aaron Bentley
Swapped os.path.join for pathjoin everywhere
1085
        return pathjoin(parent, child)
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
1086
1534.7.167 by Aaron Bentley
PEP8 and comment cleanups
1087
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
1088
class FinalPaths(object):
1759.2.2 by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron.
1089
    """Make path calculation cheap by memoizing paths.
1534.7.21 by Aaron Bentley
Updated docstrings
1090
1091
    The underlying tree must not be manipulated between calls, or else
1092
    the results will likely be incorrect.
1093
    """
1534.7.132 by Aaron Bentley
Got cooked conflicts working
1094
    def __init__(self, transform):
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
1095
        object.__init__(self)
1096
        self._known_paths = {}
1534.7.33 by Aaron Bentley
Fixed naming
1097
        self.transform = transform
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
1098
1099
    def _determine_path(self, trans_id):
1534.7.132 by Aaron Bentley
Got cooked conflicts working
1100
        if trans_id == self.transform.root:
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
1101
            return ""
1534.7.33 by Aaron Bentley
Fixed naming
1102
        name = self.transform.final_name(trans_id)
1103
        parent_id = self.transform.final_parent(trans_id)
1534.7.132 by Aaron Bentley
Got cooked conflicts working
1104
        if parent_id == self.transform.root:
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
1105
            return name
1106
        else:
1534.7.166 by Aaron Bentley
Swapped os.path.join for pathjoin everywhere
1107
            return pathjoin(self.get_path(parent_id), name)
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
1108
1109
    def get_path(self, trans_id):
1534.7.157 by Aaron Bentley
Added more docs
1110
        """Find the final path associated with a trans_id"""
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
1111
        if trans_id not in self._known_paths:
1112
            self._known_paths[trans_id] = self._determine_path(trans_id)
1113
        return self._known_paths[trans_id]
1534.7.28 by Aaron Bentley
Nearly-working build_tree replacement
1114
1534.7.30 by Aaron Bentley
Factored out topological id sorting
1115
def topology_sorted_ids(tree):
1534.7.40 by Aaron Bentley
Updated docs
1116
    """Determine the topological order of the ids in a tree"""
1534.7.30 by Aaron Bentley
Factored out topological id sorting
1117
    file_ids = list(tree)
1118
    file_ids.sort(key=tree.id2path)
1119
    return file_ids
1534.7.28 by Aaron Bentley
Nearly-working build_tree replacement
1120
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1121
1534.7.165 by Aaron Bentley
Switched to build_tree instead of revert
1122
def build_tree(tree, wt):
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1123
    """Create working tree for a branch, using a TreeTransform.
1124
    
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
1125
    This function should be used on empty trees, having a tree root at most.
1126
    (see merge and revert functionality for working with existing trees)
1127
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1128
    Existing files are handled like so:
1129
    
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
1130
    - Existing bzrdirs take precedence over creating new items.  They are
1131
      created as '%s.diverted' % name.
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1132
    - Otherwise, if the content on disk matches the content we are building,
1133
      it is silently replaced.
1134
    - Otherwise, conflict resolution will move the old file to 'oldname.moved'.
1135
    """
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.
1136
    wt.lock_tree_write()
2255.7.49 by Robert Collins
Lock trees passed in to build_tree.
1137
    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.
1138
        tree.lock_read()
2255.7.49 by Robert Collins
Lock trees passed in to build_tree.
1139
        try:
1140
            return _build_tree(tree, wt)
1141
        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.
1142
            tree.unlock()
2255.7.49 by Robert Collins
Lock trees passed in to build_tree.
1143
    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.
1144
        wt.unlock()
2255.7.49 by Robert Collins
Lock trees passed in to build_tree.
1145
1146
def _build_tree(tree, wt):
1147
    """See build_tree."""
2090.2.1 by Martin Pool
Fix some code which relies on assertions and breaks under python -O
1148
    if len(wt.inventory) > 1:  # more than just a root
1149
        raise errors.WorkingTreeAlreadyPopulated(base=wt.basedir)
1534.7.28 by Aaron Bentley
Nearly-working build_tree replacement
1150
    file_trans_id = {}
1558.11.1 by Aaron Bentley
Progress indicator for tree builts
1151
    top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1152
    pp = ProgressPhase("Build phase", 2, top_pb)
2255.2.183 by Martin Pool
add missing _must_be_locked and a better message
1153
    if tree.inventory.root is not None:
2255.2.194 by Robert Collins
[BROKEN] Many updates to stop using experimental formats in tests.
1154
        # this is kindof a hack: we should be altering the root 
1155
        # as partof the regular tree shape diff logic.
1156
        # the conditional test hereis to avoid doing an
1157
        # expensive operation (flush) every time the root id
1158
        # is set within the tree, nor setting the root and thus
1159
        # marking the tree as dirty, because we use two different
1160
        # idioms here: tree interfaces and inventory interfaces.
1161
        if wt.path2id('') != tree.inventory.root.file_id:
1162
            wt.set_root_id(tree.inventory.root.file_id)
1163
            wt.flush()
1534.7.28 by Aaron Bentley
Nearly-working build_tree replacement
1164
    tt = TreeTransform(wt)
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
1165
    divert = set()
1534.7.28 by Aaron Bentley
Nearly-working build_tree replacement
1166
    try:
1558.11.1 by Aaron Bentley
Progress indicator for tree builts
1167
        pp.next_phase()
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1168
        file_trans_id[wt.get_root_id()] = \
1169
            tt.trans_id_tree_file_id(wt.get_root_id())
1558.11.1 by Aaron Bentley
Progress indicator for tree builts
1170
        pb = bzrlib.ui.ui_factory.nested_progress_bar()
1171
        try:
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
1172
            for num, (tree_path, entry) in \
1173
                enumerate(tree.inventory.iter_entries_by_dir()):
1174
                pb.update("Building tree", num, len(tree.inventory))
1558.11.1 by Aaron Bentley
Progress indicator for tree builts
1175
                if entry.parent_id is None:
1176
                    continue
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1177
                reparent = False
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
1178
                file_id = entry.file_id
1179
                target_path = wt.abspath(tree_path)
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1180
                try:
1181
                    kind = file_kind(target_path)
1182
                except NoSuchFile:
1183
                    pass
1184
                else:
1185
                    if kind == "directory":
1186
                        try:
1187
                            bzrdir.BzrDir.open(target_path)
1188
                        except errors.NotBranchError:
1189
                            pass
1190
                        else:
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
1191
                            divert.add(file_id)
1192
                    if (file_id not in divert and
1193
                        _content_match(tree, entry, file_id, kind,
1194
                        target_path)):
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1195
                        tt.delete_contents(tt.trans_id_tree_path(tree_path))
1196
                        if kind == 'directory':
1197
                            reparent = True
1558.11.1 by Aaron Bentley
Progress indicator for tree builts
1198
                if entry.parent_id not in file_trans_id:
2255.2.183 by Martin Pool
add missing _must_be_locked and a better message
1199
                    raise AssertionError(
1200
                        'entry %s parent id %r is not in file_trans_id %r'
1201
                        % (entry, entry.parent_id, file_trans_id))
1558.11.1 by Aaron Bentley
Progress indicator for tree builts
1202
                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
1203
                file_trans_id[file_id] = new_by_entry(tt, entry, parent_id,
1558.11.1 by Aaron Bentley
Progress indicator for tree builts
1204
                                                      tree)
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1205
                if reparent:
1206
                    new_trans_id = file_trans_id[file_id]
1207
                    old_parent = tt.trans_id_tree_path(tree_path)
1208
                    _reparent_children(tt, old_parent, new_trans_id)
1558.11.1 by Aaron Bentley
Progress indicator for tree builts
1209
        finally:
1210
            pb.finished()
1211
        pp.next_phase()
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
1212
        divert_trans = set(file_trans_id[f] for f in divert)
1213
        resolver = lambda t, c: resolve_checkout(t, c, divert_trans)
1214
        raw_conflicts = resolve_conflicts(tt, pass_func=resolver)
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1215
        conflicts = cook_conflicts(raw_conflicts, tt)
1216
        for conflict in conflicts:
1217
            warning(conflict)
1218
        try:
1219
            wt.add_conflicts(conflicts)
1220
        except errors.UnsupportedOperation:
1221
            pass
1534.7.47 by Aaron Bentley
Started work on 'revert'
1222
        tt.apply()
1223
    finally:
1224
        tt.finalize()
1558.11.1 by Aaron Bentley
Progress indicator for tree builts
1225
        top_pb.finished()
1534.7.47 by Aaron Bentley
Started work on 'revert'
1226
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1227
1228
def _reparent_children(tt, old_parent, new_parent):
1229
    for child in tt.iter_tree_children(old_parent):
1230
        tt.adjust_path(tt.final_name(child), new_parent, child)
1231
1232
1233
def _content_match(tree, entry, file_id, kind, target_path):
1234
    if entry.kind != kind:
1235
        return False
1236
    if entry.kind == "directory":
1237
        return True
1238
    if entry.kind == "file":
1239
        if tree.get_file(file_id).read() == file(target_path, 'rb').read():
1240
            return True
1241
    elif entry.kind == "symlink":
1242
        if tree.get_symlink_target(file_id) == os.readlink(target_path):
1243
            return True
1244
    return False
1245
1246
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
1247
def resolve_checkout(tt, conflicts, divert):
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1248
    new_conflicts = set()
1249
    for c_type, conflict in ((c[0], c) for c in conflicts):
1250
        # Anything but a 'duplicate' would indicate programmer error
1251
        assert c_type == 'duplicate', c_type
1252
        # 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
1253
        if tt.new_contents(conflict[1]):
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1254
            new_file = conflict[1]
1255
            old_file = conflict[2]
1256
        else:
1257
            new_file = conflict[2]
1258
            old_file = conflict[1]
1259
1260
        # We should only get here if the conflict wasn't completely
1261
        # resolved
1262
        final_parent = tt.final_parent(old_file)
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
1263
        if new_file in divert:
1264
            new_name = tt.final_name(old_file)+'.diverted'
1265
            tt.adjust_path(new_name, final_parent, new_file)
1266
            new_conflicts.add((c_type, 'Diverted to',
1267
                               new_file, old_file))
1268
        else:
1269
            new_name = tt.final_name(old_file)+'.moved'
1270
            tt.adjust_path(new_name, final_parent, old_file)
1271
            new_conflicts.add((c_type, 'Moved existing file to',
1272
                               old_file, new_file))
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1273
    return new_conflicts
1274
1275
1534.7.47 by Aaron Bentley
Started work on 'revert'
1276
def new_by_entry(tt, entry, parent_id, tree):
1534.7.157 by Aaron Bentley
Added more docs
1277
    """Create a new file according to its inventory entry"""
1534.7.47 by Aaron Bentley
Started work on 'revert'
1278
    name = entry.name
1279
    kind = entry.kind
1280
    if kind == 'file':
1534.7.79 by Aaron Bentley
Stopped calling get_file_lines on WorkingTree
1281
        contents = tree.get_file(entry.file_id).readlines()
1534.7.47 by Aaron Bentley
Started work on 'revert'
1282
        executable = tree.is_executable(entry.file_id)
1283
        return tt.new_file(name, parent_id, contents, entry.file_id, 
1284
                           executable)
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
1285
    elif kind in ('directory', 'tree-reference'):
1286
        trans_id = tt.new_directory(name, parent_id, entry.file_id)
1287
        if kind == 'tree-reference':
1288
            tt.set_tree_reference(entry.reference_revision, trans_id)
1289
        return trans_id 
1534.7.47 by Aaron Bentley
Started work on 'revert'
1290
    elif kind == 'symlink':
1534.7.183 by Aaron Bentley
Fixed build_tree with symlinks
1291
        target = tree.get_symlink_target(entry.file_id)
1292
        return tt.new_symlink(name, parent_id, target, entry.file_id)
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
1293
    else:
1294
        raise errors.BadFileKindError(name, kind)
1534.7.47 by Aaron Bentley
Started work on 'revert'
1295
1534.7.117 by Aaron Bentley
Simplified permission handling of existing files in transform.
1296
def create_by_entry(tt, entry, tree, trans_id, lines=None, mode_id=None):
1534.7.157 by Aaron Bentley
Added more docs
1297
    """Create new file contents according to an inventory entry."""
1534.7.47 by Aaron Bentley
Started work on 'revert'
1298
    if entry.kind == "file":
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
1299
        if lines is None:
1534.7.97 by Aaron Bentley
Ensured foo.BASE is a directory if there's a conflict
1300
            lines = tree.get_file(entry.file_id).readlines()
1534.7.117 by Aaron Bentley
Simplified permission handling of existing files in transform.
1301
        tt.create_file(lines, trans_id, mode_id=mode_id)
1534.7.47 by Aaron Bentley
Started work on 'revert'
1302
    elif entry.kind == "symlink":
1534.7.101 by Aaron Bentley
Got conflicts on symlinks working properly
1303
        tt.create_symlink(tree.get_symlink_target(entry.file_id), trans_id)
1534.7.47 by Aaron Bentley
Started work on 'revert'
1304
    elif entry.kind == "directory":
1534.7.51 by Aaron Bentley
New approach to revert
1305
        tt.create_directory(trans_id)
1534.7.47 by Aaron Bentley
Started work on 'revert'
1306
1534.7.89 by Aaron Bentley
Handle all content types in three-way
1307
def create_entry_executability(tt, entry, trans_id):
1534.7.157 by Aaron Bentley
Added more docs
1308
    """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
1309
    if entry.kind == "file":
1310
        tt.set_executability(entry.executable, trans_id)
1534.7.47 by Aaron Bentley
Started work on 'revert'
1311
1534.7.157 by Aaron Bentley
Added more docs
1312
2255.7.48 by Robert Collins
Deprecated and make work with DirState trees 'transform.find_interesting'.
1313
@deprecated_function(zero_fifteen)
1534.7.55 by Aaron Bentley
Fixed up the change detection
1314
def find_interesting(working_tree, target_tree, filenames):
2255.7.48 by Robert Collins
Deprecated and make work with DirState trees 'transform.find_interesting'.
1315
    """Find the ids corresponding to specified filenames.
1316
    
1317
    Deprecated: Please use tree1.paths2ids(filenames, [tree2]).
1318
    """
1319
    working_tree.lock_read()
1320
    try:
1321
        target_tree.lock_read()
1322
        try:
1323
            return working_tree.paths2ids(filenames, [target_tree])
1324
        finally:
1325
            target_tree.unlock()
1326
    finally:
1327
        working_tree.unlock()
1534.7.55 by Aaron Bentley
Fixed up the change detection
1328
1329
1534.7.56 by Aaron Bentley
Implemented the backup file detritus
1330
def change_entry(tt, file_id, working_tree, target_tree, 
1534.10.28 by Aaron Bentley
Use numbered backup files
1331
                 trans_id_file_id, backups, trans_id, by_parent):
1534.7.157 by Aaron Bentley
Added more docs
1332
    """Replace a file_id's contents with those from a target tree."""
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
1333
    e_trans_id = trans_id_file_id(file_id)
1534.7.55 by Aaron Bentley
Fixed up the change detection
1334
    entry = target_tree.inventory[file_id]
1335
    has_contents, contents_mod, meta_mod, = _entry_changes(file_id, entry, 
1336
                                                           working_tree)
1337
    if contents_mod:
1534.7.117 by Aaron Bentley
Simplified permission handling of existing files in transform.
1338
        mode_id = e_trans_id
1534.7.55 by Aaron Bentley
Fixed up the change detection
1339
        if has_contents:
1534.7.56 by Aaron Bentley
Implemented the backup file detritus
1340
            if not backups:
1341
                tt.delete_contents(e_trans_id)
1342
            else:
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
1343
                parent_trans_id = trans_id_file_id(entry.parent_id)
1534.10.28 by Aaron Bentley
Use numbered backup files
1344
                backup_name = get_backup_name(entry, by_parent,
1345
                                              parent_trans_id, tt)
1346
                tt.adjust_path(backup_name, parent_trans_id, e_trans_id)
1534.7.56 by Aaron Bentley
Implemented the backup file detritus
1347
                tt.unversion_file(e_trans_id)
1348
                e_trans_id = tt.create_path(entry.name, parent_trans_id)
1349
                tt.version_file(file_id, e_trans_id)
1350
                trans_id[file_id] = e_trans_id
1534.7.117 by Aaron Bentley
Simplified permission handling of existing files in transform.
1351
        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
1352
        create_entry_executability(tt, entry, e_trans_id)
1353
1711.4.26 by John Arbash Meinel
Fix #45010 correctly. Don't forget the execute bit.
1354
    elif meta_mod:
1355
        tt.set_executability(entry.executable, e_trans_id)
1534.7.55 by Aaron Bentley
Fixed up the change detection
1356
    if tt.final_name(e_trans_id) != entry.name:
1357
        adjust_path  = True
1358
    else:
1359
        parent_id = tt.final_parent(e_trans_id)
1360
        parent_file_id = tt.final_file_id(parent_id)
1361
        if parent_file_id != entry.parent_id:
1362
            adjust_path = True
1363
        else:
1364
            adjust_path = False
1365
    if adjust_path:
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
1366
        parent_trans_id = trans_id_file_id(entry.parent_id)
1534.7.56 by Aaron Bentley
Implemented the backup file detritus
1367
        tt.adjust_path(entry.name, parent_trans_id, e_trans_id)
1534.7.55 by Aaron Bentley
Fixed up the change detection
1368
1369
1534.10.28 by Aaron Bentley
Use numbered backup files
1370
def get_backup_name(entry, by_parent, parent_trans_id, tt):
2012.1.12 by Aaron Bentley
Use iter_changes for revert
1371
    return _get_backup_name(entry.name, by_parent, parent_trans_id, tt)
1372
1373
1374
def _get_backup_name(name, by_parent, parent_trans_id, tt):
1534.10.28 by Aaron Bentley
Use numbered backup files
1375
    """Produce a backup-style name that appears to be available"""
1376
    def name_gen():
1377
        counter = 1
1378
        while True:
2012.1.12 by Aaron Bentley
Use iter_changes for revert
1379
            yield "%s.~%d~" % (name, counter)
1534.10.28 by Aaron Bentley
Use numbered backup files
1380
            counter += 1
2012.1.12 by Aaron Bentley
Use iter_changes for revert
1381
    for new_name in name_gen():
1382
        if not tt.has_named_child(by_parent, parent_trans_id, new_name):
1383
            return new_name
1384
1534.10.28 by Aaron Bentley
Use numbered backup files
1385
1534.7.55 by Aaron Bentley
Fixed up the change detection
1386
def _entry_changes(file_id, entry, working_tree):
1534.7.156 by Aaron Bentley
PEP8 fixes
1387
    """Determine in which ways the inventory entry has changed.
1534.7.55 by Aaron Bentley
Fixed up the change detection
1388
1389
    Returns booleans: has_contents, content_mod, meta_mod
1390
    has_contents means there are currently contents, but they differ
1391
    contents_mod means contents need to be modified
1392
    meta_mod means the metadata needs to be modified
1393
    """
1394
    cur_entry = working_tree.inventory[file_id]
1395
    try:
1396
        working_kind = working_tree.kind(file_id)
1397
        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.
1398
    except NoSuchFile:
1534.7.55 by Aaron Bentley
Fixed up the change detection
1399
        has_contents = False
1400
        contents_mod = True
1401
        meta_mod = False
1402
    if has_contents is True:
1731.1.1 by Aaron Bentley
Make root entry an InventoryDirectory, make EmptyTree really empty
1403
        if entry.kind != working_kind:
1534.7.55 by Aaron Bentley
Fixed up the change detection
1404
            contents_mod, meta_mod = True, False
1405
        else:
1406
            cur_entry._read_tree_state(working_tree.id2path(file_id), 
1407
                                       working_tree)
1408
            contents_mod, meta_mod = entry.detect_changes(cur_entry)
1534.7.175 by Aaron Bentley
Ensured revert writes a normal inventory
1409
            cur_entry._forget_tree_state()
1534.7.55 by Aaron Bentley
Fixed up the change detection
1410
    return has_contents, contents_mod, meta_mod
1411
1534.7.56 by Aaron Bentley
Implemented the backup file detritus
1412
2255.2.53 by Robert Collins
Teach TreeTransform to lock basis_trees if it acquires them, fixing revert on a dirstate working tree.
1413
def revert(working_tree, target_tree, filenames, backups=False,
2225.1.1 by Aaron Bentley
Added revert change display, with tests
1414
           pb=DummyProgress(), change_reporter=None):
1534.7.157 by Aaron Bentley
Added more docs
1415
    """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.
1416
    target_tree.lock_read()
1534.9.7 by Aaron Bentley
Show progress bars in revert
1417
    tt = TreeTransform(working_tree, pb)
1534.7.47 by Aaron Bentley
Started work on 'revert'
1418
    try:
2012.1.12 by Aaron Bentley
Use iter_changes for revert
1419
        pp = ProgressPhase("Revert phase", 3, pb)
1420
        pp.next_phase()
1421
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1422
        try:
2255.2.53 by Robert Collins
Teach TreeTransform to lock basis_trees if it acquires them, fixing revert on a dirstate working tree.
1423
            _alter_files(working_tree, target_tree, tt, child_pb,
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
1424
                         filenames, backups)
1551.2.31 by Aaron Bentley
Got merge and revert using nested pbs
1425
        finally:
1426
            child_pb.finished()
1551.2.34 by Aaron Bentley
Refactored the revert phases
1427
        pp.next_phase()
1551.2.31 by Aaron Bentley
Got merge and revert using nested pbs
1428
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1429
        try:
1430
            raw_conflicts = resolve_conflicts(tt, child_pb)
1431
        finally:
1432
            child_pb.finished()
1558.7.13 by Aaron Bentley
WorkingTree.revert returns conflicts
1433
        conflicts = cook_conflicts(raw_conflicts, tt)
1551.11.5 by Aaron Bentley
cleanup
1434
        if change_reporter:
1551.10.25 by Aaron Bentley
Make ChangeReporter private
1435
            change_reporter = delta._ChangeReporter(
2255.7.98 by Robert Collins
Merge bzr.dev.
1436
                unversioned_filter=working_tree.is_ignored)
1551.11.5 by Aaron Bentley
cleanup
1437
            delta.report_changes(tt._iter_changes(), change_reporter)
1551.11.6 by Aaron Bentley
Emit change listings before conflict warnings
1438
        for conflict in conflicts:
1439
            warning(conflict)
1440
        pp.next_phase()
1534.7.28 by Aaron Bentley
Nearly-working build_tree replacement
1441
        tt.apply()
1534.7.193 by Aaron Bentley
Stopped revert from preserving file contents produced by merges
1442
        working_tree.set_merge_modified({})
1534.7.28 by Aaron Bentley
Nearly-working build_tree replacement
1443
    finally:
2255.2.53 by Robert Collins
Teach TreeTransform to lock basis_trees if it acquires them, fixing revert on a dirstate working tree.
1444
        target_tree.unlock()
1534.7.28 by Aaron Bentley
Nearly-working build_tree replacement
1445
        tt.finalize()
1534.9.4 by Aaron Bentley
Added progress bars to revert.
1446
        pb.clear()
1558.7.13 by Aaron Bentley
WorkingTree.revert returns conflicts
1447
    return conflicts
1534.7.51 by Aaron Bentley
New approach to revert
1448
1534.7.57 by Aaron Bentley
Enhanced conflict resolution.
1449
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
1450
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
1451
                 backups):
2012.1.12 by Aaron Bentley
Use iter_changes for revert
1452
    merge_modified = working_tree.merge_modified()
1551.11.3 by Aaron Bentley
Use tree transform to emit upcoming change list
1453
    change_list = target_tree._iter_changes(working_tree,
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
1454
        specific_files=specific_files, pb=pb)
2012.1.12 by Aaron Bentley
Use iter_changes for revert
1455
    if target_tree.inventory.root is None:
1456
        skip_root = True
1457
    else:
1458
        skip_root = False
1459
    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.
1460
    try:
1461
        for id_num, (file_id, path, changed_content, versioned, parent, name,
1462
                kind, executable) in enumerate(change_list):
1463
            if skip_root and file_id[0] is not None and parent[0] is None:
1464
                continue
1465
            trans_id = tt.trans_id_file_id(file_id)
1466
            mode_id = None
1467
            if changed_content:
1468
                keep_content = False
1469
                if kind[0] == 'file' and (backups or kind[1] is None):
1470
                    wt_sha1 = working_tree.get_file_sha1(file_id)
1471
                    if merge_modified.get(file_id) != wt_sha1:
1472
                        # acquire the basis tree lazyily to prevent the expense
1473
                        # of accessing it when its not needed ? (Guessing, RBC,
1474
                        # 200702)
1475
                        if basis_tree is None:
1476
                            basis_tree = working_tree.basis_tree()
1477
                            basis_tree.lock_read()
1478
                        if file_id in basis_tree:
1479
                            if wt_sha1 != basis_tree.get_file_sha1(file_id):
1480
                                keep_content = True
1481
                        elif kind[1] is None and not versioned[1]:
2012.1.12 by Aaron Bentley
Use iter_changes for revert
1482
                            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.
1483
                if kind[0] is not None:
1484
                    if not keep_content:
1485
                        tt.delete_contents(trans_id)
1486
                    elif kind[1] is not None:
1487
                        parent_trans_id = tt.trans_id_file_id(parent[0])
1488
                        by_parent = tt.by_parent()
1489
                        backup_name = _get_backup_name(name[0], by_parent,
1490
                                                       parent_trans_id, tt)
1491
                        tt.adjust_path(backup_name, parent_trans_id, trans_id)
1492
                        new_trans_id = tt.create_path(name[0], parent_trans_id)
1493
                        if versioned == (True, True):
1494
                            tt.unversion_file(trans_id)
1495
                            tt.version_file(file_id, new_trans_id)
1496
                        # New contents should have the same unix perms as old
1497
                        # contents
1498
                        mode_id = trans_id
1499
                        trans_id = new_trans_id
1500
                if kind[1] == 'directory':
1501
                    tt.create_directory(trans_id)
1502
                elif kind[1] == 'symlink':
1503
                    tt.create_symlink(target_tree.get_symlink_target(file_id),
1504
                                      trans_id)
1505
                elif kind[1] == 'file':
1506
                    tt.create_file(target_tree.get_file_lines(file_id),
1507
                                   trans_id, mode_id)
1508
                    # preserve the execute bit when backing up
1509
                    if keep_content and executable[0] == executable[1]:
1510
                        tt.set_executability(executable[1], trans_id)
1511
                else:
1512
                    assert kind[1] is None
1513
            if versioned == (False, True):
1514
                tt.version_file(file_id, trans_id)
1515
            if versioned == (True, False):
1516
                tt.unversion_file(trans_id)
1517
            if (name[1] is not None and 
1518
                (name[0] != name[1] or parent[0] != parent[1])):
1519
                tt.adjust_path(
1520
                    name[1], tt.trans_id_file_id(parent[1]), trans_id)
1521
            if executable[0] != executable[1] and kind[1] == "file":
1522
                tt.set_executability(executable[1], trans_id)
1523
    finally:
1524
        if basis_tree is not None:
1525
            basis_tree.unlock()
2012.1.12 by Aaron Bentley
Use iter_changes for revert
1526
1527
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1528
def resolve_conflicts(tt, pb=DummyProgress(), pass_func=None):
1534.7.57 by Aaron Bentley
Enhanced conflict resolution.
1529
    """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
1530
    if pass_func is None:
1531
        pass_func = conflict_pass
1534.7.169 by Aaron Bentley
Add filesystem/inventory conflicts to conflict output
1532
    new_conflicts = set()
1534.9.1 by Aaron Bentley
Added progress bars to merge
1533
    try:
1534
        for n in range(10):
1535
            pb.update('Resolution pass', n+1, 10)
1536
            conflicts = tt.find_conflicts()
1537
            if len(conflicts) == 0:
1538
                return new_conflicts
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1539
            new_conflicts.update(pass_func(tt, conflicts))
1534.9.1 by Aaron Bentley
Added progress bars to merge
1540
        raise MalformedTransform(conflicts=conflicts)
1541
    finally:
1542
        pb.clear()
1534.7.57 by Aaron Bentley
Enhanced conflict resolution.
1543
1544
1545
def conflict_pass(tt, conflicts):
1534.7.157 by Aaron Bentley
Added more docs
1546
    """Resolve some classes of conflicts."""
1534.7.169 by Aaron Bentley
Add filesystem/inventory conflicts to conflict output
1547
    new_conflicts = set()
1534.7.61 by Aaron Bentley
Handled parent loops, missing parents, unversioned parents
1548
    for c_type, conflict in ((c[0], c) for c in conflicts):
1549
        if c_type == 'duplicate id':
1534.7.51 by Aaron Bentley
New approach to revert
1550
            tt.unversion_file(conflict[1])
1534.7.170 by Aaron Bentley
Cleaned up filesystem conflict handling
1551
            new_conflicts.add((c_type, 'Unversioned existing file',
1552
                               conflict[1], conflict[2], ))
1534.7.61 by Aaron Bentley
Handled parent loops, missing parents, unversioned parents
1553
        elif c_type == 'duplicate':
1534.7.57 by Aaron Bentley
Enhanced conflict resolution.
1554
            # files that were renamed take precedence
1555
            new_name = tt.final_name(conflict[1])+'.moved'
1556
            final_parent = tt.final_parent(conflict[1])
1557
            if tt.path_changed(conflict[1]):
1558
                tt.adjust_path(new_name, final_parent, conflict[2])
1534.7.171 by Aaron Bentley
Implemented stringifying filesystem conflicts
1559
                new_conflicts.add((c_type, 'Moved existing file to', 
1560
                                   conflict[2], conflict[1]))
1534.7.57 by Aaron Bentley
Enhanced conflict resolution.
1561
            else:
1562
                tt.adjust_path(new_name, final_parent, conflict[1])
1534.7.171 by Aaron Bentley
Implemented stringifying filesystem conflicts
1563
                new_conflicts.add((c_type, 'Moved existing file to', 
1564
                                  conflict[1], conflict[2]))
1534.7.61 by Aaron Bentley
Handled parent loops, missing parents, unversioned parents
1565
        elif c_type == 'parent loop':
1566
            # break the loop by undoing one of the ops that caused the loop
1567
            cur = conflict[1]
1568
            while not tt.path_changed(cur):
1569
                cur = tt.final_parent(cur)
1534.7.170 by Aaron Bentley
Cleaned up filesystem conflict handling
1570
            new_conflicts.add((c_type, 'Cancelled move', cur,
1571
                               tt.final_parent(cur),))
1534.7.61 by Aaron Bentley
Handled parent loops, missing parents, unversioned parents
1572
            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
1573
            
1534.7.61 by Aaron Bentley
Handled parent loops, missing parents, unversioned parents
1574
        elif c_type == 'missing parent':
1534.7.128 by Aaron Bentley
Got missing contents test working
1575
            trans_id = conflict[1]
1576
            try:
1577
                tt.cancel_deletion(trans_id)
1551.8.22 by Aaron Bentley
Improve message when OTHER deletes an in-use tree
1578
                new_conflicts.add(('deleting parent', 'Not deleting', 
1579
                                   trans_id))
1534.7.128 by Aaron Bentley
Got missing contents test working
1580
            except KeyError:
1581
                tt.create_directory(trans_id)
1551.8.22 by Aaron Bentley
Improve message when OTHER deletes an in-use tree
1582
                new_conflicts.add((c_type, 'Created directory', trans_id))
1534.7.61 by Aaron Bentley
Handled parent loops, missing parents, unversioned parents
1583
        elif c_type == 'unversioned parent':
1534.7.148 by Aaron Bentley
Handled the remaining file versioning case
1584
            tt.version_file(tt.inactive_file_id(conflict[1]), conflict[1])
1534.7.171 by Aaron Bentley
Implemented stringifying filesystem conflicts
1585
            new_conflicts.add((c_type, 'Versioned directory', conflict[1]))
1534.7.169 by Aaron Bentley
Add filesystem/inventory conflicts to conflict output
1586
    return new_conflicts
1587
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
1588
1534.7.169 by Aaron Bentley
Add filesystem/inventory conflicts to conflict output
1589
def cook_conflicts(raw_conflicts, tt):
1534.7.170 by Aaron Bentley
Cleaned up filesystem conflict handling
1590
    """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
1591
    from bzrlib.conflicts import Conflict
1592
    conflict_iter = iter_cook_conflicts(raw_conflicts, tt)
1593
    return sorted(conflict_iter, key=Conflict.sort_key)
1534.7.170 by Aaron Bentley
Cleaned up filesystem conflict handling
1594
1534.7.169 by Aaron Bentley
Add filesystem/inventory conflicts to conflict output
1595
1596
def iter_cook_conflicts(raw_conflicts, tt):
1534.10.19 by Aaron Bentley
Stanza conversion, cooking
1597
    from bzrlib.conflicts import Conflict
1534.7.170 by Aaron Bentley
Cleaned up filesystem conflict handling
1598
    fp = FinalPaths(tt)
1534.7.169 by Aaron Bentley
Add filesystem/inventory conflicts to conflict output
1599
    for conflict in raw_conflicts:
1600
        c_type = conflict[0]
1534.7.170 by Aaron Bentley
Cleaned up filesystem conflict handling
1601
        action = conflict[1]
1602
        modified_path = fp.get_path(conflict[2])
1603
        modified_id = tt.final_file_id(conflict[2])
1604
        if len(conflict) == 3:
1534.10.19 by Aaron Bentley
Stanza conversion, cooking
1605
            yield Conflict.factory(c_type, action=action, path=modified_path,
1606
                                     file_id=modified_id)
1607
             
1534.7.170 by Aaron Bentley
Cleaned up filesystem conflict handling
1608
        else:
1609
            conflicting_path = fp.get_path(conflict[3])
1610
            conflicting_id = tt.final_file_id(conflict[3])
1534.10.19 by Aaron Bentley
Stanza conversion, cooking
1611
            yield Conflict.factory(c_type, action=action, path=modified_path,
1612
                                   file_id=modified_id, 
1613
                                   conflict_path=conflicting_path,
1614
                                   conflict_file_id=conflicting_id)