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