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