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