~bzr-pqm/bzr/bzr.dev

1534.7.106 by Aaron Bentley
Cleaned up imports, added copyright statements
1
# Copyright (C) 2006 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
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
21
from bzrlib import bzrdir, errors
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
22
from bzrlib.errors import (DuplicateKey, MalformedTransform, NoSuchFile,
1534.7.162 by Aaron Bentley
Handle failures creating/deleting the Limbo directory
23
                           ReusingTransform, NotVersionedError, CantMoveRoot,
1731.1.33 by Aaron Bentley
Revert no-special-root changes
24
                           ExistingLimbo, ImmortalLimbo, NoFinalPath)
1534.7.106 by Aaron Bentley
Cleaned up imports, added copyright statements
25
from bzrlib.inventory import InventoryEntry
1558.12.9 by Aaron Bentley
Handle resolving conflicts with directories properly
26
from bzrlib.osutils import (file_kind, supports_executable, pathjoin, lexists,
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
27
                            delete_any)
1551.2.34 by Aaron Bentley
Refactored the revert phases
28
from bzrlib.progress import DummyProgress, ProgressPhase
1534.7.173 by Aaron Bentley
Added conflict warnings to revert
29
from bzrlib.trace import mutter, warning
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
30
from bzrlib import tree
1551.2.31 by Aaron Bentley
Got merge and revert using nested pbs
31
import bzrlib.ui 
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
32
import bzrlib.urlutils as urlutils
1534.7.31 by Aaron Bentley
Changed tree root parent to ROOT_PARENT
33
1534.7.167 by Aaron Bentley
PEP8 and comment cleanups
34
1534.7.31 by Aaron Bentley
Changed tree root parent to ROOT_PARENT
35
ROOT_PARENT = "root-parent"
36
1534.7.167 by Aaron Bentley
PEP8 and comment cleanups
37
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
38
def unique_add(map, key, value):
39
    if key in map:
1534.7.5 by Aaron Bentley
Got unique_add under test
40
        raise DuplicateKey(key=key)
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
41
    map[key] = value
42
1534.7.167 by Aaron Bentley
PEP8 and comment cleanups
43
1534.7.191 by Aaron Bentley
Got transform.apply to list modified paths
44
class _TransformResults(object):
45
    def __init__(self, modified_paths):
46
        object.__init__(self)
47
        self.modified_paths = modified_paths
48
49
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
50
class TreeTransform(object):
1534.7.179 by Aaron Bentley
Added Transform docs
51
    """Represent a tree transformation.
52
    
53
    This object is designed to support incremental generation of the transform,
54
    in any order.  
55
    
56
    It is easy to produce malformed transforms, but they are generally
57
    harmless.  Attempting to apply a malformed transform will cause an
58
    exception to be raised before any modifications are made to the tree.  
59
60
    Many kinds of malformed transforms can be corrected with the 
61
    resolve_conflicts function.  The remaining ones indicate programming error,
62
    such as trying to create a file with no path.
63
64
    Two sets of file creation methods are supplied.  Convenience methods are:
65
     * new_file
66
     * new_directory
67
     * new_symlink
68
69
    These are composed of the low-level methods:
70
     * create_path
71
     * create_file or create_directory or create_symlink
72
     * version_file
73
     * set_executability
74
    """
1534.9.1 by Aaron Bentley
Added progress bars to merge
75
    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
76
        """Note: a tree_write lock is taken on the tree.
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
77
        
78
        Use TreeTransform.finalize() to release the lock
79
        """
80
        object.__init__(self)
81
        self._tree = tree
1997.1.3 by Robert Collins
All WorkingTree methods which write to the tree, but not to the branch
82
        self._tree.lock_tree_write()
1534.7.162 by Aaron Bentley
Handle failures creating/deleting the Limbo directory
83
        try:
84
            control_files = self._tree._control_files
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
85
            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
86
                control_files.controlfilename('limbo'))
1534.7.162 by Aaron Bentley
Handle failures creating/deleting the Limbo directory
87
            try:
88
                os.mkdir(self._limbodir)
89
            except OSError, e:
90
                if e.errno == errno.EEXIST:
91
                    raise ExistingLimbo(self._limbodir)
92
        except: 
93
            self._tree.unlock()
94
            raise
95
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
96
        self._id_number = 0
97
        self._new_name = {}
98
        self._new_parent = {}
1534.7.4 by Aaron Bentley
Unified all file types as 'contents'
99
        self._new_contents = {}
1534.7.34 by Aaron Bentley
Proper conflicts for removals
100
        self._removed_contents = set()
1534.7.25 by Aaron Bentley
Added set_executability
101
        self._new_executability = {}
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
102
        self._new_id = {}
1534.7.143 by Aaron Bentley
Prevented get_trans_id from automatically versioning file ids
103
        self._non_present_ids = {}
1534.7.75 by Aaron Bentley
Added reverse-lookup for versioned files and get_trans_id
104
        self._r_new_id = {}
1534.7.39 by Aaron Bentley
Ensured that files can be unversioned (de-versioned?)
105
        self._removed_id = set()
1534.7.7 by Aaron Bentley
Added support for all-file path ids
106
        self._tree_path_ids = {}
1534.7.8 by Aaron Bentley
Added TreeTransform.final_kind
107
        self._tree_id_paths = {}
1534.10.31 by Aaron Bentley
Add caching to speed canonical_path
108
        self._realpaths = {}
109
        # Cache of realpath results, to speed up canonical_path
110
        self._relpaths = {}
111
        # Cache of relpath results, to speed up canonical_path
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
112
        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
113
        self.__done = False
1534.9.1 by Aaron Bentley
Added progress bars to merge
114
        self._pb = pb
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
115
1534.7.132 by Aaron Bentley
Got cooked conflicts working
116
    def __get_root(self):
117
        return self._new_root
118
119
    root = property(__get_root)
120
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
121
    def finalize(self):
1534.7.157 by Aaron Bentley
Added more docs
122
        """Release the working tree lock, if held, clean up limbo dir."""
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
123
        if self._tree is None:
124
            return
1534.7.162 by Aaron Bentley
Handle failures creating/deleting the Limbo directory
125
        try:
126
            for trans_id, kind in self._new_contents.iteritems():
127
                path = self._limbo_name(trans_id)
128
                if kind == "directory":
129
                    os.rmdir(path)
130
                else:
131
                    os.unlink(path)
132
            try:
133
                os.rmdir(self._limbodir)
134
            except OSError:
135
                # We don't especially care *why* the dir is immortal.
136
                raise ImmortalLimbo(self._limbodir)
137
        finally:
138
            self._tree.unlock()
139
            self._tree = None
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
140
141
    def _assign_id(self):
142
        """Produce a new tranform id"""
143
        new_id = "new-%s" % self._id_number
144
        self._id_number +=1
145
        return new_id
146
147
    def create_path(self, name, parent):
148
        """Assign a transaction id to a new path"""
149
        trans_id = self._assign_id()
150
        unique_add(self._new_name, trans_id, name)
151
        unique_add(self._new_parent, trans_id, parent)
152
        return trans_id
153
1534.7.6 by Aaron Bentley
Added conflict handling
154
    def adjust_path(self, name, parent, trans_id):
1534.7.21 by Aaron Bentley
Updated docstrings
155
        """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
156
        if trans_id == self._new_root:
157
            raise CantMoveRoot
1534.7.6 by Aaron Bentley
Added conflict handling
158
        self._new_name[trans_id] = name
159
        self._new_parent[trans_id] = parent
160
1534.7.68 by Aaron Bentley
Got semi-reasonable root directory renaming working
161
    def adjust_root_path(self, name, parent):
162
        """Emulate moving the root by moving all children, instead.
163
        
164
        We do this by undoing the association of root's transaction id with the
165
        current tree.  This allows us to create a new directory with that
1534.7.69 by Aaron Bentley
Got real root moves working
166
        transaction id.  We unversion the root directory and version the 
167
        physically new directory, and hope someone versions the tree root
168
        later.
1534.7.68 by Aaron Bentley
Got semi-reasonable root directory renaming working
169
        """
170
        old_root = self._new_root
171
        old_root_file_id = self.final_file_id(old_root)
172
        # force moving all children of root
173
        for child_id in self.iter_tree_children(old_root):
174
            if child_id != parent:
175
                self.adjust_path(self.final_name(child_id), 
176
                                 self.final_parent(child_id), child_id)
1534.7.69 by Aaron Bentley
Got real root moves working
177
            file_id = self.final_file_id(child_id)
178
            if file_id is not None:
179
                self.unversion_file(child_id)
180
            self.version_file(file_id, child_id)
1534.7.68 by Aaron Bentley
Got semi-reasonable root directory renaming working
181
        
182
        # the physical root needs a new transaction id
183
        self._tree_path_ids.pop("")
184
        self._tree_id_paths.pop(old_root)
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
185
        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
186
        if parent == old_root:
187
            parent = self._new_root
188
        self.adjust_path(name, parent, old_root)
189
        self.create_directory(old_root)
1534.7.69 by Aaron Bentley
Got real root moves working
190
        self.version_file(old_root_file_id, old_root)
191
        self.unversion_file(self._new_root)
1534.7.68 by Aaron Bentley
Got semi-reasonable root directory renaming working
192
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
193
    def trans_id_tree_file_id(self, inventory_id):
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
194
        """Determine the transaction id of a working tree file.
195
        
196
        This reflects only files that already exist, not ones that will be
197
        added by transactions.
198
        """
1534.7.148 by Aaron Bentley
Handled the remaining file versioning case
199
        path = self._tree.inventory.id2path(inventory_id)
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
200
        return self.trans_id_tree_path(path)
1534.7.7 by Aaron Bentley
Added support for all-file path ids
201
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
202
    def trans_id_file_id(self, file_id):
1534.7.156 by Aaron Bentley
PEP8 fixes
203
        """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
204
        A new id is only created for file_ids that were never present.  If
205
        a transaction has been unversioned, it is deliberately still returned.
206
        (this will likely lead to an unversioned parent conflict.)
207
        """
208
        if file_id in self._r_new_id and self._r_new_id[file_id] is not None:
209
            return self._r_new_id[file_id]
210
        elif file_id in self._tree.inventory:
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
211
            return self.trans_id_tree_file_id(file_id)
1534.7.143 by Aaron Bentley
Prevented get_trans_id from automatically versioning file ids
212
        elif file_id in self._non_present_ids:
213
            return self._non_present_ids[file_id]
1534.7.75 by Aaron Bentley
Added reverse-lookup for versioned files and get_trans_id
214
        else:
215
            trans_id = self._assign_id()
1534.7.143 by Aaron Bentley
Prevented get_trans_id from automatically versioning file ids
216
            self._non_present_ids[file_id] = trans_id
1534.7.75 by Aaron Bentley
Added reverse-lookup for versioned files and get_trans_id
217
            return trans_id
218
1534.7.12 by Aaron Bentley
Added canonical_path function
219
    def canonical_path(self, path):
220
        """Get the canonical tree-relative path"""
221
        # don't follow final symlinks
1534.10.31 by Aaron Bentley
Add caching to speed canonical_path
222
        abs = self._tree.abspath(path)
223
        if abs in self._relpaths:
224
            return self._relpaths[abs]
225
        dirname, basename = os.path.split(abs)
226
        if dirname not in self._realpaths:
227
            self._realpaths[dirname] = os.path.realpath(dirname)
228
        dirname = self._realpaths[dirname]
229
        abs = pathjoin(dirname, basename)
230
        if dirname in self._relpaths:
231
            relpath = pathjoin(self._relpaths[dirname], basename)
1534.10.32 by Aaron Bentley
Test and fix case where name has trailing slash
232
            relpath = relpath.rstrip('/\\')
1534.10.31 by Aaron Bentley
Add caching to speed canonical_path
233
        else:
234
            relpath = self._tree.relpath(abs)
235
        self._relpaths[abs] = relpath
236
        return relpath
1534.7.12 by Aaron Bentley
Added canonical_path function
237
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
238
    def trans_id_tree_path(self, path):
1534.7.7 by Aaron Bentley
Added support for all-file path ids
239
        """Determine (and maybe set) the transaction ID for a tree path."""
1534.7.12 by Aaron Bentley
Added canonical_path function
240
        path = self.canonical_path(path)
1534.7.7 by Aaron Bentley
Added support for all-file path ids
241
        if path not in self._tree_path_ids:
242
            self._tree_path_ids[path] = self._assign_id()
1534.7.8 by Aaron Bentley
Added TreeTransform.final_kind
243
            self._tree_id_paths[self._tree_path_ids[path]] = path
1534.7.7 by Aaron Bentley
Added support for all-file path ids
244
        return self._tree_path_ids[path]
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
245
1534.7.16 by Aaron Bentley
Added get_tree_parent
246
    def get_tree_parent(self, trans_id):
1534.7.31 by Aaron Bentley
Changed tree root parent to ROOT_PARENT
247
        """Determine id of the parent in the tree."""
1534.7.16 by Aaron Bentley
Added get_tree_parent
248
        path = self._tree_id_paths[trans_id]
249
        if path == "":
1534.7.31 by Aaron Bentley
Changed tree root parent to ROOT_PARENT
250
            return ROOT_PARENT
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
251
        return self.trans_id_tree_path(os.path.dirname(path))
1534.7.16 by Aaron Bentley
Added get_tree_parent
252
1534.7.117 by Aaron Bentley
Simplified permission handling of existing files in transform.
253
    def create_file(self, contents, trans_id, mode_id=None):
1534.7.21 by Aaron Bentley
Updated docstrings
254
        """Schedule creation of a new file.
255
256
        See also new_file.
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
257
        
258
        Contents is an iterator of strings, all of which will be written
1534.7.21 by Aaron Bentley
Updated docstrings
259
        to the target destination.
1534.7.117 by Aaron Bentley
Simplified permission handling of existing files in transform.
260
261
        New file takes the permissions of any existing file with that id,
262
        unless mode_id is specified.
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
263
        """
1711.7.22 by John Arbash Meinel
transform: cleanup the temporary file even if unique_add fails.
264
        name = self._limbo_name(trans_id)
265
        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
266
        try:
1711.7.22 by John Arbash Meinel
transform: cleanup the temporary file even if unique_add fails.
267
            try:
268
                unique_add(self._new_contents, trans_id, 'file')
269
            except:
270
                # Clean up the file, it never got registered so
271
                # TreeTransform.finalize() won't clean it up.
272
                f.close()
273
                os.unlink(name)
274
                raise
275
2247.1.2 by John Arbash Meinel
Switch from for line in foo: f.write(line) to f.writelines(foo)
276
            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
277
        finally:
278
            f.close()
1534.7.117 by Aaron Bentley
Simplified permission handling of existing files in transform.
279
        self._set_mode(trans_id, mode_id, S_ISREG)
280
281
    def _set_mode(self, trans_id, mode_id, typefunc):
1534.7.157 by Aaron Bentley
Added more docs
282
        """Set the mode of new file contents.
283
        The mode_id is the existing file to get the mode from (often the same
284
        as trans_id).  The operation is only performed if there's a mode match
285
        according to typefunc.
286
        """
1534.7.117 by Aaron Bentley
Simplified permission handling of existing files in transform.
287
        if mode_id is None:
288
            mode_id = trans_id
289
        try:
290
            old_path = self._tree_id_paths[mode_id]
291
        except KeyError:
292
            return
293
        try:
2027.1.1 by John Arbash Meinel
Fix bug #56549, and write a direct test that the right path is being statted
294
            mode = os.stat(self._tree.abspath(old_path)).st_mode
1534.7.117 by Aaron Bentley
Simplified permission handling of existing files in transform.
295
        except OSError, e:
296
            if e.errno == errno.ENOENT:
297
                return
298
            else:
299
                raise
300
        if typefunc(mode):
301
            os.chmod(self._limbo_name(trans_id), mode)
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
302
1534.7.20 by Aaron Bentley
Added directory handling
303
    def create_directory(self, trans_id):
1534.7.21 by Aaron Bentley
Updated docstrings
304
        """Schedule creation of a new directory.
305
        
306
        See also new_directory.
307
        """
1534.7.73 by Aaron Bentley
Changed model again. Now iterator is used immediately.
308
        os.mkdir(self._limbo_name(trans_id))
309
        unique_add(self._new_contents, trans_id, 'directory')
1534.7.20 by Aaron Bentley
Added directory handling
310
1534.7.22 by Aaron Bentley
Added symlink support
311
    def create_symlink(self, target, trans_id):
312
        """Schedule creation of a new symbolic link.
313
314
        target is a bytestring.
315
        See also new_symlink.
316
        """
1534.7.73 by Aaron Bentley
Changed model again. Now iterator is used immediately.
317
        os.symlink(target, self._limbo_name(trans_id))
318
        unique_add(self._new_contents, trans_id, 'symlink')
1534.7.22 by Aaron Bentley
Added symlink support
319
1534.7.129 by Aaron Bentley
Converted test cases to Tree Transform
320
    def cancel_creation(self, trans_id):
1534.7.157 by Aaron Bentley
Added more docs
321
        """Cancel the creation of new file contents."""
1534.7.129 by Aaron Bentley
Converted test cases to Tree Transform
322
        del self._new_contents[trans_id]
1558.12.9 by Aaron Bentley
Handle resolving conflicts with directories properly
323
        delete_any(self._limbo_name(trans_id))
1534.7.129 by Aaron Bentley
Converted test cases to Tree Transform
324
1534.7.34 by Aaron Bentley
Proper conflicts for removals
325
    def delete_contents(self, trans_id):
326
        """Schedule the contents of a path entry for deletion"""
1534.7.130 by Aaron Bentley
More conflict handling, test porting
327
        self.tree_kind(trans_id)
1534.7.34 by Aaron Bentley
Proper conflicts for removals
328
        self._removed_contents.add(trans_id)
329
1534.7.61 by Aaron Bentley
Handled parent loops, missing parents, unversioned parents
330
    def cancel_deletion(self, trans_id):
331
        """Cancel a scheduled deletion"""
332
        self._removed_contents.remove(trans_id)
333
1534.7.39 by Aaron Bentley
Ensured that files can be unversioned (de-versioned?)
334
    def unversion_file(self, trans_id):
335
        """Schedule a path entry to become unversioned"""
336
        self._removed_id.add(trans_id)
337
338
    def delete_versioned(self, trans_id):
339
        """Delete and unversion a versioned file"""
340
        self.delete_contents(trans_id)
341
        self.unversion_file(trans_id)
342
1534.7.25 by Aaron Bentley
Added set_executability
343
    def set_executability(self, executability, trans_id):
1534.7.167 by Aaron Bentley
PEP8 and comment cleanups
344
        """Schedule setting of the 'execute' bit
345
        To unschedule, set to None
346
        """
1534.7.26 by Aaron Bentley
Added conflicts for setting executability on unversioned/non-file entries
347
        if executability is None:
348
            del self._new_executability[trans_id]
349
        else:
350
            unique_add(self._new_executability, trans_id, executability)
1534.7.25 by Aaron Bentley
Added set_executability
351
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
352
    def version_file(self, file_id, trans_id):
1534.7.21 by Aaron Bentley
Updated docstrings
353
        """Schedule a file to become versioned."""
1534.7.148 by Aaron Bentley
Handled the remaining file versioning case
354
        assert file_id is not None
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
355
        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
356
        unique_add(self._r_new_id, file_id, trans_id)
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
357
1534.7.105 by Aaron Bentley
Got merge with rename working
358
    def cancel_versioning(self, trans_id):
359
        """Undo a previous versioning of a file"""
360
        file_id = self._new_id[trans_id]
361
        del self._new_id[trans_id]
362
        del self._r_new_id[file_id]
363
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
364
    def new_paths(self):
1534.7.21 by Aaron Bentley
Updated docstrings
365
        """Determine the paths of all new and changed files"""
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
366
        new_ids = set()
1534.7.132 by Aaron Bentley
Got cooked conflicts working
367
        fp = FinalPaths(self)
1534.7.4 by Aaron Bentley
Unified all file types as 'contents'
368
        for id_set in (self._new_name, self._new_parent, self._new_contents,
1534.7.25 by Aaron Bentley
Added set_executability
369
                       self._new_id, self._new_executability):
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
370
            new_ids.update(id_set)
371
        new_paths = [(fp.get_path(t), t) for t in new_ids]
372
        new_paths.sort()
373
        return new_paths
1534.7.6 by Aaron Bentley
Added conflict handling
374
1534.7.34 by Aaron Bentley
Proper conflicts for removals
375
    def tree_kind(self, trans_id):
1534.7.40 by Aaron Bentley
Updated docs
376
        """Determine the file kind in the working tree.
377
378
        Raises NoSuchFile if the file does not exist
379
        """
1534.7.34 by Aaron Bentley
Proper conflicts for removals
380
        path = self._tree_id_paths.get(trans_id)
381
        if path is None:
382
            raise NoSuchFile(None)
383
        try:
384
            return file_kind(self._tree.abspath(path))
385
        except OSError, e:
386
            if e.errno != errno.ENOENT:
387
                raise
388
            else:
389
                raise NoSuchFile(path)
390
1534.7.8 by Aaron Bentley
Added TreeTransform.final_kind
391
    def final_kind(self, trans_id):
1534.7.156 by Aaron Bentley
PEP8 fixes
392
        """Determine the final file kind, after any changes applied.
1534.7.8 by Aaron Bentley
Added TreeTransform.final_kind
393
        
394
        Raises NoSuchFile if the file does not exist/has no contents.
395
        (It is conceivable that a path would be created without the
396
        corresponding contents insertion command)
397
        """
398
        if trans_id in self._new_contents:
1534.7.73 by Aaron Bentley
Changed model again. Now iterator is used immediately.
399
            return self._new_contents[trans_id]
1534.7.34 by Aaron Bentley
Proper conflicts for removals
400
        elif trans_id in self._removed_contents:
401
            raise NoSuchFile(None)
1534.7.8 by Aaron Bentley
Added TreeTransform.final_kind
402
        else:
1534.7.34 by Aaron Bentley
Proper conflicts for removals
403
            return self.tree_kind(trans_id)
1534.7.8 by Aaron Bentley
Added TreeTransform.final_kind
404
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
405
    def tree_file_id(self, trans_id):
1534.7.41 by Aaron Bentley
Got inventory ID movement working
406
        """Determine the file id associated with the trans_id in the tree"""
407
        try:
408
            path = self._tree_id_paths[trans_id]
409
        except KeyError:
410
            # the file is a new, unversioned file, or invalid trans_id
411
            return None
412
        # the file is old; the old id is still valid
1534.7.68 by Aaron Bentley
Got semi-reasonable root directory renaming working
413
        if self._new_root == trans_id:
414
            return self._tree.inventory.root.file_id
1534.7.148 by Aaron Bentley
Handled the remaining file versioning case
415
        return self._tree.inventory.path2id(path)
1534.7.41 by Aaron Bentley
Got inventory ID movement working
416
1534.7.13 by Aaron Bentley
Implemented final_file_id
417
    def final_file_id(self, trans_id):
1534.7.156 by Aaron Bentley
PEP8 fixes
418
        """Determine the file id after any changes are applied, or None.
1534.7.21 by Aaron Bentley
Updated docstrings
419
        
420
        None indicates that the file will not be versioned after changes are
421
        applied.
422
        """
1534.7.13 by Aaron Bentley
Implemented final_file_id
423
        try:
424
            # there is a new id for this file
1534.7.148 by Aaron Bentley
Handled the remaining file versioning case
425
            assert self._new_id[trans_id] is not None
1534.7.13 by Aaron Bentley
Implemented final_file_id
426
            return self._new_id[trans_id]
427
        except KeyError:
1534.7.39 by Aaron Bentley
Ensured that files can be unversioned (de-versioned?)
428
            if trans_id in self._removed_id:
429
                return None
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
430
        return self.tree_file_id(trans_id)
1534.7.13 by Aaron Bentley
Implemented final_file_id
431
1534.7.148 by Aaron Bentley
Handled the remaining file versioning case
432
    def inactive_file_id(self, trans_id):
1534.7.157 by Aaron Bentley
Added more docs
433
        """Return the inactive file_id associated with a transaction id.
1534.7.148 by Aaron Bentley
Handled the remaining file versioning case
434
        That is, the one in the tree or in non_present_ids.
435
        The file_id may actually be active, too.
436
        """
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
437
        file_id = self.tree_file_id(trans_id)
1534.7.148 by Aaron Bentley
Handled the remaining file versioning case
438
        if file_id is not None:
439
            return file_id
440
        for key, value in self._non_present_ids.iteritems():
441
            if value == trans_id:
442
                return key
443
1534.7.17 by Aaron Bentley
Added final_parent function
444
    def final_parent(self, trans_id):
1534.7.156 by Aaron Bentley
PEP8 fixes
445
        """Determine the parent file_id, after any changes are applied.
1534.7.21 by Aaron Bentley
Updated docstrings
446
1534.7.31 by Aaron Bentley
Changed tree root parent to ROOT_PARENT
447
        ROOT_PARENT is returned for the tree root.
1534.7.21 by Aaron Bentley
Updated docstrings
448
        """
1534.7.17 by Aaron Bentley
Added final_parent function
449
        try:
450
            return self._new_parent[trans_id]
451
        except KeyError:
452
            return self.get_tree_parent(trans_id)
453
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
454
    def final_name(self, trans_id):
1534.7.40 by Aaron Bentley
Updated docs
455
        """Determine the final filename, after all changes are applied."""
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
456
        try:
457
            return self._new_name[trans_id]
458
        except KeyError:
1731.1.33 by Aaron Bentley
Revert no-special-root changes
459
            try:
460
                return os.path.basename(self._tree_id_paths[trans_id])
461
            except KeyError:
462
                raise NoFinalPath(trans_id, self)
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
463
1534.10.28 by Aaron Bentley
Use numbered backup files
464
    def by_parent(self):
1534.7.40 by Aaron Bentley
Updated docs
465
        """Return a map of parent: children for known parents.
466
        
467
        Only new paths and parents of tree files with assigned ids are used.
468
        """
1534.7.6 by Aaron Bentley
Added conflict handling
469
        by_parent = {}
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
470
        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.
471
        items.extend((t, self.final_parent(t)) for t in 
472
                      self._tree_id_paths.keys())
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
473
        for trans_id, parent_id in items:
1534.7.6 by Aaron Bentley
Added conflict handling
474
            if parent_id not in by_parent:
475
                by_parent[parent_id] = set()
476
            by_parent[parent_id].add(trans_id)
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
477
        return by_parent
1534.7.11 by Aaron Bentley
Refactored conflict handling
478
1534.7.57 by Aaron Bentley
Enhanced conflict resolution.
479
    def path_changed(self, trans_id):
1534.7.157 by Aaron Bentley
Added more docs
480
        """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)
481
        return (trans_id in self._new_name) or (trans_id in self._new_parent)
1534.7.57 by Aaron Bentley
Enhanced conflict resolution.
482
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
483
    def new_contents(self, trans_id):
484
        return (trans_id in self._new_contents)
485
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
486
    def find_conflicts(self):
1534.7.40 by Aaron Bentley
Updated docs
487
        """Find any violations of inventory or filesystem invariants"""
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
488
        if self.__done is True:
489
            raise ReusingTransform()
490
        conflicts = []
491
        # ensure all children of all existent parents are known
492
        # all children of non-existent parents are known, by definition.
493
        self._add_tree_children()
1534.10.28 by Aaron Bentley
Use numbered backup files
494
        by_parent = self.by_parent()
1534.7.15 by Aaron Bentley
Add conflict types related to versioning
495
        conflicts.extend(self._unversioned_parents(by_parent))
1534.7.19 by Aaron Bentley
Added tests for parent loops
496
        conflicts.extend(self._parent_loops())
1534.7.11 by Aaron Bentley
Refactored conflict handling
497
        conflicts.extend(self._duplicate_entries(by_parent))
1534.7.50 by Aaron Bentley
Detect duplicate inventory ids
498
        conflicts.extend(self._duplicate_ids())
1534.7.11 by Aaron Bentley
Refactored conflict handling
499
        conflicts.extend(self._parent_type_conflicts(by_parent))
1534.7.15 by Aaron Bentley
Add conflict types related to versioning
500
        conflicts.extend(self._improper_versioning())
1534.7.26 by Aaron Bentley
Added conflicts for setting executability on unversioned/non-file entries
501
        conflicts.extend(self._executability_conflicts())
1534.7.152 by Aaron Bentley
Fixed overwrites
502
        conflicts.extend(self._overwrite_conflicts())
1534.7.15 by Aaron Bentley
Add conflict types related to versioning
503
        return conflicts
504
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
505
    def _add_tree_children(self):
1534.7.156 by Aaron Bentley
PEP8 fixes
506
        """Add all the children of all active parents to the known paths.
1534.7.40 by Aaron Bentley
Updated docs
507
508
        Active parents are those which gain children, and those which are
509
        removed.  This is a necessary first step in detecting conflicts.
510
        """
1534.10.28 by Aaron Bentley
Use numbered backup files
511
        parents = self.by_parent().keys()
1534.7.34 by Aaron Bentley
Proper conflicts for removals
512
        parents.extend([t for t in self._removed_contents if 
513
                        self.tree_kind(t) == 'directory'])
1534.7.50 by Aaron Bentley
Detect duplicate inventory ids
514
        for trans_id in self._removed_id:
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
515
            file_id = self.tree_file_id(trans_id)
1731.1.2 by Aaron Bentley
Removed all remaining uses of root_directory
516
            if self._tree.inventory[file_id].kind == 'directory':
1534.7.50 by Aaron Bentley
Detect duplicate inventory ids
517
                parents.append(trans_id)
518
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
519
        for parent_id in parents:
1534.7.67 by Aaron Bentley
Refactored _add_tree_children
520
            # ensure that all children are registered with the transaction
521
            list(self.iter_tree_children(parent_id))
522
523
    def iter_tree_children(self, parent_id):
524
        """Iterate through the entry's tree children, if any"""
525
        try:
526
            path = self._tree_id_paths[parent_id]
527
        except KeyError:
528
            return
529
        try:
530
            children = os.listdir(self._tree.abspath(path))
531
        except OSError, e:
1534.7.71 by abentley
All tests pass under Windows
532
            if e.errno != errno.ENOENT and e.errno != errno.ESRCH:
1534.7.67 by Aaron Bentley
Refactored _add_tree_children
533
                raise
534
            return
535
            
536
        for child in children:
537
            childpath = joinpath(path, child)
1534.7.180 by Aaron Bentley
Merge from mainline
538
            if self._tree.is_control_filename(childpath):
1534.7.67 by Aaron Bentley
Refactored _add_tree_children
539
                continue
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
540
            yield self.trans_id_tree_path(childpath)
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
541
1534.10.28 by Aaron Bentley
Use numbered backup files
542
    def has_named_child(self, by_parent, parent_id, name):
543
        try:
544
            children = by_parent[parent_id]
545
        except KeyError:
546
            children = []
547
        for child in children:
548
            if self.final_name(child) == name:
549
                return True
550
        try:
551
            path = self._tree_id_paths[parent_id]
552
        except KeyError:
553
            return False
554
        childpath = joinpath(path, name)
555
        child_id = self._tree_path_ids.get(childpath)
556
        if child_id is None:
557
            return lexists(self._tree.abspath(childpath))
558
        else:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
559
            if self.final_parent(child_id) != parent_id:
1534.10.28 by Aaron Bentley
Use numbered backup files
560
                return False
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
561
            if child_id in self._removed_contents:
1534.10.28 by Aaron Bentley
Use numbered backup files
562
                # XXX What about dangling file-ids?
563
                return False
564
            else:
565
                return True
566
1534.7.19 by Aaron Bentley
Added tests for parent loops
567
    def _parent_loops(self):
568
        """No entry should be its own ancestor"""
569
        conflicts = []
570
        for trans_id in self._new_parent:
571
            seen = set()
572
            parent_id = trans_id
1534.7.31 by Aaron Bentley
Changed tree root parent to ROOT_PARENT
573
            while parent_id is not ROOT_PARENT:
1534.7.19 by Aaron Bentley
Added tests for parent loops
574
                seen.add(parent_id)
1731.1.33 by Aaron Bentley
Revert no-special-root changes
575
                try:
576
                    parent_id = self.final_parent(parent_id)
577
                except KeyError:
578
                    break
1534.7.19 by Aaron Bentley
Added tests for parent loops
579
                if parent_id == trans_id:
580
                    conflicts.append(('parent loop', trans_id))
581
                if parent_id in seen:
582
                    break
583
        return conflicts
584
1534.7.15 by Aaron Bentley
Add conflict types related to versioning
585
    def _unversioned_parents(self, by_parent):
586
        """If parent directories are versioned, children must be versioned."""
587
        conflicts = []
588
        for parent_id, children in by_parent.iteritems():
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
589
            if parent_id is ROOT_PARENT:
590
                continue
1534.7.15 by Aaron Bentley
Add conflict types related to versioning
591
            if self.final_file_id(parent_id) is not None:
592
                continue
593
            for child_id in children:
594
                if self.final_file_id(child_id) is not None:
595
                    conflicts.append(('unversioned parent', parent_id))
596
                    break;
597
        return conflicts
598
599
    def _improper_versioning(self):
1534.7.156 by Aaron Bentley
PEP8 fixes
600
        """Cannot version a file with no contents, or a bad type.
1534.7.15 by Aaron Bentley
Add conflict types related to versioning
601
        
602
        However, existing entries with no contents are okay.
603
        """
604
        conflicts = []
605
        for trans_id in self._new_id.iterkeys():
606
            try:
607
                kind = self.final_kind(trans_id)
608
            except NoSuchFile:
609
                conflicts.append(('versioning no contents', trans_id))
610
                continue
611
            if not InventoryEntry.versionable_kind(kind):
1534.7.20 by Aaron Bentley
Added directory handling
612
                conflicts.append(('versioning bad kind', trans_id, kind))
1534.7.11 by Aaron Bentley
Refactored conflict handling
613
        return conflicts
614
1534.7.26 by Aaron Bentley
Added conflicts for setting executability on unversioned/non-file entries
615
    def _executability_conflicts(self):
1534.7.40 by Aaron Bentley
Updated docs
616
        """Check for bad executability changes.
617
        
618
        Only versioned files may have their executability set, because
619
        1. only versioned entries can have executability under windows
620
        2. only files can be executable.  (The execute bit on a directory
621
           does not indicate searchability)
622
        """
1534.7.26 by Aaron Bentley
Added conflicts for setting executability on unversioned/non-file entries
623
        conflicts = []
624
        for trans_id in self._new_executability:
625
            if self.final_file_id(trans_id) is None:
626
                conflicts.append(('unversioned executability', trans_id))
1534.7.34 by Aaron Bentley
Proper conflicts for removals
627
            else:
628
                try:
629
                    non_file = self.final_kind(trans_id) != "file"
630
                except NoSuchFile:
631
                    non_file = True
632
                if non_file is True:
633
                    conflicts.append(('non-file executability', trans_id))
1534.7.26 by Aaron Bentley
Added conflicts for setting executability on unversioned/non-file entries
634
        return conflicts
635
1534.7.152 by Aaron Bentley
Fixed overwrites
636
    def _overwrite_conflicts(self):
637
        """Check for overwrites (not permitted on Win32)"""
638
        conflicts = []
639
        for trans_id in self._new_contents:
640
            try:
641
                self.tree_kind(trans_id)
642
            except NoSuchFile:
643
                continue
644
            if trans_id not in self._removed_contents:
645
                conflicts.append(('overwrite', trans_id,
646
                                 self.final_name(trans_id)))
647
        return conflicts
648
1534.7.11 by Aaron Bentley
Refactored conflict handling
649
    def _duplicate_entries(self, by_parent):
650
        """No directory may have two entries with the same name."""
651
        conflicts = []
1534.7.6 by Aaron Bentley
Added conflict handling
652
        for children in by_parent.itervalues():
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
653
            name_ids = [(self.final_name(t), t) for t in children]
1534.7.6 by Aaron Bentley
Added conflict handling
654
            name_ids.sort()
655
            last_name = None
656
            last_trans_id = None
657
            for name, trans_id in name_ids:
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
658
                try:
659
                    kind = self.final_kind(trans_id)
660
                except NoSuchFile:
661
                    kind = None
662
                file_id = self.final_file_id(trans_id)
663
                if kind is None and file_id is None:
664
                    continue
1534.7.6 by Aaron Bentley
Added conflict handling
665
                if name == last_name:
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
666
                    conflicts.append(('duplicate', last_trans_id, trans_id,
667
                    name))
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
668
                last_name = name
669
                last_trans_id = trans_id
1534.7.11 by Aaron Bentley
Refactored conflict handling
670
        return conflicts
671
1534.7.50 by Aaron Bentley
Detect duplicate inventory ids
672
    def _duplicate_ids(self):
673
        """Each inventory id may only be used once"""
674
        conflicts = []
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
675
        removed_tree_ids = set((self.tree_file_id(trans_id) for trans_id in
1534.7.50 by Aaron Bentley
Detect duplicate inventory ids
676
                                self._removed_id))
677
        active_tree_ids = set((f for f in self._tree.inventory if
678
                               f not in removed_tree_ids))
679
        for trans_id, file_id in self._new_id.iteritems():
680
            if file_id in active_tree_ids:
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
681
                old_trans_id = self.trans_id_tree_file_id(file_id)
1534.7.50 by Aaron Bentley
Detect duplicate inventory ids
682
                conflicts.append(('duplicate id', old_trans_id, trans_id))
683
        return conflicts
684
1534.7.11 by Aaron Bentley
Refactored conflict handling
685
    def _parent_type_conflicts(self, by_parent):
686
        """parents must have directory 'contents'."""
687
        conflicts = []
1534.7.37 by Aaron Bentley
Allowed removed dirs to have content-free children.
688
        for parent_id, children in by_parent.iteritems():
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
689
            if parent_id is ROOT_PARENT:
690
                continue
1534.7.37 by Aaron Bentley
Allowed removed dirs to have content-free children.
691
            if not self._any_contents(children):
692
                continue
693
            for child in children:
694
                try:
695
                    self.final_kind(child)
696
                except NoSuchFile:
697
                    continue
1534.7.10 by Aaron Bentley
Implemented missing parent and non-directory parent conflicts
698
            try:
699
                kind = self.final_kind(parent_id)
700
            except NoSuchFile:
701
                kind = None
702
            if kind is None:
703
                conflicts.append(('missing parent', parent_id))
704
            elif kind != "directory":
705
                conflicts.append(('non-directory parent', parent_id))
1534.7.6 by Aaron Bentley
Added conflict handling
706
        return conflicts
1534.7.37 by Aaron Bentley
Allowed removed dirs to have content-free children.
707
708
    def _any_contents(self, trans_ids):
709
        """Return true if any of the trans_ids, will have contents."""
710
        for trans_id in trans_ids:
711
            try:
712
                kind = self.final_kind(trans_id)
713
            except NoSuchFile:
714
                continue
715
            return True
716
        return False
1534.7.6 by Aaron Bentley
Added conflict handling
717
            
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
718
    def apply(self):
1534.7.156 by Aaron Bentley
PEP8 fixes
719
        """Apply all changes to the inventory and filesystem.
1534.7.21 by Aaron Bentley
Updated docstrings
720
        
721
        If filesystem or inventory conflicts are present, MalformedTransform
722
        will be thrown.
723
        """
1534.7.49 by Aaron Bentley
Printed conflicts in MalformedTransform
724
        conflicts = self.find_conflicts()
725
        if len(conflicts) != 0:
726
            raise MalformedTransform(conflicts=conflicts)
1534.7.41 by Aaron Bentley
Got inventory ID movement working
727
        limbo_inv = {}
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
728
        inv = self._tree.inventory
1551.2.31 by Aaron Bentley
Got merge and revert using nested pbs
729
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
730
        try:
731
            child_pb.update('Apply phase', 0, 2)
732
            self._apply_removals(inv, limbo_inv)
733
            child_pb.update('Apply phase', 1, 2)
734
            modified_paths = self._apply_insertions(inv, limbo_inv)
735
        finally:
736
            child_pb.finished()
1534.7.35 by Aaron Bentley
Got file renaming working
737
        self._tree._write_inventory(inv)
738
        self.__done = True
1534.7.59 by Aaron Bentley
Simplified tests
739
        self.finalize()
1534.7.191 by Aaron Bentley
Got transform.apply to list modified paths
740
        return _TransformResults(modified_paths)
1534.7.35 by Aaron Bentley
Got file renaming working
741
1534.7.72 by Aaron Bentley
Moved new content generation to pre-renames
742
    def _limbo_name(self, trans_id):
743
        """Generate the limbo name of a file"""
1534.7.166 by Aaron Bentley
Swapped os.path.join for pathjoin everywhere
744
        return pathjoin(self._limbodir, trans_id)
1534.7.72 by Aaron Bentley
Moved new content generation to pre-renames
745
1534.7.41 by Aaron Bentley
Got inventory ID movement working
746
    def _apply_removals(self, inv, limbo_inv):
1534.7.36 by Aaron Bentley
Added rename tests
747
        """Perform tree operations that remove directory/inventory names.
748
        
749
        That is, delete files that are to be deleted, and put any files that
750
        need renaming into limbo.  This must be done in strict child-to-parent
751
        order.
752
        """
1534.7.35 by Aaron Bentley
Got file renaming working
753
        tree_paths = list(self._tree_path_ids.iteritems())
754
        tree_paths.sort(reverse=True)
1551.2.31 by Aaron Bentley
Got merge and revert using nested pbs
755
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
756
        try:
757
            for num, data in enumerate(tree_paths):
758
                path, trans_id = data
759
                child_pb.update('removing file', num, len(tree_paths))
760
                full_path = self._tree.abspath(path)
761
                if trans_id in self._removed_contents:
1558.12.9 by Aaron Bentley
Handle resolving conflicts with directories properly
762
                    delete_any(full_path)
1551.2.31 by Aaron Bentley
Got merge and revert using nested pbs
763
                elif trans_id in self._new_name or trans_id in \
764
                    self._new_parent:
765
                    try:
766
                        os.rename(full_path, self._limbo_name(trans_id))
767
                    except OSError, e:
768
                        if e.errno != errno.ENOENT:
769
                            raise
770
                if trans_id in self._removed_id:
771
                    if trans_id == self._new_root:
772
                        file_id = self._tree.inventory.root.file_id
773
                    else:
774
                        file_id = self.tree_file_id(trans_id)
775
                    del inv[file_id]
776
                elif trans_id in self._new_name or trans_id in self._new_parent:
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
777
                    file_id = self.tree_file_id(trans_id)
1551.2.31 by Aaron Bentley
Got merge and revert using nested pbs
778
                    if file_id is not None:
779
                        limbo_inv[trans_id] = inv[file_id]
780
                        del inv[file_id]
781
        finally:
782
            child_pb.finished()
1534.7.34 by Aaron Bentley
Proper conflicts for removals
783
1534.7.41 by Aaron Bentley
Got inventory ID movement working
784
    def _apply_insertions(self, inv, limbo_inv):
1534.7.36 by Aaron Bentley
Added rename tests
785
        """Perform tree operations that insert directory/inventory names.
786
        
787
        That is, create any files that need to be created, and restore from
788
        limbo any files that needed renaming.  This must be done in strict
789
        parent-to-child order.
790
        """
1534.9.1 by Aaron Bentley
Added progress bars to merge
791
        new_paths = self.new_paths()
1534.7.191 by Aaron Bentley
Got transform.apply to list modified paths
792
        modified_paths = []
1551.2.31 by Aaron Bentley
Got merge and revert using nested pbs
793
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
794
        try:
795
            for num, (path, trans_id) in enumerate(new_paths):
796
                child_pb.update('adding file', num, len(new_paths))
1534.7.48 by Aaron Bentley
Ensured we can move/rename dangling inventory entries
797
                try:
1551.2.31 by Aaron Bentley
Got merge and revert using nested pbs
798
                    kind = self._new_contents[trans_id]
799
                except KeyError:
800
                    kind = contents = None
801
                if trans_id in self._new_contents or \
802
                    self.path_changed(trans_id):
803
                    full_path = self._tree.abspath(path)
804
                    try:
805
                        os.rename(self._limbo_name(trans_id), full_path)
806
                    except OSError, e:
807
                        # We may be renaming a dangling inventory id
808
                        if e.errno != errno.ENOENT:
809
                            raise
810
                    if trans_id in self._new_contents:
811
                        modified_paths.append(full_path)
812
                        del self._new_contents[trans_id]
813
814
                if trans_id in self._new_id:
815
                    if kind is None:
816
                        kind = file_kind(self._tree.abspath(path))
817
                    inv.add_path(path, kind, self._new_id[trans_id])
818
                elif trans_id in self._new_name or trans_id in\
819
                    self._new_parent:
820
                    entry = limbo_inv.get(trans_id)
821
                    if entry is not None:
822
                        entry.name = self.final_name(trans_id)
823
                        parent_path = os.path.dirname(path)
824
                        entry.parent_id = \
825
                            self._tree.inventory.path2id(parent_path)
826
                        inv.add(entry)
827
828
                # requires files and inventory entries to be in place
829
                if trans_id in self._new_executability:
830
                    self._set_executability(path, inv, trans_id)
831
        finally:
832
            child_pb.finished()
1534.7.191 by Aaron Bentley
Got transform.apply to list modified paths
833
        return modified_paths
1534.7.40 by Aaron Bentley
Updated docs
834
1534.7.25 by Aaron Bentley
Added set_executability
835
    def _set_executability(self, path, inv, trans_id):
1534.7.40 by Aaron Bentley
Updated docs
836
        """Set the executability of versioned files """
1534.7.25 by Aaron Bentley
Added set_executability
837
        file_id = inv.path2id(path)
838
        new_executability = self._new_executability[trans_id]
839
        inv[file_id].executable = new_executability
840
        if supports_executable():
841
            abspath = self._tree.abspath(path)
842
            current_mode = os.stat(abspath).st_mode
843
            if new_executability:
844
                umask = os.umask(0)
845
                os.umask(umask)
846
                to_mode = current_mode | (0100 & ~umask)
847
                # Enable x-bit for others only if they can read it.
848
                if current_mode & 0004:
849
                    to_mode |= 0001 & ~umask
850
                if current_mode & 0040:
851
                    to_mode |= 0010 & ~umask
852
            else:
853
                to_mode = current_mode & ~0111
854
            os.chmod(abspath, to_mode)
855
1534.7.23 by Aaron Bentley
Transform.new_entry -> Transform._new_entry
856
    def _new_entry(self, name, parent_id, file_id):
1534.7.21 by Aaron Bentley
Updated docstrings
857
        """Helper function to create a new filesystem entry."""
1534.7.2 by Aaron Bentley
Added convenience function
858
        trans_id = self.create_path(name, parent_id)
859
        if file_id is not None:
860
            self.version_file(file_id, trans_id)
861
        return trans_id
862
1534.7.27 by Aaron Bentley
Added execute bit to new_file method
863
    def new_file(self, name, parent_id, contents, file_id=None, 
864
                 executable=None):
1534.7.156 by Aaron Bentley
PEP8 fixes
865
        """Convenience method to create files.
1534.7.21 by Aaron Bentley
Updated docstrings
866
        
867
        name is the name of the file to create.
868
        parent_id is the transaction id of the parent directory of the file.
869
        contents is an iterator of bytestrings, which will be used to produce
870
        the file.
1740.2.4 by Aaron Bentley
Update transform tests and docs
871
        :param file_id: The inventory ID of the file, if it is to be versioned.
872
        :param executable: Only valid when a file_id has been supplied.
1534.7.21 by Aaron Bentley
Updated docstrings
873
        """
1534.7.23 by Aaron Bentley
Transform.new_entry -> Transform._new_entry
874
        trans_id = self._new_entry(name, parent_id, file_id)
1740.2.4 by Aaron Bentley
Update transform tests and docs
875
        # TODO: rather than scheduling a set_executable call,
876
        # have create_file create the file with the right mode.
1534.7.20 by Aaron Bentley
Added directory handling
877
        self.create_file(contents, trans_id)
1534.7.27 by Aaron Bentley
Added execute bit to new_file method
878
        if executable is not None:
879
            self.set_executability(executable, trans_id)
1534.7.20 by Aaron Bentley
Added directory handling
880
        return trans_id
881
882
    def new_directory(self, name, parent_id, file_id=None):
1534.7.156 by Aaron Bentley
PEP8 fixes
883
        """Convenience method to create directories.
1534.7.21 by Aaron Bentley
Updated docstrings
884
885
        name is the name of the directory to create.
886
        parent_id is the transaction id of the parent directory of the
887
        directory.
888
        file_id is the inventory ID of the directory, if it is to be versioned.
889
        """
1534.7.23 by Aaron Bentley
Transform.new_entry -> Transform._new_entry
890
        trans_id = self._new_entry(name, parent_id, file_id)
1534.7.20 by Aaron Bentley
Added directory handling
891
        self.create_directory(trans_id)
892
        return trans_id 
893
1534.7.22 by Aaron Bentley
Added symlink support
894
    def new_symlink(self, name, parent_id, target, file_id=None):
1534.7.156 by Aaron Bentley
PEP8 fixes
895
        """Convenience method to create symbolic link.
1534.7.22 by Aaron Bentley
Added symlink support
896
        
897
        name is the name of the symlink to create.
898
        parent_id is the transaction id of the parent directory of the symlink.
899
        target is a bytestring of the target of the symlink.
900
        file_id is the inventory ID of the file, if it is to be versioned.
901
        """
1534.7.23 by Aaron Bentley
Transform.new_entry -> Transform._new_entry
902
        trans_id = self._new_entry(name, parent_id, file_id)
1534.7.22 by Aaron Bentley
Added symlink support
903
        self.create_symlink(target, trans_id)
904
        return trans_id
905
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
906
def joinpath(parent, child):
1534.7.40 by Aaron Bentley
Updated docs
907
    """Join tree-relative paths, handling the tree root specially"""
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
908
    if parent is None or parent == "":
909
        return child
910
    else:
1534.7.166 by Aaron Bentley
Swapped os.path.join for pathjoin everywhere
911
        return pathjoin(parent, child)
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
912
1534.7.167 by Aaron Bentley
PEP8 and comment cleanups
913
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
914
class FinalPaths(object):
1759.2.2 by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron.
915
    """Make path calculation cheap by memoizing paths.
1534.7.21 by Aaron Bentley
Updated docstrings
916
917
    The underlying tree must not be manipulated between calls, or else
918
    the results will likely be incorrect.
919
    """
1534.7.132 by Aaron Bentley
Got cooked conflicts working
920
    def __init__(self, transform):
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
921
        object.__init__(self)
922
        self._known_paths = {}
1534.7.33 by Aaron Bentley
Fixed naming
923
        self.transform = transform
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
924
925
    def _determine_path(self, trans_id):
1534.7.132 by Aaron Bentley
Got cooked conflicts working
926
        if trans_id == self.transform.root:
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
927
            return ""
1534.7.33 by Aaron Bentley
Fixed naming
928
        name = self.transform.final_name(trans_id)
929
        parent_id = self.transform.final_parent(trans_id)
1534.7.132 by Aaron Bentley
Got cooked conflicts working
930
        if parent_id == self.transform.root:
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
931
            return name
932
        else:
1534.7.166 by Aaron Bentley
Swapped os.path.join for pathjoin everywhere
933
            return pathjoin(self.get_path(parent_id), name)
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
934
935
    def get_path(self, trans_id):
1534.7.157 by Aaron Bentley
Added more docs
936
        """Find the final path associated with a trans_id"""
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
937
        if trans_id not in self._known_paths:
938
            self._known_paths[trans_id] = self._determine_path(trans_id)
939
        return self._known_paths[trans_id]
1534.7.28 by Aaron Bentley
Nearly-working build_tree replacement
940
1534.7.30 by Aaron Bentley
Factored out topological id sorting
941
def topology_sorted_ids(tree):
1534.7.40 by Aaron Bentley
Updated docs
942
    """Determine the topological order of the ids in a tree"""
1534.7.30 by Aaron Bentley
Factored out topological id sorting
943
    file_ids = list(tree)
944
    file_ids.sort(key=tree.id2path)
945
    return file_ids
1534.7.28 by Aaron Bentley
Nearly-working build_tree replacement
946
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
947
1534.7.165 by Aaron Bentley
Switched to build_tree instead of revert
948
def build_tree(tree, wt):
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
949
    """Create working tree for a branch, using a TreeTransform.
950
    
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
951
    This function should be used on empty trees, having a tree root at most.
952
    (see merge and revert functionality for working with existing trees)
953
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
954
    Existing files are handled like so:
955
    
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
956
    - Existing bzrdirs take precedence over creating new items.  They are
957
      created as '%s.diverted' % name.
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
958
    - Otherwise, if the content on disk matches the content we are building,
959
      it is silently replaced.
960
    - Otherwise, conflict resolution will move the old file to 'oldname.moved'.
961
    """
2090.2.1 by Martin Pool
Fix some code which relies on assertions and breaks under python -O
962
    if len(wt.inventory) > 1:  # more than just a root
963
        raise errors.WorkingTreeAlreadyPopulated(base=wt.basedir)
1534.7.28 by Aaron Bentley
Nearly-working build_tree replacement
964
    file_trans_id = {}
1558.11.1 by Aaron Bentley
Progress indicator for tree builts
965
    top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
966
    pp = ProgressPhase("Build phase", 2, top_pb)
1731.1.33 by Aaron Bentley
Revert no-special-root changes
967
    if tree.inventory.root is not None:
968
        wt.set_root_id(tree.inventory.root.file_id)
1534.7.28 by Aaron Bentley
Nearly-working build_tree replacement
969
    tt = TreeTransform(wt)
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
970
    divert = set()
1534.7.28 by Aaron Bentley
Nearly-working build_tree replacement
971
    try:
1558.11.1 by Aaron Bentley
Progress indicator for tree builts
972
        pp.next_phase()
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
973
        file_trans_id[wt.get_root_id()] = \
974
            tt.trans_id_tree_file_id(wt.get_root_id())
1558.11.1 by Aaron Bentley
Progress indicator for tree builts
975
        pb = bzrlib.ui.ui_factory.nested_progress_bar()
976
        try:
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
977
            for num, (tree_path, entry) in \
978
                enumerate(tree.inventory.iter_entries_by_dir()):
979
                pb.update("Building tree", num, len(tree.inventory))
1558.11.1 by Aaron Bentley
Progress indicator for tree builts
980
                if entry.parent_id is None:
981
                    continue
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
982
                reparent = False
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
983
                file_id = entry.file_id
984
                target_path = wt.abspath(tree_path)
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
985
                try:
986
                    kind = file_kind(target_path)
987
                except NoSuchFile:
988
                    pass
989
                else:
990
                    if kind == "directory":
991
                        try:
992
                            bzrdir.BzrDir.open(target_path)
993
                        except errors.NotBranchError:
994
                            pass
995
                        else:
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
996
                            divert.add(file_id)
997
                    if (file_id not in divert and
998
                        _content_match(tree, entry, file_id, kind,
999
                        target_path)):
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1000
                        tt.delete_contents(tt.trans_id_tree_path(tree_path))
1001
                        if kind == 'directory':
1002
                            reparent = True
1558.11.1 by Aaron Bentley
Progress indicator for tree builts
1003
                if entry.parent_id not in file_trans_id:
1004
                    raise repr(entry.parent_id)
1005
                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
1006
                file_trans_id[file_id] = new_by_entry(tt, entry, parent_id,
1558.11.1 by Aaron Bentley
Progress indicator for tree builts
1007
                                                      tree)
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1008
                if reparent:
1009
                    new_trans_id = file_trans_id[file_id]
1010
                    old_parent = tt.trans_id_tree_path(tree_path)
1011
                    _reparent_children(tt, old_parent, new_trans_id)
1558.11.1 by Aaron Bentley
Progress indicator for tree builts
1012
        finally:
1013
            pb.finished()
1014
        pp.next_phase()
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
1015
        divert_trans = set(file_trans_id[f] for f in divert)
1016
        resolver = lambda t, c: resolve_checkout(t, c, divert_trans)
1017
        raw_conflicts = resolve_conflicts(tt, pass_func=resolver)
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1018
        conflicts = cook_conflicts(raw_conflicts, tt)
1019
        for conflict in conflicts:
1020
            warning(conflict)
1021
        try:
1022
            wt.add_conflicts(conflicts)
1023
        except errors.UnsupportedOperation:
1024
            pass
1534.7.47 by Aaron Bentley
Started work on 'revert'
1025
        tt.apply()
1026
    finally:
1027
        tt.finalize()
1558.11.1 by Aaron Bentley
Progress indicator for tree builts
1028
        top_pb.finished()
1534.7.47 by Aaron Bentley
Started work on 'revert'
1029
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1030
1031
def _reparent_children(tt, old_parent, new_parent):
1032
    for child in tt.iter_tree_children(old_parent):
1033
        tt.adjust_path(tt.final_name(child), new_parent, child)
1034
1035
1036
def _content_match(tree, entry, file_id, kind, target_path):
1037
    if entry.kind != kind:
1038
        return False
1039
    if entry.kind == "directory":
1040
        return True
1041
    if entry.kind == "file":
1042
        if tree.get_file(file_id).read() == file(target_path, 'rb').read():
1043
            return True
1044
    elif entry.kind == "symlink":
1045
        if tree.get_symlink_target(file_id) == os.readlink(target_path):
1046
            return True
1047
    return False
1048
1049
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
1050
def resolve_checkout(tt, conflicts, divert):
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1051
    new_conflicts = set()
1052
    for c_type, conflict in ((c[0], c) for c in conflicts):
1053
        # Anything but a 'duplicate' would indicate programmer error
1054
        assert c_type == 'duplicate', c_type
1055
        # 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
1056
        if tt.new_contents(conflict[1]):
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1057
            new_file = conflict[1]
1058
            old_file = conflict[2]
1059
        else:
1060
            new_file = conflict[2]
1061
            old_file = conflict[1]
1062
1063
        # We should only get here if the conflict wasn't completely
1064
        # resolved
1065
        final_parent = tt.final_parent(old_file)
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
1066
        if new_file in divert:
1067
            new_name = tt.final_name(old_file)+'.diverted'
1068
            tt.adjust_path(new_name, final_parent, new_file)
1069
            new_conflicts.add((c_type, 'Diverted to',
1070
                               new_file, old_file))
1071
        else:
1072
            new_name = tt.final_name(old_file)+'.moved'
1073
            tt.adjust_path(new_name, final_parent, old_file)
1074
            new_conflicts.add((c_type, 'Moved existing file to',
1075
                               old_file, new_file))
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1076
    return new_conflicts
1077
1078
1534.7.47 by Aaron Bentley
Started work on 'revert'
1079
def new_by_entry(tt, entry, parent_id, tree):
1534.7.157 by Aaron Bentley
Added more docs
1080
    """Create a new file according to its inventory entry"""
1534.7.47 by Aaron Bentley
Started work on 'revert'
1081
    name = entry.name
1082
    kind = entry.kind
1083
    if kind == 'file':
1534.7.79 by Aaron Bentley
Stopped calling get_file_lines on WorkingTree
1084
        contents = tree.get_file(entry.file_id).readlines()
1534.7.47 by Aaron Bentley
Started work on 'revert'
1085
        executable = tree.is_executable(entry.file_id)
1086
        return tt.new_file(name, parent_id, contents, entry.file_id, 
1087
                           executable)
1088
    elif kind == 'directory':
1534.7.54 by Aaron Bentley
Fixed thinko
1089
        return tt.new_directory(name, parent_id, entry.file_id)
1534.7.47 by Aaron Bentley
Started work on 'revert'
1090
    elif kind == 'symlink':
1534.7.183 by Aaron Bentley
Fixed build_tree with symlinks
1091
        target = tree.get_symlink_target(entry.file_id)
1092
        return tt.new_symlink(name, parent_id, target, entry.file_id)
1534.7.47 by Aaron Bentley
Started work on 'revert'
1093
1534.7.117 by Aaron Bentley
Simplified permission handling of existing files in transform.
1094
def create_by_entry(tt, entry, tree, trans_id, lines=None, mode_id=None):
1534.7.157 by Aaron Bentley
Added more docs
1095
    """Create new file contents according to an inventory entry."""
1534.7.47 by Aaron Bentley
Started work on 'revert'
1096
    if entry.kind == "file":
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
1097
        if lines is None:
1534.7.97 by Aaron Bentley
Ensured foo.BASE is a directory if there's a conflict
1098
            lines = tree.get_file(entry.file_id).readlines()
1534.7.117 by Aaron Bentley
Simplified permission handling of existing files in transform.
1099
        tt.create_file(lines, trans_id, mode_id=mode_id)
1534.7.47 by Aaron Bentley
Started work on 'revert'
1100
    elif entry.kind == "symlink":
1534.7.101 by Aaron Bentley
Got conflicts on symlinks working properly
1101
        tt.create_symlink(tree.get_symlink_target(entry.file_id), trans_id)
1534.7.47 by Aaron Bentley
Started work on 'revert'
1102
    elif entry.kind == "directory":
1534.7.51 by Aaron Bentley
New approach to revert
1103
        tt.create_directory(trans_id)
1534.7.47 by Aaron Bentley
Started work on 'revert'
1104
1534.7.89 by Aaron Bentley
Handle all content types in three-way
1105
def create_entry_executability(tt, entry, trans_id):
1534.7.157 by Aaron Bentley
Added more docs
1106
    """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
1107
    if entry.kind == "file":
1108
        tt.set_executability(entry.executable, trans_id)
1534.7.47 by Aaron Bentley
Started work on 'revert'
1109
1534.7.157 by Aaron Bentley
Added more docs
1110
1534.7.55 by Aaron Bentley
Fixed up the change detection
1111
def find_interesting(working_tree, target_tree, filenames):
1534.7.157 by Aaron Bentley
Added more docs
1112
    """Find the ids corresponding to specified filenames."""
1551.7.7 by Aaron Bentley
Handle revert DIRECTORY
1113
    trees = (working_tree, target_tree)
1551.7.22 by Aaron Bentley
Changes from review
1114
    return tree.find_ids_across_trees(filenames, trees)
1534.7.55 by Aaron Bentley
Fixed up the change detection
1115
1116
1534.7.56 by Aaron Bentley
Implemented the backup file detritus
1117
def change_entry(tt, file_id, working_tree, target_tree, 
1534.10.28 by Aaron Bentley
Use numbered backup files
1118
                 trans_id_file_id, backups, trans_id, by_parent):
1534.7.157 by Aaron Bentley
Added more docs
1119
    """Replace a file_id's contents with those from a target tree."""
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
1120
    e_trans_id = trans_id_file_id(file_id)
1534.7.55 by Aaron Bentley
Fixed up the change detection
1121
    entry = target_tree.inventory[file_id]
1122
    has_contents, contents_mod, meta_mod, = _entry_changes(file_id, entry, 
1123
                                                           working_tree)
1124
    if contents_mod:
1534.7.117 by Aaron Bentley
Simplified permission handling of existing files in transform.
1125
        mode_id = e_trans_id
1534.7.55 by Aaron Bentley
Fixed up the change detection
1126
        if has_contents:
1534.7.56 by Aaron Bentley
Implemented the backup file detritus
1127
            if not backups:
1128
                tt.delete_contents(e_trans_id)
1129
            else:
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
1130
                parent_trans_id = trans_id_file_id(entry.parent_id)
1534.10.28 by Aaron Bentley
Use numbered backup files
1131
                backup_name = get_backup_name(entry, by_parent,
1132
                                              parent_trans_id, tt)
1133
                tt.adjust_path(backup_name, parent_trans_id, e_trans_id)
1534.7.56 by Aaron Bentley
Implemented the backup file detritus
1134
                tt.unversion_file(e_trans_id)
1135
                e_trans_id = tt.create_path(entry.name, parent_trans_id)
1136
                tt.version_file(file_id, e_trans_id)
1137
                trans_id[file_id] = e_trans_id
1534.7.117 by Aaron Bentley
Simplified permission handling of existing files in transform.
1138
        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
1139
        create_entry_executability(tt, entry, e_trans_id)
1140
1711.4.26 by John Arbash Meinel
Fix #45010 correctly. Don't forget the execute bit.
1141
    elif meta_mod:
1142
        tt.set_executability(entry.executable, e_trans_id)
1534.7.55 by Aaron Bentley
Fixed up the change detection
1143
    if tt.final_name(e_trans_id) != entry.name:
1144
        adjust_path  = True
1145
    else:
1146
        parent_id = tt.final_parent(e_trans_id)
1147
        parent_file_id = tt.final_file_id(parent_id)
1148
        if parent_file_id != entry.parent_id:
1149
            adjust_path = True
1150
        else:
1151
            adjust_path = False
1152
    if adjust_path:
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
1153
        parent_trans_id = trans_id_file_id(entry.parent_id)
1534.7.56 by Aaron Bentley
Implemented the backup file detritus
1154
        tt.adjust_path(entry.name, parent_trans_id, e_trans_id)
1534.7.55 by Aaron Bentley
Fixed up the change detection
1155
1156
1534.10.28 by Aaron Bentley
Use numbered backup files
1157
def get_backup_name(entry, by_parent, parent_trans_id, tt):
2012.1.12 by Aaron Bentley
Use iter_changes for revert
1158
    return _get_backup_name(entry.name, by_parent, parent_trans_id, tt)
1159
1160
1161
def _get_backup_name(name, by_parent, parent_trans_id, tt):
1534.10.28 by Aaron Bentley
Use numbered backup files
1162
    """Produce a backup-style name that appears to be available"""
1163
    def name_gen():
1164
        counter = 1
1165
        while True:
2012.1.12 by Aaron Bentley
Use iter_changes for revert
1166
            yield "%s.~%d~" % (name, counter)
1534.10.28 by Aaron Bentley
Use numbered backup files
1167
            counter += 1
2012.1.12 by Aaron Bentley
Use iter_changes for revert
1168
    for new_name in name_gen():
1169
        if not tt.has_named_child(by_parent, parent_trans_id, new_name):
1170
            return new_name
1171
1534.10.28 by Aaron Bentley
Use numbered backup files
1172
1534.7.55 by Aaron Bentley
Fixed up the change detection
1173
def _entry_changes(file_id, entry, working_tree):
1534.7.156 by Aaron Bentley
PEP8 fixes
1174
    """Determine in which ways the inventory entry has changed.
1534.7.55 by Aaron Bentley
Fixed up the change detection
1175
1176
    Returns booleans: has_contents, content_mod, meta_mod
1177
    has_contents means there are currently contents, but they differ
1178
    contents_mod means contents need to be modified
1179
    meta_mod means the metadata needs to be modified
1180
    """
1181
    cur_entry = working_tree.inventory[file_id]
1182
    try:
1183
        working_kind = working_tree.kind(file_id)
1184
        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.
1185
    except NoSuchFile:
1534.7.55 by Aaron Bentley
Fixed up the change detection
1186
        has_contents = False
1187
        contents_mod = True
1188
        meta_mod = False
1189
    if has_contents is True:
1731.1.1 by Aaron Bentley
Make root entry an InventoryDirectory, make EmptyTree really empty
1190
        if entry.kind != working_kind:
1534.7.55 by Aaron Bentley
Fixed up the change detection
1191
            contents_mod, meta_mod = True, False
1192
        else:
1193
            cur_entry._read_tree_state(working_tree.id2path(file_id), 
1194
                                       working_tree)
1195
            contents_mod, meta_mod = entry.detect_changes(cur_entry)
1534.7.175 by Aaron Bentley
Ensured revert writes a normal inventory
1196
            cur_entry._forget_tree_state()
1534.7.55 by Aaron Bentley
Fixed up the change detection
1197
    return has_contents, contents_mod, meta_mod
1198
1534.7.56 by Aaron Bentley
Implemented the backup file detritus
1199
1534.9.4 by Aaron Bentley
Added progress bars to revert.
1200
def revert(working_tree, target_tree, filenames, backups=False, 
2225.1.1 by Aaron Bentley
Added revert change display, with tests
1201
           pb=DummyProgress(), change_reporter=None):
1534.7.157 by Aaron Bentley
Added more docs
1202
    """Revert a working tree's contents to those of a target tree."""
1534.7.55 by Aaron Bentley
Fixed up the change detection
1203
    interesting_ids = find_interesting(working_tree, target_tree, filenames)
1534.9.7 by Aaron Bentley
Show progress bars in revert
1204
    tt = TreeTransform(working_tree, pb)
1534.7.47 by Aaron Bentley
Started work on 'revert'
1205
    try:
2012.1.12 by Aaron Bentley
Use iter_changes for revert
1206
        pp = ProgressPhase("Revert phase", 3, pb)
1207
        pp.next_phase()
1208
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1209
        try:
1210
            _alter_files(working_tree, target_tree, tt, child_pb, 
2225.1.1 by Aaron Bentley
Added revert change display, with tests
1211
                         interesting_ids, backups, change_reporter)
1551.2.31 by Aaron Bentley
Got merge and revert using nested pbs
1212
        finally:
1213
            child_pb.finished()
1551.2.34 by Aaron Bentley
Refactored the revert phases
1214
        pp.next_phase()
1551.2.31 by Aaron Bentley
Got merge and revert using nested pbs
1215
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1216
        try:
1217
            raw_conflicts = resolve_conflicts(tt, child_pb)
1218
        finally:
1219
            child_pb.finished()
1558.7.13 by Aaron Bentley
WorkingTree.revert returns conflicts
1220
        conflicts = cook_conflicts(raw_conflicts, tt)
1534.10.27 by Aaron Bentley
Merge from mainline
1221
        for conflict in conflicts:
1534.10.24 by Aaron Bentley
Eliminated conflicts_to_strings, made remove_files a ConflictList member
1222
            warning(conflict)
1551.2.34 by Aaron Bentley
Refactored the revert phases
1223
        pp.next_phase()
1534.7.28 by Aaron Bentley
Nearly-working build_tree replacement
1224
        tt.apply()
1534.7.193 by Aaron Bentley
Stopped revert from preserving file contents produced by merges
1225
        working_tree.set_merge_modified({})
1534.7.28 by Aaron Bentley
Nearly-working build_tree replacement
1226
    finally:
1227
        tt.finalize()
1534.9.4 by Aaron Bentley
Added progress bars to revert.
1228
        pb.clear()
1558.7.13 by Aaron Bentley
WorkingTree.revert returns conflicts
1229
    return conflicts
1534.7.51 by Aaron Bentley
New approach to revert
1230
1534.7.57 by Aaron Bentley
Enhanced conflict resolution.
1231
2225.1.5 by Aaron Bentley
Clean up whitespace changes
1232
def _alter_files(working_tree, target_tree, tt, pb, interesting_ids, backups,
2225.1.1 by Aaron Bentley
Added revert change display, with tests
1233
                 report_changes):
1234
    from bzrlib import delta
2012.1.12 by Aaron Bentley
Use iter_changes for revert
1235
    merge_modified = working_tree.merge_modified()
2225.1.5 by Aaron Bentley
Clean up whitespace changes
1236
    change_list = list(target_tree._iter_changes(working_tree,
2225.1.1 by Aaron Bentley
Added revert change display, with tests
1237
        specific_file_ids=interesting_ids, pb=pb))
2012.1.12 by Aaron Bentley
Use iter_changes for revert
1238
    if target_tree.inventory.root is None:
1239
        skip_root = True
1240
    else:
1241
        skip_root = False
1242
    basis_tree = None
2225.1.1 by Aaron Bentley
Added revert change display, with tests
1243
    if report_changes:
1244
        change_reporter = delta.ChangeReporter(working_tree.inventory)
1245
        delta.report_changes(change_list, change_reporter)
2012.1.12 by Aaron Bentley
Use iter_changes for revert
1246
    for id_num, (file_id, path, changed_content, versioned, parent, name, kind,
2225.1.1 by Aaron Bentley
Added revert change display, with tests
1247
                 executable) in enumerate(change_list):
2012.1.12 by Aaron Bentley
Use iter_changes for revert
1248
        if skip_root and file_id[0] is not None and parent[0] is None:
1249
            continue
1250
        trans_id = tt.trans_id_file_id(file_id)
2012.1.15 by Aaron Bentley
Minor tweaks
1251
        mode_id = None
2012.1.12 by Aaron Bentley
Use iter_changes for revert
1252
        if changed_content:
1253
            keep_content = False
1254
            if kind[0] == 'file' and (backups or kind[1] is None):
1255
                wt_sha1 = working_tree.get_file_sha1(file_id)
1256
                if merge_modified.get(file_id) != wt_sha1:
1257
                    if basis_tree is None:
1258
                        basis_tree = working_tree.basis_tree()
1259
                    if file_id in basis_tree:
1260
                        if wt_sha1 != basis_tree.get_file_sha1(file_id):
1261
                            keep_content = True
1262
                    elif kind[1] is None and not versioned[1]:
1263
                        keep_content = True
1264
            if kind[0] is not None:
1265
                if not keep_content:
1266
                    tt.delete_contents(trans_id)
1267
                elif kind[1] is not None:
1268
                    parent_trans_id = tt.trans_id_file_id(parent[0])
2012.1.13 by Aaron Bentley
Optimize revert
1269
                    by_parent = tt.by_parent()
2012.1.12 by Aaron Bentley
Use iter_changes for revert
1270
                    backup_name = _get_backup_name(name[0], by_parent,
1271
                                                   parent_trans_id, tt)
1272
                    tt.adjust_path(backup_name, parent_trans_id, trans_id)
1273
                    new_trans_id = tt.create_path(name[0], parent_trans_id)
1274
                    if versioned == (True, True):
1275
                        tt.unversion_file(trans_id)
1276
                        tt.version_file(file_id, new_trans_id)
1551.9.10 by Aaron Bentley
Fix bugs in execute bit handling by revert
1277
                    # New contents should have the same unix perms as old
1278
                    # contents
2012.1.15 by Aaron Bentley
Minor tweaks
1279
                    mode_id = trans_id
2012.1.12 by Aaron Bentley
Use iter_changes for revert
1280
                    trans_id = new_trans_id
1281
            if kind[1] == 'directory':
1282
                tt.create_directory(trans_id)
1283
            elif kind[1] == 'symlink':
1284
                tt.create_symlink(target_tree.get_symlink_target(file_id),
1285
                                  trans_id)
1286
            elif kind[1] == 'file':
2012.1.13 by Aaron Bentley
Optimize revert
1287
                tt.create_file(target_tree.get_file_lines(file_id),
1551.9.10 by Aaron Bentley
Fix bugs in execute bit handling by revert
1288
                               trans_id, mode_id)
1289
                # preserve the execute bit when backing up
1290
                if keep_content and executable[0] == executable[1]:
2012.1.15 by Aaron Bentley
Minor tweaks
1291
                    tt.set_executability(executable[1], trans_id)
2012.1.12 by Aaron Bentley
Use iter_changes for revert
1292
            else:
1293
                assert kind[1] is None
1294
        if versioned == (False, True):
1295
            tt.version_file(file_id, trans_id)
1296
        if versioned == (True, False):
1297
            tt.unversion_file(trans_id)
1298
        if (name[1] is not None and 
1299
            (name[0] != name[1] or parent[0] != parent[1])):
1300
            tt.adjust_path(name[1], tt.trans_id_file_id(parent[1]), trans_id)
1551.9.10 by Aaron Bentley
Fix bugs in execute bit handling by revert
1301
        if executable[0] != executable[1] and kind[1] == "file":
1302
            tt.set_executability(executable[1], trans_id)
2012.1.12 by Aaron Bentley
Use iter_changes for revert
1303
1304
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1305
def resolve_conflicts(tt, pb=DummyProgress(), pass_func=None):
1534.7.57 by Aaron Bentley
Enhanced conflict resolution.
1306
    """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
1307
    if pass_func is None:
1308
        pass_func = conflict_pass
1534.7.169 by Aaron Bentley
Add filesystem/inventory conflicts to conflict output
1309
    new_conflicts = set()
1534.9.1 by Aaron Bentley
Added progress bars to merge
1310
    try:
1311
        for n in range(10):
1312
            pb.update('Resolution pass', n+1, 10)
1313
            conflicts = tt.find_conflicts()
1314
            if len(conflicts) == 0:
1315
                return new_conflicts
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1316
            new_conflicts.update(pass_func(tt, conflicts))
1534.9.1 by Aaron Bentley
Added progress bars to merge
1317
        raise MalformedTransform(conflicts=conflicts)
1318
    finally:
1319
        pb.clear()
1534.7.57 by Aaron Bentley
Enhanced conflict resolution.
1320
1321
1322
def conflict_pass(tt, conflicts):
1534.7.157 by Aaron Bentley
Added more docs
1323
    """Resolve some classes of conflicts."""
1534.7.169 by Aaron Bentley
Add filesystem/inventory conflicts to conflict output
1324
    new_conflicts = set()
1534.7.61 by Aaron Bentley
Handled parent loops, missing parents, unversioned parents
1325
    for c_type, conflict in ((c[0], c) for c in conflicts):
1326
        if c_type == 'duplicate id':
1534.7.51 by Aaron Bentley
New approach to revert
1327
            tt.unversion_file(conflict[1])
1534.7.170 by Aaron Bentley
Cleaned up filesystem conflict handling
1328
            new_conflicts.add((c_type, 'Unversioned existing file',
1329
                               conflict[1], conflict[2], ))
1534.7.61 by Aaron Bentley
Handled parent loops, missing parents, unversioned parents
1330
        elif c_type == 'duplicate':
1534.7.57 by Aaron Bentley
Enhanced conflict resolution.
1331
            # files that were renamed take precedence
1332
            new_name = tt.final_name(conflict[1])+'.moved'
1333
            final_parent = tt.final_parent(conflict[1])
1334
            if tt.path_changed(conflict[1]):
1335
                tt.adjust_path(new_name, final_parent, conflict[2])
1534.7.171 by Aaron Bentley
Implemented stringifying filesystem conflicts
1336
                new_conflicts.add((c_type, 'Moved existing file to', 
1337
                                   conflict[2], conflict[1]))
1534.7.57 by Aaron Bentley
Enhanced conflict resolution.
1338
            else:
1339
                tt.adjust_path(new_name, final_parent, conflict[1])
1534.7.171 by Aaron Bentley
Implemented stringifying filesystem conflicts
1340
                new_conflicts.add((c_type, 'Moved existing file to', 
1341
                                  conflict[1], conflict[2]))
1534.7.61 by Aaron Bentley
Handled parent loops, missing parents, unversioned parents
1342
        elif c_type == 'parent loop':
1343
            # break the loop by undoing one of the ops that caused the loop
1344
            cur = conflict[1]
1345
            while not tt.path_changed(cur):
1346
                cur = tt.final_parent(cur)
1534.7.170 by Aaron Bentley
Cleaned up filesystem conflict handling
1347
            new_conflicts.add((c_type, 'Cancelled move', cur,
1348
                               tt.final_parent(cur),))
1534.7.61 by Aaron Bentley
Handled parent loops, missing parents, unversioned parents
1349
            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
1350
            
1534.7.61 by Aaron Bentley
Handled parent loops, missing parents, unversioned parents
1351
        elif c_type == 'missing parent':
1534.7.128 by Aaron Bentley
Got missing contents test working
1352
            trans_id = conflict[1]
1353
            try:
1354
                tt.cancel_deletion(trans_id)
1551.8.22 by Aaron Bentley
Improve message when OTHER deletes an in-use tree
1355
                new_conflicts.add(('deleting parent', 'Not deleting', 
1356
                                   trans_id))
1534.7.128 by Aaron Bentley
Got missing contents test working
1357
            except KeyError:
1358
                tt.create_directory(trans_id)
1551.8.22 by Aaron Bentley
Improve message when OTHER deletes an in-use tree
1359
                new_conflicts.add((c_type, 'Created directory', trans_id))
1534.7.61 by Aaron Bentley
Handled parent loops, missing parents, unversioned parents
1360
        elif c_type == 'unversioned parent':
1534.7.148 by Aaron Bentley
Handled the remaining file versioning case
1361
            tt.version_file(tt.inactive_file_id(conflict[1]), conflict[1])
1534.7.171 by Aaron Bentley
Implemented stringifying filesystem conflicts
1362
            new_conflicts.add((c_type, 'Versioned directory', conflict[1]))
1534.7.169 by Aaron Bentley
Add filesystem/inventory conflicts to conflict output
1363
    return new_conflicts
1364
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
1365
1534.7.169 by Aaron Bentley
Add filesystem/inventory conflicts to conflict output
1366
def cook_conflicts(raw_conflicts, tt):
1534.7.170 by Aaron Bentley
Cleaned up filesystem conflict handling
1367
    """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
1368
    from bzrlib.conflicts import Conflict
1369
    conflict_iter = iter_cook_conflicts(raw_conflicts, tt)
1370
    return sorted(conflict_iter, key=Conflict.sort_key)
1534.7.170 by Aaron Bentley
Cleaned up filesystem conflict handling
1371
1534.7.169 by Aaron Bentley
Add filesystem/inventory conflicts to conflict output
1372
1373
def iter_cook_conflicts(raw_conflicts, tt):
1534.10.19 by Aaron Bentley
Stanza conversion, cooking
1374
    from bzrlib.conflicts import Conflict
1534.7.170 by Aaron Bentley
Cleaned up filesystem conflict handling
1375
    fp = FinalPaths(tt)
1534.7.169 by Aaron Bentley
Add filesystem/inventory conflicts to conflict output
1376
    for conflict in raw_conflicts:
1377
        c_type = conflict[0]
1534.7.170 by Aaron Bentley
Cleaned up filesystem conflict handling
1378
        action = conflict[1]
1379
        modified_path = fp.get_path(conflict[2])
1380
        modified_id = tt.final_file_id(conflict[2])
1381
        if len(conflict) == 3:
1534.10.19 by Aaron Bentley
Stanza conversion, cooking
1382
            yield Conflict.factory(c_type, action=action, path=modified_path,
1383
                                     file_id=modified_id)
1384
             
1534.7.170 by Aaron Bentley
Cleaned up filesystem conflict handling
1385
        else:
1386
            conflicting_path = fp.get_path(conflict[3])
1387
            conflicting_id = tt.final_file_id(conflict[3])
1534.10.19 by Aaron Bentley
Stanza conversion, cooking
1388
            yield Conflict.factory(c_type, action=action, path=modified_path,
1389
                                   file_id=modified_id, 
1390
                                   conflict_path=conflicting_path,
1391
                                   conflict_file_id=conflicting_id)