/brz/remove-bazaar

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