~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,
1907.1.1 by Aaron Bentley
Unshelved all changes except those related to removing RootEntry
24
                           ExistingLimbo, ImmortalLimbo)
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
1711.7.8 by John Arbash Meinel
Use try/finally inside create_file for TreeTransform to ensure the file handle gets closed
276
            for segment in contents:
277
                f.write(segment)
278
        finally:
279
            f.close()
1534.7.117 by Aaron Bentley
Simplified permission handling of existing files in transform.
280
        self._set_mode(trans_id, mode_id, S_ISREG)
281
282
    def _set_mode(self, trans_id, mode_id, typefunc):
1534.7.157 by Aaron Bentley
Added more docs
283
        """Set the mode of new file contents.
284
        The mode_id is the existing file to get the mode from (often the same
285
        as trans_id).  The operation is only performed if there's a mode match
286
        according to typefunc.
287
        """
1534.7.117 by Aaron Bentley
Simplified permission handling of existing files in transform.
288
        if mode_id is None:
289
            mode_id = trans_id
290
        try:
291
            old_path = self._tree_id_paths[mode_id]
292
        except KeyError:
293
            return
294
        try:
2027.1.1 by John Arbash Meinel
Fix bug #56549, and write a direct test that the right path is being statted
295
            mode = os.stat(self._tree.abspath(old_path)).st_mode
1534.7.117 by Aaron Bentley
Simplified permission handling of existing files in transform.
296
        except OSError, e:
297
            if e.errno == errno.ENOENT:
298
                return
299
            else:
300
                raise
301
        if typefunc(mode):
302
            os.chmod(self._limbo_name(trans_id), mode)
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
303
1534.7.20 by Aaron Bentley
Added directory handling
304
    def create_directory(self, trans_id):
1534.7.21 by Aaron Bentley
Updated docstrings
305
        """Schedule creation of a new directory.
306
        
307
        See also new_directory.
308
        """
1534.7.73 by Aaron Bentley
Changed model again. Now iterator is used immediately.
309
        os.mkdir(self._limbo_name(trans_id))
310
        unique_add(self._new_contents, trans_id, 'directory')
1534.7.20 by Aaron Bentley
Added directory handling
311
1534.7.22 by Aaron Bentley
Added symlink support
312
    def create_symlink(self, target, trans_id):
313
        """Schedule creation of a new symbolic link.
314
315
        target is a bytestring.
316
        See also new_symlink.
317
        """
1534.7.73 by Aaron Bentley
Changed model again. Now iterator is used immediately.
318
        os.symlink(target, self._limbo_name(trans_id))
319
        unique_add(self._new_contents, trans_id, 'symlink')
1534.7.22 by Aaron Bentley
Added symlink support
320
1534.7.129 by Aaron Bentley
Converted test cases to Tree Transform
321
    def cancel_creation(self, trans_id):
1534.7.157 by Aaron Bentley
Added more docs
322
        """Cancel the creation of new file contents."""
1534.7.129 by Aaron Bentley
Converted test cases to Tree Transform
323
        del self._new_contents[trans_id]
1558.12.9 by Aaron Bentley
Handle resolving conflicts with directories properly
324
        delete_any(self._limbo_name(trans_id))
1534.7.129 by Aaron Bentley
Converted test cases to Tree Transform
325
1534.7.34 by Aaron Bentley
Proper conflicts for removals
326
    def delete_contents(self, trans_id):
327
        """Schedule the contents of a path entry for deletion"""
1534.7.130 by Aaron Bentley
More conflict handling, test porting
328
        self.tree_kind(trans_id)
1534.7.34 by Aaron Bentley
Proper conflicts for removals
329
        self._removed_contents.add(trans_id)
330
1534.7.61 by Aaron Bentley
Handled parent loops, missing parents, unversioned parents
331
    def cancel_deletion(self, trans_id):
332
        """Cancel a scheduled deletion"""
333
        self._removed_contents.remove(trans_id)
334
1534.7.39 by Aaron Bentley
Ensured that files can be unversioned (de-versioned?)
335
    def unversion_file(self, trans_id):
336
        """Schedule a path entry to become unversioned"""
337
        self._removed_id.add(trans_id)
338
339
    def delete_versioned(self, trans_id):
340
        """Delete and unversion a versioned file"""
341
        self.delete_contents(trans_id)
342
        self.unversion_file(trans_id)
343
1534.7.25 by Aaron Bentley
Added set_executability
344
    def set_executability(self, executability, trans_id):
1534.7.167 by Aaron Bentley
PEP8 and comment cleanups
345
        """Schedule setting of the 'execute' bit
346
        To unschedule, set to None
347
        """
1534.7.26 by Aaron Bentley
Added conflicts for setting executability on unversioned/non-file entries
348
        if executability is None:
349
            del self._new_executability[trans_id]
350
        else:
351
            unique_add(self._new_executability, trans_id, executability)
1534.7.25 by Aaron Bentley
Added set_executability
352
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
353
    def version_file(self, file_id, trans_id):
1534.7.21 by Aaron Bentley
Updated docstrings
354
        """Schedule a file to become versioned."""
1534.7.148 by Aaron Bentley
Handled the remaining file versioning case
355
        assert file_id is not None
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
356
        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
357
        unique_add(self._r_new_id, file_id, trans_id)
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
358
1534.7.105 by Aaron Bentley
Got merge with rename working
359
    def cancel_versioning(self, trans_id):
360
        """Undo a previous versioning of a file"""
361
        file_id = self._new_id[trans_id]
362
        del self._new_id[trans_id]
363
        del self._r_new_id[file_id]
364
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
365
    def new_paths(self):
1534.7.21 by Aaron Bentley
Updated docstrings
366
        """Determine the paths of all new and changed files"""
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
367
        new_ids = set()
1534.7.132 by Aaron Bentley
Got cooked conflicts working
368
        fp = FinalPaths(self)
1534.7.4 by Aaron Bentley
Unified all file types as 'contents'
369
        for id_set in (self._new_name, self._new_parent, self._new_contents,
1534.7.25 by Aaron Bentley
Added set_executability
370
                       self._new_id, self._new_executability):
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
371
            new_ids.update(id_set)
372
        new_paths = [(fp.get_path(t), t) for t in new_ids]
373
        new_paths.sort()
374
        return new_paths
1534.7.6 by Aaron Bentley
Added conflict handling
375
1534.7.34 by Aaron Bentley
Proper conflicts for removals
376
    def tree_kind(self, trans_id):
1534.7.40 by Aaron Bentley
Updated docs
377
        """Determine the file kind in the working tree.
378
379
        Raises NoSuchFile if the file does not exist
380
        """
1534.7.34 by Aaron Bentley
Proper conflicts for removals
381
        path = self._tree_id_paths.get(trans_id)
382
        if path is None:
383
            raise NoSuchFile(None)
384
        try:
385
            return file_kind(self._tree.abspath(path))
386
        except OSError, e:
387
            if e.errno != errno.ENOENT:
388
                raise
389
            else:
390
                raise NoSuchFile(path)
391
1534.7.8 by Aaron Bentley
Added TreeTransform.final_kind
392
    def final_kind(self, trans_id):
1534.7.156 by Aaron Bentley
PEP8 fixes
393
        """Determine the final file kind, after any changes applied.
1534.7.8 by Aaron Bentley
Added TreeTransform.final_kind
394
        
395
        Raises NoSuchFile if the file does not exist/has no contents.
396
        (It is conceivable that a path would be created without the
397
        corresponding contents insertion command)
398
        """
399
        if trans_id in self._new_contents:
1534.7.73 by Aaron Bentley
Changed model again. Now iterator is used immediately.
400
            return self._new_contents[trans_id]
1534.7.34 by Aaron Bentley
Proper conflicts for removals
401
        elif trans_id in self._removed_contents:
402
            raise NoSuchFile(None)
1534.7.8 by Aaron Bentley
Added TreeTransform.final_kind
403
        else:
1534.7.34 by Aaron Bentley
Proper conflicts for removals
404
            return self.tree_kind(trans_id)
1534.7.8 by Aaron Bentley
Added TreeTransform.final_kind
405
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
406
    def tree_file_id(self, trans_id):
1534.7.41 by Aaron Bentley
Got inventory ID movement working
407
        """Determine the file id associated with the trans_id in the tree"""
408
        try:
409
            path = self._tree_id_paths[trans_id]
410
        except KeyError:
411
            # the file is a new, unversioned file, or invalid trans_id
412
            return None
413
        # the file is old; the old id is still valid
1534.7.68 by Aaron Bentley
Got semi-reasonable root directory renaming working
414
        if self._new_root == trans_id:
415
            return self._tree.inventory.root.file_id
1534.7.148 by Aaron Bentley
Handled the remaining file versioning case
416
        return self._tree.inventory.path2id(path)
1534.7.41 by Aaron Bentley
Got inventory ID movement working
417
1534.7.13 by Aaron Bentley
Implemented final_file_id
418
    def final_file_id(self, trans_id):
1534.7.156 by Aaron Bentley
PEP8 fixes
419
        """Determine the file id after any changes are applied, or None.
1534.7.21 by Aaron Bentley
Updated docstrings
420
        
421
        None indicates that the file will not be versioned after changes are
422
        applied.
423
        """
1534.7.13 by Aaron Bentley
Implemented final_file_id
424
        try:
425
            # there is a new id for this file
1534.7.148 by Aaron Bentley
Handled the remaining file versioning case
426
            assert self._new_id[trans_id] is not None
1534.7.13 by Aaron Bentley
Implemented final_file_id
427
            return self._new_id[trans_id]
428
        except KeyError:
1534.7.39 by Aaron Bentley
Ensured that files can be unversioned (de-versioned?)
429
            if trans_id in self._removed_id:
430
                return None
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
431
        return self.tree_file_id(trans_id)
1534.7.13 by Aaron Bentley
Implemented final_file_id
432
1534.7.148 by Aaron Bentley
Handled the remaining file versioning case
433
    def inactive_file_id(self, trans_id):
1534.7.157 by Aaron Bentley
Added more docs
434
        """Return the inactive file_id associated with a transaction id.
1534.7.148 by Aaron Bentley
Handled the remaining file versioning case
435
        That is, the one in the tree or in non_present_ids.
436
        The file_id may actually be active, too.
437
        """
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
438
        file_id = self.tree_file_id(trans_id)
1534.7.148 by Aaron Bentley
Handled the remaining file versioning case
439
        if file_id is not None:
440
            return file_id
441
        for key, value in self._non_present_ids.iteritems():
442
            if value == trans_id:
443
                return key
444
1534.7.17 by Aaron Bentley
Added final_parent function
445
    def final_parent(self, trans_id):
1534.7.156 by Aaron Bentley
PEP8 fixes
446
        """Determine the parent file_id, after any changes are applied.
1534.7.21 by Aaron Bentley
Updated docstrings
447
1534.7.31 by Aaron Bentley
Changed tree root parent to ROOT_PARENT
448
        ROOT_PARENT is returned for the tree root.
1534.7.21 by Aaron Bentley
Updated docstrings
449
        """
1534.7.17 by Aaron Bentley
Added final_parent function
450
        try:
451
            return self._new_parent[trans_id]
452
        except KeyError:
453
            return self.get_tree_parent(trans_id)
454
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
455
    def final_name(self, trans_id):
1534.7.40 by Aaron Bentley
Updated docs
456
        """Determine the final filename, after all changes are applied."""
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
457
        try:
458
            return self._new_name[trans_id]
459
        except KeyError:
1907.1.1 by Aaron Bentley
Unshelved all changes except those related to removing RootEntry
460
            return os.path.basename(self._tree_id_paths[trans_id])
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
461
1534.10.28 by Aaron Bentley
Use numbered backup files
462
    def by_parent(self):
1534.7.40 by Aaron Bentley
Updated docs
463
        """Return a map of parent: children for known parents.
464
        
465
        Only new paths and parents of tree files with assigned ids are used.
466
        """
1534.7.6 by Aaron Bentley
Added conflict handling
467
        by_parent = {}
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
468
        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.
469
        items.extend((t, self.final_parent(t)) for t in 
470
                      self._tree_id_paths.keys())
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
471
        for trans_id, parent_id in items:
1534.7.6 by Aaron Bentley
Added conflict handling
472
            if parent_id not in by_parent:
473
                by_parent[parent_id] = set()
474
            by_parent[parent_id].add(trans_id)
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
475
        return by_parent
1534.7.11 by Aaron Bentley
Refactored conflict handling
476
1534.7.57 by Aaron Bentley
Enhanced conflict resolution.
477
    def path_changed(self, trans_id):
1534.7.157 by Aaron Bentley
Added more docs
478
        """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)
479
        return (trans_id in self._new_name) or (trans_id in self._new_parent)
1534.7.57 by Aaron Bentley
Enhanced conflict resolution.
480
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
481
    def new_contents(self, trans_id):
482
        return (trans_id in self._new_contents)
483
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
484
    def find_conflicts(self):
1534.7.40 by Aaron Bentley
Updated docs
485
        """Find any violations of inventory or filesystem invariants"""
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
486
        if self.__done is True:
487
            raise ReusingTransform()
488
        conflicts = []
489
        # ensure all children of all existent parents are known
490
        # all children of non-existent parents are known, by definition.
491
        self._add_tree_children()
1534.10.28 by Aaron Bentley
Use numbered backup files
492
        by_parent = self.by_parent()
1534.7.15 by Aaron Bentley
Add conflict types related to versioning
493
        conflicts.extend(self._unversioned_parents(by_parent))
1534.7.19 by Aaron Bentley
Added tests for parent loops
494
        conflicts.extend(self._parent_loops())
1534.7.11 by Aaron Bentley
Refactored conflict handling
495
        conflicts.extend(self._duplicate_entries(by_parent))
1534.7.50 by Aaron Bentley
Detect duplicate inventory ids
496
        conflicts.extend(self._duplicate_ids())
1534.7.11 by Aaron Bentley
Refactored conflict handling
497
        conflicts.extend(self._parent_type_conflicts(by_parent))
1534.7.15 by Aaron Bentley
Add conflict types related to versioning
498
        conflicts.extend(self._improper_versioning())
1534.7.26 by Aaron Bentley
Added conflicts for setting executability on unversioned/non-file entries
499
        conflicts.extend(self._executability_conflicts())
1534.7.152 by Aaron Bentley
Fixed overwrites
500
        conflicts.extend(self._overwrite_conflicts())
1534.7.15 by Aaron Bentley
Add conflict types related to versioning
501
        return conflicts
502
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
503
    def _add_tree_children(self):
1534.7.156 by Aaron Bentley
PEP8 fixes
504
        """Add all the children of all active parents to the known paths.
1534.7.40 by Aaron Bentley
Updated docs
505
506
        Active parents are those which gain children, and those which are
507
        removed.  This is a necessary first step in detecting conflicts.
508
        """
1534.10.28 by Aaron Bentley
Use numbered backup files
509
        parents = self.by_parent().keys()
1534.7.34 by Aaron Bentley
Proper conflicts for removals
510
        parents.extend([t for t in self._removed_contents if 
511
                        self.tree_kind(t) == 'directory'])
1534.7.50 by Aaron Bentley
Detect duplicate inventory ids
512
        for trans_id in self._removed_id:
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
513
            file_id = self.tree_file_id(trans_id)
1731.1.2 by Aaron Bentley
Removed all remaining uses of root_directory
514
            if self._tree.inventory[file_id].kind == 'directory':
1534.7.50 by Aaron Bentley
Detect duplicate inventory ids
515
                parents.append(trans_id)
516
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
517
        for parent_id in parents:
1534.7.67 by Aaron Bentley
Refactored _add_tree_children
518
            # ensure that all children are registered with the transaction
519
            list(self.iter_tree_children(parent_id))
520
521
    def iter_tree_children(self, parent_id):
522
        """Iterate through the entry's tree children, if any"""
523
        try:
524
            path = self._tree_id_paths[parent_id]
525
        except KeyError:
526
            return
527
        try:
528
            children = os.listdir(self._tree.abspath(path))
529
        except OSError, e:
1534.7.71 by abentley
All tests pass under Windows
530
            if e.errno != errno.ENOENT and e.errno != errno.ESRCH:
1534.7.67 by Aaron Bentley
Refactored _add_tree_children
531
                raise
532
            return
533
            
534
        for child in children:
535
            childpath = joinpath(path, child)
1534.7.180 by Aaron Bentley
Merge from mainline
536
            if self._tree.is_control_filename(childpath):
1534.7.67 by Aaron Bentley
Refactored _add_tree_children
537
                continue
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
538
            yield self.trans_id_tree_path(childpath)
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
539
1534.10.28 by Aaron Bentley
Use numbered backup files
540
    def has_named_child(self, by_parent, parent_id, name):
541
        try:
542
            children = by_parent[parent_id]
543
        except KeyError:
544
            children = []
545
        for child in children:
546
            if self.final_name(child) == name:
547
                return True
548
        try:
549
            path = self._tree_id_paths[parent_id]
550
        except KeyError:
551
            return False
552
        childpath = joinpath(path, name)
553
        child_id = self._tree_path_ids.get(childpath)
554
        if child_id is None:
555
            return lexists(self._tree.abspath(childpath))
556
        else:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
557
            if self.final_parent(child_id) != parent_id:
1534.10.28 by Aaron Bentley
Use numbered backup files
558
                return False
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
559
            if child_id in self._removed_contents:
1534.10.28 by Aaron Bentley
Use numbered backup files
560
                # XXX What about dangling file-ids?
561
                return False
562
            else:
563
                return True
564
1534.7.19 by Aaron Bentley
Added tests for parent loops
565
    def _parent_loops(self):
566
        """No entry should be its own ancestor"""
567
        conflicts = []
568
        for trans_id in self._new_parent:
569
            seen = set()
570
            parent_id = trans_id
1534.7.31 by Aaron Bentley
Changed tree root parent to ROOT_PARENT
571
            while parent_id is not ROOT_PARENT:
1534.7.19 by Aaron Bentley
Added tests for parent loops
572
                seen.add(parent_id)
1907.1.1 by Aaron Bentley
Unshelved all changes except those related to removing RootEntry
573
                parent_id = self.final_parent(parent_id)
1534.7.19 by Aaron Bentley
Added tests for parent loops
574
                if parent_id == trans_id:
575
                    conflicts.append(('parent loop', trans_id))
576
                if parent_id in seen:
577
                    break
578
        return conflicts
579
1534.7.15 by Aaron Bentley
Add conflict types related to versioning
580
    def _unversioned_parents(self, by_parent):
581
        """If parent directories are versioned, children must be versioned."""
582
        conflicts = []
583
        for parent_id, children in by_parent.iteritems():
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
584
            if parent_id is ROOT_PARENT:
585
                continue
1534.7.15 by Aaron Bentley
Add conflict types related to versioning
586
            if self.final_file_id(parent_id) is not None:
587
                continue
588
            for child_id in children:
589
                if self.final_file_id(child_id) is not None:
590
                    conflicts.append(('unversioned parent', parent_id))
591
                    break;
592
        return conflicts
593
594
    def _improper_versioning(self):
1534.7.156 by Aaron Bentley
PEP8 fixes
595
        """Cannot version a file with no contents, or a bad type.
1534.7.15 by Aaron Bentley
Add conflict types related to versioning
596
        
597
        However, existing entries with no contents are okay.
598
        """
599
        conflicts = []
600
        for trans_id in self._new_id.iterkeys():
601
            try:
602
                kind = self.final_kind(trans_id)
603
            except NoSuchFile:
604
                conflicts.append(('versioning no contents', trans_id))
605
                continue
606
            if not InventoryEntry.versionable_kind(kind):
1534.7.20 by Aaron Bentley
Added directory handling
607
                conflicts.append(('versioning bad kind', trans_id, kind))
1534.7.11 by Aaron Bentley
Refactored conflict handling
608
        return conflicts
609
1534.7.26 by Aaron Bentley
Added conflicts for setting executability on unversioned/non-file entries
610
    def _executability_conflicts(self):
1534.7.40 by Aaron Bentley
Updated docs
611
        """Check for bad executability changes.
612
        
613
        Only versioned files may have their executability set, because
614
        1. only versioned entries can have executability under windows
615
        2. only files can be executable.  (The execute bit on a directory
616
           does not indicate searchability)
617
        """
1534.7.26 by Aaron Bentley
Added conflicts for setting executability on unversioned/non-file entries
618
        conflicts = []
619
        for trans_id in self._new_executability:
620
            if self.final_file_id(trans_id) is None:
621
                conflicts.append(('unversioned executability', trans_id))
1534.7.34 by Aaron Bentley
Proper conflicts for removals
622
            else:
623
                try:
624
                    non_file = self.final_kind(trans_id) != "file"
625
                except NoSuchFile:
626
                    non_file = True
627
                if non_file is True:
628
                    conflicts.append(('non-file executability', trans_id))
1534.7.26 by Aaron Bentley
Added conflicts for setting executability on unversioned/non-file entries
629
        return conflicts
630
1534.7.152 by Aaron Bentley
Fixed overwrites
631
    def _overwrite_conflicts(self):
632
        """Check for overwrites (not permitted on Win32)"""
633
        conflicts = []
634
        for trans_id in self._new_contents:
635
            try:
636
                self.tree_kind(trans_id)
637
            except NoSuchFile:
638
                continue
639
            if trans_id not in self._removed_contents:
640
                conflicts.append(('overwrite', trans_id,
641
                                 self.final_name(trans_id)))
642
        return conflicts
643
1534.7.11 by Aaron Bentley
Refactored conflict handling
644
    def _duplicate_entries(self, by_parent):
645
        """No directory may have two entries with the same name."""
646
        conflicts = []
1534.7.6 by Aaron Bentley
Added conflict handling
647
        for children in by_parent.itervalues():
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
648
            name_ids = [(self.final_name(t), t) for t in children]
1534.7.6 by Aaron Bentley
Added conflict handling
649
            name_ids.sort()
650
            last_name = None
651
            last_trans_id = None
652
            for name, trans_id in name_ids:
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
653
                try:
654
                    kind = self.final_kind(trans_id)
655
                except NoSuchFile:
656
                    kind = None
657
                file_id = self.final_file_id(trans_id)
658
                if kind is None and file_id is None:
659
                    continue
1534.7.6 by Aaron Bentley
Added conflict handling
660
                if name == last_name:
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
661
                    conflicts.append(('duplicate', last_trans_id, trans_id,
662
                    name))
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
663
                last_name = name
664
                last_trans_id = trans_id
1534.7.11 by Aaron Bentley
Refactored conflict handling
665
        return conflicts
666
1534.7.50 by Aaron Bentley
Detect duplicate inventory ids
667
    def _duplicate_ids(self):
668
        """Each inventory id may only be used once"""
669
        conflicts = []
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
670
        removed_tree_ids = set((self.tree_file_id(trans_id) for trans_id in
1534.7.50 by Aaron Bentley
Detect duplicate inventory ids
671
                                self._removed_id))
672
        active_tree_ids = set((f for f in self._tree.inventory if
673
                               f not in removed_tree_ids))
674
        for trans_id, file_id in self._new_id.iteritems():
675
            if file_id in active_tree_ids:
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
676
                old_trans_id = self.trans_id_tree_file_id(file_id)
1534.7.50 by Aaron Bentley
Detect duplicate inventory ids
677
                conflicts.append(('duplicate id', old_trans_id, trans_id))
678
        return conflicts
679
1534.7.11 by Aaron Bentley
Refactored conflict handling
680
    def _parent_type_conflicts(self, by_parent):
681
        """parents must have directory 'contents'."""
682
        conflicts = []
1534.7.37 by Aaron Bentley
Allowed removed dirs to have content-free children.
683
        for parent_id, children in by_parent.iteritems():
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
684
            if parent_id is ROOT_PARENT:
685
                continue
1534.7.37 by Aaron Bentley
Allowed removed dirs to have content-free children.
686
            if not self._any_contents(children):
687
                continue
688
            for child in children:
689
                try:
690
                    self.final_kind(child)
691
                except NoSuchFile:
692
                    continue
1534.7.10 by Aaron Bentley
Implemented missing parent and non-directory parent conflicts
693
            try:
694
                kind = self.final_kind(parent_id)
695
            except NoSuchFile:
696
                kind = None
697
            if kind is None:
698
                conflicts.append(('missing parent', parent_id))
699
            elif kind != "directory":
700
                conflicts.append(('non-directory parent', parent_id))
1534.7.6 by Aaron Bentley
Added conflict handling
701
        return conflicts
1534.7.37 by Aaron Bentley
Allowed removed dirs to have content-free children.
702
703
    def _any_contents(self, trans_ids):
704
        """Return true if any of the trans_ids, will have contents."""
705
        for trans_id in trans_ids:
706
            try:
707
                kind = self.final_kind(trans_id)
708
            except NoSuchFile:
709
                continue
710
            return True
711
        return False
1534.7.6 by Aaron Bentley
Added conflict handling
712
            
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
713
    def apply(self):
1534.7.156 by Aaron Bentley
PEP8 fixes
714
        """Apply all changes to the inventory and filesystem.
1534.7.21 by Aaron Bentley
Updated docstrings
715
        
716
        If filesystem or inventory conflicts are present, MalformedTransform
717
        will be thrown.
718
        """
1534.7.49 by Aaron Bentley
Printed conflicts in MalformedTransform
719
        conflicts = self.find_conflicts()
720
        if len(conflicts) != 0:
721
            raise MalformedTransform(conflicts=conflicts)
1534.7.41 by Aaron Bentley
Got inventory ID movement working
722
        limbo_inv = {}
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
723
        inv = self._tree.inventory
1551.2.31 by Aaron Bentley
Got merge and revert using nested pbs
724
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
725
        try:
726
            child_pb.update('Apply phase', 0, 2)
727
            self._apply_removals(inv, limbo_inv)
728
            child_pb.update('Apply phase', 1, 2)
729
            modified_paths = self._apply_insertions(inv, limbo_inv)
730
        finally:
731
            child_pb.finished()
1534.7.35 by Aaron Bentley
Got file renaming working
732
        self._tree._write_inventory(inv)
733
        self.__done = True
1534.7.59 by Aaron Bentley
Simplified tests
734
        self.finalize()
1534.7.191 by Aaron Bentley
Got transform.apply to list modified paths
735
        return _TransformResults(modified_paths)
1534.7.35 by Aaron Bentley
Got file renaming working
736
1534.7.72 by Aaron Bentley
Moved new content generation to pre-renames
737
    def _limbo_name(self, trans_id):
738
        """Generate the limbo name of a file"""
1534.7.166 by Aaron Bentley
Swapped os.path.join for pathjoin everywhere
739
        return pathjoin(self._limbodir, trans_id)
1534.7.72 by Aaron Bentley
Moved new content generation to pre-renames
740
1534.7.41 by Aaron Bentley
Got inventory ID movement working
741
    def _apply_removals(self, inv, limbo_inv):
1534.7.36 by Aaron Bentley
Added rename tests
742
        """Perform tree operations that remove directory/inventory names.
743
        
744
        That is, delete files that are to be deleted, and put any files that
745
        need renaming into limbo.  This must be done in strict child-to-parent
746
        order.
747
        """
1534.7.35 by Aaron Bentley
Got file renaming working
748
        tree_paths = list(self._tree_path_ids.iteritems())
749
        tree_paths.sort(reverse=True)
1551.2.31 by Aaron Bentley
Got merge and revert using nested pbs
750
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
751
        try:
752
            for num, data in enumerate(tree_paths):
753
                path, trans_id = data
754
                child_pb.update('removing file', num, len(tree_paths))
755
                full_path = self._tree.abspath(path)
756
                if trans_id in self._removed_contents:
1558.12.9 by Aaron Bentley
Handle resolving conflicts with directories properly
757
                    delete_any(full_path)
1551.2.31 by Aaron Bentley
Got merge and revert using nested pbs
758
                elif trans_id in self._new_name or trans_id in \
759
                    self._new_parent:
760
                    try:
761
                        os.rename(full_path, self._limbo_name(trans_id))
762
                    except OSError, e:
763
                        if e.errno != errno.ENOENT:
764
                            raise
765
                if trans_id in self._removed_id:
766
                    if trans_id == self._new_root:
767
                        file_id = self._tree.inventory.root.file_id
768
                    else:
769
                        file_id = self.tree_file_id(trans_id)
770
                    del inv[file_id]
771
                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
772
                    file_id = self.tree_file_id(trans_id)
1551.2.31 by Aaron Bentley
Got merge and revert using nested pbs
773
                    if file_id is not None:
774
                        limbo_inv[trans_id] = inv[file_id]
775
                        del inv[file_id]
776
        finally:
777
            child_pb.finished()
1534.7.34 by Aaron Bentley
Proper conflicts for removals
778
1534.7.41 by Aaron Bentley
Got inventory ID movement working
779
    def _apply_insertions(self, inv, limbo_inv):
1534.7.36 by Aaron Bentley
Added rename tests
780
        """Perform tree operations that insert directory/inventory names.
781
        
782
        That is, create any files that need to be created, and restore from
783
        limbo any files that needed renaming.  This must be done in strict
784
        parent-to-child order.
785
        """
1534.9.1 by Aaron Bentley
Added progress bars to merge
786
        new_paths = self.new_paths()
1534.7.191 by Aaron Bentley
Got transform.apply to list modified paths
787
        modified_paths = []
1551.2.31 by Aaron Bentley
Got merge and revert using nested pbs
788
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
789
        try:
790
            for num, (path, trans_id) in enumerate(new_paths):
791
                child_pb.update('adding file', num, len(new_paths))
1534.7.48 by Aaron Bentley
Ensured we can move/rename dangling inventory entries
792
                try:
1551.2.31 by Aaron Bentley
Got merge and revert using nested pbs
793
                    kind = self._new_contents[trans_id]
794
                except KeyError:
795
                    kind = contents = None
796
                if trans_id in self._new_contents or \
797
                    self.path_changed(trans_id):
798
                    full_path = self._tree.abspath(path)
799
                    try:
800
                        os.rename(self._limbo_name(trans_id), full_path)
801
                    except OSError, e:
802
                        # We may be renaming a dangling inventory id
803
                        if e.errno != errno.ENOENT:
804
                            raise
805
                    if trans_id in self._new_contents:
806
                        modified_paths.append(full_path)
807
                        del self._new_contents[trans_id]
808
809
                if trans_id in self._new_id:
810
                    if kind is None:
811
                        kind = file_kind(self._tree.abspath(path))
812
                    inv.add_path(path, kind, self._new_id[trans_id])
813
                elif trans_id in self._new_name or trans_id in\
814
                    self._new_parent:
815
                    entry = limbo_inv.get(trans_id)
816
                    if entry is not None:
817
                        entry.name = self.final_name(trans_id)
818
                        parent_path = os.path.dirname(path)
819
                        entry.parent_id = \
820
                            self._tree.inventory.path2id(parent_path)
821
                        inv.add(entry)
822
823
                # requires files and inventory entries to be in place
824
                if trans_id in self._new_executability:
825
                    self._set_executability(path, inv, trans_id)
826
        finally:
827
            child_pb.finished()
1534.7.191 by Aaron Bentley
Got transform.apply to list modified paths
828
        return modified_paths
1534.7.40 by Aaron Bentley
Updated docs
829
1534.7.25 by Aaron Bentley
Added set_executability
830
    def _set_executability(self, path, inv, trans_id):
1534.7.40 by Aaron Bentley
Updated docs
831
        """Set the executability of versioned files """
1534.7.25 by Aaron Bentley
Added set_executability
832
        file_id = inv.path2id(path)
833
        new_executability = self._new_executability[trans_id]
834
        inv[file_id].executable = new_executability
835
        if supports_executable():
836
            abspath = self._tree.abspath(path)
837
            current_mode = os.stat(abspath).st_mode
838
            if new_executability:
839
                umask = os.umask(0)
840
                os.umask(umask)
841
                to_mode = current_mode | (0100 & ~umask)
842
                # Enable x-bit for others only if they can read it.
843
                if current_mode & 0004:
844
                    to_mode |= 0001 & ~umask
845
                if current_mode & 0040:
846
                    to_mode |= 0010 & ~umask
847
            else:
848
                to_mode = current_mode & ~0111
849
            os.chmod(abspath, to_mode)
850
1534.7.23 by Aaron Bentley
Transform.new_entry -> Transform._new_entry
851
    def _new_entry(self, name, parent_id, file_id):
1534.7.21 by Aaron Bentley
Updated docstrings
852
        """Helper function to create a new filesystem entry."""
1534.7.2 by Aaron Bentley
Added convenience function
853
        trans_id = self.create_path(name, parent_id)
854
        if file_id is not None:
855
            self.version_file(file_id, trans_id)
856
        return trans_id
857
1534.7.27 by Aaron Bentley
Added execute bit to new_file method
858
    def new_file(self, name, parent_id, contents, file_id=None, 
859
                 executable=None):
1534.7.156 by Aaron Bentley
PEP8 fixes
860
        """Convenience method to create files.
1534.7.21 by Aaron Bentley
Updated docstrings
861
        
862
        name is the name of the file to create.
863
        parent_id is the transaction id of the parent directory of the file.
864
        contents is an iterator of bytestrings, which will be used to produce
865
        the file.
1740.2.4 by Aaron Bentley
Update transform tests and docs
866
        :param file_id: The inventory ID of the file, if it is to be versioned.
867
        :param executable: Only valid when a file_id has been supplied.
1534.7.21 by Aaron Bentley
Updated docstrings
868
        """
1534.7.23 by Aaron Bentley
Transform.new_entry -> Transform._new_entry
869
        trans_id = self._new_entry(name, parent_id, file_id)
1740.2.4 by Aaron Bentley
Update transform tests and docs
870
        # TODO: rather than scheduling a set_executable call,
871
        # have create_file create the file with the right mode.
1534.7.20 by Aaron Bentley
Added directory handling
872
        self.create_file(contents, trans_id)
1534.7.27 by Aaron Bentley
Added execute bit to new_file method
873
        if executable is not None:
874
            self.set_executability(executable, trans_id)
1534.7.20 by Aaron Bentley
Added directory handling
875
        return trans_id
876
877
    def new_directory(self, name, parent_id, file_id=None):
1534.7.156 by Aaron Bentley
PEP8 fixes
878
        """Convenience method to create directories.
1534.7.21 by Aaron Bentley
Updated docstrings
879
880
        name is the name of the directory to create.
881
        parent_id is the transaction id of the parent directory of the
882
        directory.
883
        file_id is the inventory ID of the directory, if it is to be versioned.
884
        """
1534.7.23 by Aaron Bentley
Transform.new_entry -> Transform._new_entry
885
        trans_id = self._new_entry(name, parent_id, file_id)
1534.7.20 by Aaron Bentley
Added directory handling
886
        self.create_directory(trans_id)
887
        return trans_id 
888
1534.7.22 by Aaron Bentley
Added symlink support
889
    def new_symlink(self, name, parent_id, target, file_id=None):
1534.7.156 by Aaron Bentley
PEP8 fixes
890
        """Convenience method to create symbolic link.
1534.7.22 by Aaron Bentley
Added symlink support
891
        
892
        name is the name of the symlink to create.
893
        parent_id is the transaction id of the parent directory of the symlink.
894
        target is a bytestring of the target of the symlink.
895
        file_id is the inventory ID of the file, if it is to be versioned.
896
        """
1534.7.23 by Aaron Bentley
Transform.new_entry -> Transform._new_entry
897
        trans_id = self._new_entry(name, parent_id, file_id)
1534.7.22 by Aaron Bentley
Added symlink support
898
        self.create_symlink(target, trans_id)
899
        return trans_id
900
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
901
def joinpath(parent, child):
1534.7.40 by Aaron Bentley
Updated docs
902
    """Join tree-relative paths, handling the tree root specially"""
1534.7.32 by Aaron Bentley
Got conflict handling working when conflicts involve existing files
903
    if parent is None or parent == "":
904
        return child
905
    else:
1534.7.166 by Aaron Bentley
Swapped os.path.join for pathjoin everywhere
906
        return pathjoin(parent, child)
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
907
1534.7.167 by Aaron Bentley
PEP8 and comment cleanups
908
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
909
class FinalPaths(object):
1759.2.2 by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron.
910
    """Make path calculation cheap by memoizing paths.
1534.7.21 by Aaron Bentley
Updated docstrings
911
912
    The underlying tree must not be manipulated between calls, or else
913
    the results will likely be incorrect.
914
    """
1534.7.132 by Aaron Bentley
Got cooked conflicts working
915
    def __init__(self, transform):
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
916
        object.__init__(self)
917
        self._known_paths = {}
1534.7.33 by Aaron Bentley
Fixed naming
918
        self.transform = transform
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
919
920
    def _determine_path(self, trans_id):
1534.7.132 by Aaron Bentley
Got cooked conflicts working
921
        if trans_id == self.transform.root:
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
922
            return ""
1534.7.33 by Aaron Bentley
Fixed naming
923
        name = self.transform.final_name(trans_id)
924
        parent_id = self.transform.final_parent(trans_id)
1534.7.132 by Aaron Bentley
Got cooked conflicts working
925
        if parent_id == self.transform.root:
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
926
            return name
927
        else:
1534.7.166 by Aaron Bentley
Swapped os.path.join for pathjoin everywhere
928
            return pathjoin(self.get_path(parent_id), name)
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
929
930
    def get_path(self, trans_id):
1534.7.157 by Aaron Bentley
Added more docs
931
        """Find the final path associated with a trans_id"""
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
932
        if trans_id not in self._known_paths:
933
            self._known_paths[trans_id] = self._determine_path(trans_id)
934
        return self._known_paths[trans_id]
1534.7.28 by Aaron Bentley
Nearly-working build_tree replacement
935
1534.7.30 by Aaron Bentley
Factored out topological id sorting
936
def topology_sorted_ids(tree):
1534.7.40 by Aaron Bentley
Updated docs
937
    """Determine the topological order of the ids in a tree"""
1534.7.30 by Aaron Bentley
Factored out topological id sorting
938
    file_ids = list(tree)
939
    file_ids.sort(key=tree.id2path)
940
    return file_ids
1534.7.28 by Aaron Bentley
Nearly-working build_tree replacement
941
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
942
1534.7.165 by Aaron Bentley
Switched to build_tree instead of revert
943
def build_tree(tree, wt):
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
944
    """Create working tree for a branch, using a TreeTransform.
945
    
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
946
    This function should be used on empty trees, having a tree root at most.
947
    (see merge and revert functionality for working with existing trees)
948
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
949
    Existing files are handled like so:
950
    
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
951
    - Existing bzrdirs take precedence over creating new items.  They are
952
      created as '%s.diverted' % name.
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
953
    - Otherwise, if the content on disk matches the content we are building,
954
      it is silently replaced.
955
    - Otherwise, conflict resolution will move the old file to 'oldname.moved'.
956
    """
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
957
    assert 2 > len(wt.inventory)
1534.7.28 by Aaron Bentley
Nearly-working build_tree replacement
958
    file_trans_id = {}
1558.11.1 by Aaron Bentley
Progress indicator for tree builts
959
    top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
960
    pp = ProgressPhase("Build phase", 2, top_pb)
1534.7.28 by Aaron Bentley
Nearly-working build_tree replacement
961
    tt = TreeTransform(wt)
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
962
    divert = set()
1534.7.28 by Aaron Bentley
Nearly-working build_tree replacement
963
    try:
1558.11.1 by Aaron Bentley
Progress indicator for tree builts
964
        pp.next_phase()
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
965
        file_trans_id[wt.get_root_id()] = \
966
            tt.trans_id_tree_file_id(wt.get_root_id())
1558.11.1 by Aaron Bentley
Progress indicator for tree builts
967
        pb = bzrlib.ui.ui_factory.nested_progress_bar()
968
        try:
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
969
            for num, (tree_path, entry) in \
970
                enumerate(tree.inventory.iter_entries_by_dir()):
971
                pb.update("Building tree", num, len(tree.inventory))
1558.11.1 by Aaron Bentley
Progress indicator for tree builts
972
                if entry.parent_id is None:
973
                    continue
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
974
                reparent = False
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
975
                file_id = entry.file_id
976
                target_path = wt.abspath(tree_path)
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
977
                try:
978
                    kind = file_kind(target_path)
979
                except NoSuchFile:
980
                    pass
981
                else:
982
                    if kind == "directory":
983
                        try:
984
                            bzrdir.BzrDir.open(target_path)
985
                        except errors.NotBranchError:
986
                            pass
987
                        else:
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
988
                            divert.add(file_id)
989
                    if (file_id not in divert and
990
                        _content_match(tree, entry, file_id, kind,
991
                        target_path)):
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
992
                        tt.delete_contents(tt.trans_id_tree_path(tree_path))
993
                        if kind == 'directory':
994
                            reparent = True
1558.11.1 by Aaron Bentley
Progress indicator for tree builts
995
                if entry.parent_id not in file_trans_id:
996
                    raise repr(entry.parent_id)
997
                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
998
                file_trans_id[file_id] = new_by_entry(tt, entry, parent_id,
1558.11.1 by Aaron Bentley
Progress indicator for tree builts
999
                                                      tree)
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1000
                if reparent:
1001
                    new_trans_id = file_trans_id[file_id]
1002
                    old_parent = tt.trans_id_tree_path(tree_path)
1003
                    _reparent_children(tt, old_parent, new_trans_id)
1558.11.1 by Aaron Bentley
Progress indicator for tree builts
1004
        finally:
1005
            pb.finished()
1006
        pp.next_phase()
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
1007
        divert_trans = set(file_trans_id[f] for f in divert)
1008
        resolver = lambda t, c: resolve_checkout(t, c, divert_trans)
1009
        raw_conflicts = resolve_conflicts(tt, pass_func=resolver)
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1010
        conflicts = cook_conflicts(raw_conflicts, tt)
1011
        for conflict in conflicts:
1012
            warning(conflict)
1013
        try:
1014
            wt.add_conflicts(conflicts)
1015
        except errors.UnsupportedOperation:
1016
            pass
1534.7.47 by Aaron Bentley
Started work on 'revert'
1017
        tt.apply()
1018
    finally:
1019
        tt.finalize()
1558.11.1 by Aaron Bentley
Progress indicator for tree builts
1020
        top_pb.finished()
1534.7.47 by Aaron Bentley
Started work on 'revert'
1021
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1022
1023
def _reparent_children(tt, old_parent, new_parent):
1024
    for child in tt.iter_tree_children(old_parent):
1025
        tt.adjust_path(tt.final_name(child), new_parent, child)
1026
1027
1028
def _content_match(tree, entry, file_id, kind, target_path):
1029
    if entry.kind != kind:
1030
        return False
1031
    if entry.kind == "directory":
1032
        return True
1033
    if entry.kind == "file":
1034
        if tree.get_file(file_id).read() == file(target_path, 'rb').read():
1035
            return True
1036
    elif entry.kind == "symlink":
1037
        if tree.get_symlink_target(file_id) == os.readlink(target_path):
1038
            return True
1039
    return False
1040
1041
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
1042
def resolve_checkout(tt, conflicts, divert):
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1043
    new_conflicts = set()
1044
    for c_type, conflict in ((c[0], c) for c in conflicts):
1045
        # Anything but a 'duplicate' would indicate programmer error
1046
        assert c_type == 'duplicate', c_type
1047
        # 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
1048
        if tt.new_contents(conflict[1]):
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1049
            new_file = conflict[1]
1050
            old_file = conflict[2]
1051
        else:
1052
            new_file = conflict[2]
1053
            old_file = conflict[1]
1054
1055
        # We should only get here if the conflict wasn't completely
1056
        # resolved
1057
        final_parent = tt.final_parent(old_file)
1966.1.2 by Aaron Bentley
Divert files instead of failing to create them, update from review
1058
        if new_file in divert:
1059
            new_name = tt.final_name(old_file)+'.diverted'
1060
            tt.adjust_path(new_name, final_parent, new_file)
1061
            new_conflicts.add((c_type, 'Diverted to',
1062
                               new_file, old_file))
1063
        else:
1064
            new_name = tt.final_name(old_file)+'.moved'
1065
            tt.adjust_path(new_name, final_parent, old_file)
1066
            new_conflicts.add((c_type, 'Moved existing file to',
1067
                               old_file, new_file))
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1068
    return new_conflicts
1069
1070
1534.7.47 by Aaron Bentley
Started work on 'revert'
1071
def new_by_entry(tt, entry, parent_id, tree):
1534.7.157 by Aaron Bentley
Added more docs
1072
    """Create a new file according to its inventory entry"""
1534.7.47 by Aaron Bentley
Started work on 'revert'
1073
    name = entry.name
1074
    kind = entry.kind
1075
    if kind == 'file':
1534.7.79 by Aaron Bentley
Stopped calling get_file_lines on WorkingTree
1076
        contents = tree.get_file(entry.file_id).readlines()
1534.7.47 by Aaron Bentley
Started work on 'revert'
1077
        executable = tree.is_executable(entry.file_id)
1078
        return tt.new_file(name, parent_id, contents, entry.file_id, 
1079
                           executable)
1080
    elif kind == 'directory':
1534.7.54 by Aaron Bentley
Fixed thinko
1081
        return tt.new_directory(name, parent_id, entry.file_id)
1534.7.47 by Aaron Bentley
Started work on 'revert'
1082
    elif kind == 'symlink':
1534.7.183 by Aaron Bentley
Fixed build_tree with symlinks
1083
        target = tree.get_symlink_target(entry.file_id)
1084
        return tt.new_symlink(name, parent_id, target, entry.file_id)
1534.7.47 by Aaron Bentley
Started work on 'revert'
1085
1534.7.117 by Aaron Bentley
Simplified permission handling of existing files in transform.
1086
def create_by_entry(tt, entry, tree, trans_id, lines=None, mode_id=None):
1534.7.157 by Aaron Bentley
Added more docs
1087
    """Create new file contents according to an inventory entry."""
1534.7.47 by Aaron Bentley
Started work on 'revert'
1088
    if entry.kind == "file":
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
1089
        if lines is None:
1534.7.97 by Aaron Bentley
Ensured foo.BASE is a directory if there's a conflict
1090
            lines = tree.get_file(entry.file_id).readlines()
1534.7.117 by Aaron Bentley
Simplified permission handling of existing files in transform.
1091
        tt.create_file(lines, trans_id, mode_id=mode_id)
1534.7.47 by Aaron Bentley
Started work on 'revert'
1092
    elif entry.kind == "symlink":
1534.7.101 by Aaron Bentley
Got conflicts on symlinks working properly
1093
        tt.create_symlink(tree.get_symlink_target(entry.file_id), trans_id)
1534.7.47 by Aaron Bentley
Started work on 'revert'
1094
    elif entry.kind == "directory":
1534.7.51 by Aaron Bentley
New approach to revert
1095
        tt.create_directory(trans_id)
1534.7.47 by Aaron Bentley
Started work on 'revert'
1096
1534.7.89 by Aaron Bentley
Handle all content types in three-way
1097
def create_entry_executability(tt, entry, trans_id):
1534.7.157 by Aaron Bentley
Added more docs
1098
    """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
1099
    if entry.kind == "file":
1100
        tt.set_executability(entry.executable, trans_id)
1534.7.47 by Aaron Bentley
Started work on 'revert'
1101
1534.7.157 by Aaron Bentley
Added more docs
1102
1534.7.55 by Aaron Bentley
Fixed up the change detection
1103
def find_interesting(working_tree, target_tree, filenames):
1534.7.157 by Aaron Bentley
Added more docs
1104
    """Find the ids corresponding to specified filenames."""
1551.7.7 by Aaron Bentley
Handle revert DIRECTORY
1105
    trees = (working_tree, target_tree)
1551.7.22 by Aaron Bentley
Changes from review
1106
    return tree.find_ids_across_trees(filenames, trees)
1534.7.55 by Aaron Bentley
Fixed up the change detection
1107
1108
1534.7.56 by Aaron Bentley
Implemented the backup file detritus
1109
def change_entry(tt, file_id, working_tree, target_tree, 
1534.10.28 by Aaron Bentley
Use numbered backup files
1110
                 trans_id_file_id, backups, trans_id, by_parent):
1534.7.157 by Aaron Bentley
Added more docs
1111
    """Replace a file_id's contents with those from a target tree."""
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
1112
    e_trans_id = trans_id_file_id(file_id)
1534.7.55 by Aaron Bentley
Fixed up the change detection
1113
    entry = target_tree.inventory[file_id]
1114
    has_contents, contents_mod, meta_mod, = _entry_changes(file_id, entry, 
1115
                                                           working_tree)
1116
    if contents_mod:
1534.7.117 by Aaron Bentley
Simplified permission handling of existing files in transform.
1117
        mode_id = e_trans_id
1534.7.55 by Aaron Bentley
Fixed up the change detection
1118
        if has_contents:
1534.7.56 by Aaron Bentley
Implemented the backup file detritus
1119
            if not backups:
1120
                tt.delete_contents(e_trans_id)
1121
            else:
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
1122
                parent_trans_id = trans_id_file_id(entry.parent_id)
1534.10.28 by Aaron Bentley
Use numbered backup files
1123
                backup_name = get_backup_name(entry, by_parent,
1124
                                              parent_trans_id, tt)
1125
                tt.adjust_path(backup_name, parent_trans_id, e_trans_id)
1534.7.56 by Aaron Bentley
Implemented the backup file detritus
1126
                tt.unversion_file(e_trans_id)
1127
                e_trans_id = tt.create_path(entry.name, parent_trans_id)
1128
                tt.version_file(file_id, e_trans_id)
1129
                trans_id[file_id] = e_trans_id
1534.7.117 by Aaron Bentley
Simplified permission handling of existing files in transform.
1130
        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
1131
        create_entry_executability(tt, entry, e_trans_id)
1132
1711.4.26 by John Arbash Meinel
Fix #45010 correctly. Don't forget the execute bit.
1133
    elif meta_mod:
1134
        tt.set_executability(entry.executable, e_trans_id)
1534.7.55 by Aaron Bentley
Fixed up the change detection
1135
    if tt.final_name(e_trans_id) != entry.name:
1136
        adjust_path  = True
1137
    else:
1138
        parent_id = tt.final_parent(e_trans_id)
1139
        parent_file_id = tt.final_file_id(parent_id)
1140
        if parent_file_id != entry.parent_id:
1141
            adjust_path = True
1142
        else:
1143
            adjust_path = False
1144
    if adjust_path:
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
1145
        parent_trans_id = trans_id_file_id(entry.parent_id)
1534.7.56 by Aaron Bentley
Implemented the backup file detritus
1146
        tt.adjust_path(entry.name, parent_trans_id, e_trans_id)
1534.7.55 by Aaron Bentley
Fixed up the change detection
1147
1148
1534.10.28 by Aaron Bentley
Use numbered backup files
1149
def get_backup_name(entry, by_parent, parent_trans_id, tt):
1150
    """Produce a backup-style name that appears to be available"""
1151
    def name_gen():
1152
        counter = 1
1153
        while True:
1534.10.29 by Aaron Bentley
Fixed backup numbering to match GNU standard better
1154
            yield "%s.~%d~" % (entry.name, counter)
1534.10.28 by Aaron Bentley
Use numbered backup files
1155
            counter += 1
1156
    for name in name_gen():
1157
        if not tt.has_named_child(by_parent, parent_trans_id, name):
1158
            return name
1159
1534.7.55 by Aaron Bentley
Fixed up the change detection
1160
def _entry_changes(file_id, entry, working_tree):
1534.7.156 by Aaron Bentley
PEP8 fixes
1161
    """Determine in which ways the inventory entry has changed.
1534.7.55 by Aaron Bentley
Fixed up the change detection
1162
1163
    Returns booleans: has_contents, content_mod, meta_mod
1164
    has_contents means there are currently contents, but they differ
1165
    contents_mod means contents need to be modified
1166
    meta_mod means the metadata needs to be modified
1167
    """
1168
    cur_entry = working_tree.inventory[file_id]
1169
    try:
1170
        working_kind = working_tree.kind(file_id)
1171
        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.
1172
    except NoSuchFile:
1534.7.55 by Aaron Bentley
Fixed up the change detection
1173
        has_contents = False
1174
        contents_mod = True
1175
        meta_mod = False
1176
    if has_contents is True:
1731.1.1 by Aaron Bentley
Make root entry an InventoryDirectory, make EmptyTree really empty
1177
        if entry.kind != working_kind:
1534.7.55 by Aaron Bentley
Fixed up the change detection
1178
            contents_mod, meta_mod = True, False
1179
        else:
1180
            cur_entry._read_tree_state(working_tree.id2path(file_id), 
1181
                                       working_tree)
1182
            contents_mod, meta_mod = entry.detect_changes(cur_entry)
1534.7.175 by Aaron Bentley
Ensured revert writes a normal inventory
1183
            cur_entry._forget_tree_state()
1534.7.55 by Aaron Bentley
Fixed up the change detection
1184
    return has_contents, contents_mod, meta_mod
1185
1534.7.56 by Aaron Bentley
Implemented the backup file detritus
1186
1534.9.4 by Aaron Bentley
Added progress bars to revert.
1187
def revert(working_tree, target_tree, filenames, backups=False, 
1188
           pb=DummyProgress()):
1534.7.157 by Aaron Bentley
Added more docs
1189
    """Revert a working tree's contents to those of a target tree."""
1534.7.55 by Aaron Bentley
Fixed up the change detection
1190
    interesting_ids = find_interesting(working_tree, target_tree, filenames)
1191
    def interesting(file_id):
1711.9.11 by John Arbash Meinel
change return foo in bar to return (foo in bar)
1192
        return interesting_ids is None or (file_id in interesting_ids)
1534.7.55 by Aaron Bentley
Fixed up the change detection
1193
1534.9.7 by Aaron Bentley
Show progress bars in revert
1194
    tt = TreeTransform(working_tree, pb)
1534.7.47 by Aaron Bentley
Started work on 'revert'
1195
    try:
1558.3.3 by Aaron Bentley
Fix error handling for merge_modified
1196
        merge_modified = working_tree.merge_modified()
1534.7.51 by Aaron Bentley
New approach to revert
1197
        trans_id = {}
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
1198
        def trans_id_file_id(file_id):
1534.7.47 by Aaron Bentley
Started work on 'revert'
1199
            try:
1534.7.51 by Aaron Bentley
New approach to revert
1200
                return trans_id[file_id]
1534.7.47 by Aaron Bentley
Started work on 'revert'
1201
            except KeyError:
1534.7.181 by Aaron Bentley
Renamed a bunch of functions
1202
                return tt.trans_id_tree_file_id(file_id)
1534.7.51 by Aaron Bentley
New approach to revert
1203
1551.2.34 by Aaron Bentley
Refactored the revert phases
1204
        pp = ProgressPhase("Revert phase", 4, pb)
1205
        pp.next_phase()
1534.9.4 by Aaron Bentley
Added progress bars to revert.
1206
        sorted_interesting = [i for i in topology_sorted_ids(target_tree) if
1207
                              interesting(i)]
1551.2.31 by Aaron Bentley
Got merge and revert using nested pbs
1208
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1209
        try:
1534.10.28 by Aaron Bentley
Use numbered backup files
1210
            by_parent = tt.by_parent()
1551.2.31 by Aaron Bentley
Got merge and revert using nested pbs
1211
            for id_num, file_id in enumerate(sorted_interesting):
1212
                child_pb.update("Reverting file", id_num+1, 
1213
                                len(sorted_interesting))
1214
                if file_id not in working_tree.inventory:
1215
                    entry = target_tree.inventory[file_id]
1216
                    parent_id = trans_id_file_id(entry.parent_id)
1217
                    e_trans_id = new_by_entry(tt, entry, parent_id, target_tree)
1218
                    trans_id[file_id] = e_trans_id
1219
                else:
1220
                    backup_this = backups
1221
                    if file_id in merge_modified:
1222
                        backup_this = False
1223
                        del merge_modified[file_id]
1224
                    change_entry(tt, file_id, working_tree, target_tree, 
1534.10.28 by Aaron Bentley
Use numbered backup files
1225
                                 trans_id_file_id, backup_this, trans_id,
1226
                                 by_parent)
1551.2.31 by Aaron Bentley
Got merge and revert using nested pbs
1227
        finally:
1228
            child_pb.finished()
1551.2.34 by Aaron Bentley
Refactored the revert phases
1229
        pp.next_phase()
1534.9.5 by Aaron Bentley
Merged dangling inventory fix
1230
        wt_interesting = [i for i in working_tree.inventory if interesting(i)]
1551.2.31 by Aaron Bentley
Got merge and revert using nested pbs
1231
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1551.8.32 by Aaron Bentley
Fix iteraction of revert and files not present in target_tree
1232
        basis_tree = None
1551.2.31 by Aaron Bentley
Got merge and revert using nested pbs
1233
        try:
1234
            for id_num, file_id in enumerate(wt_interesting):
1235
                child_pb.update("New file check", id_num+1, 
1236
                                len(sorted_interesting))
1237
                if file_id not in target_tree:
1238
                    trans_id = tt.trans_id_tree_file_id(file_id)
1239
                    tt.unversion_file(trans_id)
1551.8.15 by Aaron Bentley
bug #54172: handle new directories properly in revert
1240
                    try:
1241
                        file_kind = working_tree.kind(file_id)
1242
                    except NoSuchFile:
1243
                        file_kind = None
1551.8.32 by Aaron Bentley
Fix iteraction of revert and files not present in target_tree
1244
                    delete_merge_modified = (file_id in merge_modified)
1551.8.15 by Aaron Bentley
bug #54172: handle new directories properly in revert
1245
                    if file_kind != 'file' and file_kind is not None:
1246
                        keep_contents = False
1247
                    else:
1551.8.32 by Aaron Bentley
Fix iteraction of revert and files not present in target_tree
1248
                        if basis_tree is None:
1249
                            basis_tree = working_tree.basis_tree()
1250
                        wt_sha1 = working_tree.get_file_sha1(file_id)
1551.8.15 by Aaron Bentley
bug #54172: handle new directories properly in revert
1251
                        if (file_id in merge_modified and 
1551.8.32 by Aaron Bentley
Fix iteraction of revert and files not present in target_tree
1252
                            merge_modified[file_id] == wt_sha1):
1253
                            keep_contents = False
1254
                        elif (file_id in basis_tree and 
1255
                            basis_tree.get_file_sha1(file_id) == wt_sha1):
1256
                            keep_contents = False
1551.8.15 by Aaron Bentley
bug #54172: handle new directories properly in revert
1257
                        else:
1258
                            keep_contents = True
1259
                    if not keep_contents:
1551.2.31 by Aaron Bentley
Got merge and revert using nested pbs
1260
                        tt.delete_contents(trans_id)
1551.8.15 by Aaron Bentley
bug #54172: handle new directories properly in revert
1261
                    if delete_merge_modified:
1551.2.31 by Aaron Bentley
Got merge and revert using nested pbs
1262
                        del merge_modified[file_id]
1263
        finally:
1264
            child_pb.finished()
1551.2.34 by Aaron Bentley
Refactored the revert phases
1265
        pp.next_phase()
1551.2.31 by Aaron Bentley
Got merge and revert using nested pbs
1266
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1267
        try:
1268
            raw_conflicts = resolve_conflicts(tt, child_pb)
1269
        finally:
1270
            child_pb.finished()
1558.7.13 by Aaron Bentley
WorkingTree.revert returns conflicts
1271
        conflicts = cook_conflicts(raw_conflicts, tt)
1534.10.27 by Aaron Bentley
Merge from mainline
1272
        for conflict in conflicts:
1534.10.24 by Aaron Bentley
Eliminated conflicts_to_strings, made remove_files a ConflictList member
1273
            warning(conflict)
1551.2.34 by Aaron Bentley
Refactored the revert phases
1274
        pp.next_phase()
1534.7.28 by Aaron Bentley
Nearly-working build_tree replacement
1275
        tt.apply()
1534.7.193 by Aaron Bentley
Stopped revert from preserving file contents produced by merges
1276
        working_tree.set_merge_modified({})
1534.7.28 by Aaron Bentley
Nearly-working build_tree replacement
1277
    finally:
1278
        tt.finalize()
1534.9.4 by Aaron Bentley
Added progress bars to revert.
1279
        pb.clear()
1558.7.13 by Aaron Bentley
WorkingTree.revert returns conflicts
1280
    return conflicts
1534.7.51 by Aaron Bentley
New approach to revert
1281
1534.7.57 by Aaron Bentley
Enhanced conflict resolution.
1282
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1283
def resolve_conflicts(tt, pb=DummyProgress(), pass_func=None):
1534.7.57 by Aaron Bentley
Enhanced conflict resolution.
1284
    """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
1285
    if pass_func is None:
1286
        pass_func = conflict_pass
1534.7.169 by Aaron Bentley
Add filesystem/inventory conflicts to conflict output
1287
    new_conflicts = set()
1534.9.1 by Aaron Bentley
Added progress bars to merge
1288
    try:
1289
        for n in range(10):
1290
            pb.update('Resolution pass', n+1, 10)
1291
            conflicts = tt.find_conflicts()
1292
            if len(conflicts) == 0:
1293
                return new_conflicts
1966.1.1 by Aaron Bentley
Implement disk-content merge and conflict resolution for build_tree
1294
            new_conflicts.update(pass_func(tt, conflicts))
1534.9.1 by Aaron Bentley
Added progress bars to merge
1295
        raise MalformedTransform(conflicts=conflicts)
1296
    finally:
1297
        pb.clear()
1534.7.57 by Aaron Bentley
Enhanced conflict resolution.
1298
1299
1300
def conflict_pass(tt, conflicts):
1534.7.157 by Aaron Bentley
Added more docs
1301
    """Resolve some classes of conflicts."""
1534.7.169 by Aaron Bentley
Add filesystem/inventory conflicts to conflict output
1302
    new_conflicts = set()
1534.7.61 by Aaron Bentley
Handled parent loops, missing parents, unversioned parents
1303
    for c_type, conflict in ((c[0], c) for c in conflicts):
1304
        if c_type == 'duplicate id':
1534.7.51 by Aaron Bentley
New approach to revert
1305
            tt.unversion_file(conflict[1])
1534.7.170 by Aaron Bentley
Cleaned up filesystem conflict handling
1306
            new_conflicts.add((c_type, 'Unversioned existing file',
1307
                               conflict[1], conflict[2], ))
1534.7.61 by Aaron Bentley
Handled parent loops, missing parents, unversioned parents
1308
        elif c_type == 'duplicate':
1534.7.57 by Aaron Bentley
Enhanced conflict resolution.
1309
            # files that were renamed take precedence
1310
            new_name = tt.final_name(conflict[1])+'.moved'
1311
            final_parent = tt.final_parent(conflict[1])
1312
            if tt.path_changed(conflict[1]):
1313
                tt.adjust_path(new_name, final_parent, conflict[2])
1534.7.171 by Aaron Bentley
Implemented stringifying filesystem conflicts
1314
                new_conflicts.add((c_type, 'Moved existing file to', 
1315
                                   conflict[2], conflict[1]))
1534.7.57 by Aaron Bentley
Enhanced conflict resolution.
1316
            else:
1317
                tt.adjust_path(new_name, final_parent, conflict[1])
1534.7.171 by Aaron Bentley
Implemented stringifying filesystem conflicts
1318
                new_conflicts.add((c_type, 'Moved existing file to', 
1319
                                  conflict[1], conflict[2]))
1534.7.61 by Aaron Bentley
Handled parent loops, missing parents, unversioned parents
1320
        elif c_type == 'parent loop':
1321
            # break the loop by undoing one of the ops that caused the loop
1322
            cur = conflict[1]
1323
            while not tt.path_changed(cur):
1324
                cur = tt.final_parent(cur)
1534.7.170 by Aaron Bentley
Cleaned up filesystem conflict handling
1325
            new_conflicts.add((c_type, 'Cancelled move', cur,
1326
                               tt.final_parent(cur),))
1534.7.61 by Aaron Bentley
Handled parent loops, missing parents, unversioned parents
1327
            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
1328
            
1534.7.61 by Aaron Bentley
Handled parent loops, missing parents, unversioned parents
1329
        elif c_type == 'missing parent':
1534.7.128 by Aaron Bentley
Got missing contents test working
1330
            trans_id = conflict[1]
1331
            try:
1332
                tt.cancel_deletion(trans_id)
1551.8.22 by Aaron Bentley
Improve message when OTHER deletes an in-use tree
1333
                new_conflicts.add(('deleting parent', 'Not deleting', 
1334
                                   trans_id))
1534.7.128 by Aaron Bentley
Got missing contents test working
1335
            except KeyError:
1336
                tt.create_directory(trans_id)
1551.8.22 by Aaron Bentley
Improve message when OTHER deletes an in-use tree
1337
                new_conflicts.add((c_type, 'Created directory', trans_id))
1534.7.61 by Aaron Bentley
Handled parent loops, missing parents, unversioned parents
1338
        elif c_type == 'unversioned parent':
1534.7.148 by Aaron Bentley
Handled the remaining file versioning case
1339
            tt.version_file(tt.inactive_file_id(conflict[1]), conflict[1])
1534.7.171 by Aaron Bentley
Implemented stringifying filesystem conflicts
1340
            new_conflicts.add((c_type, 'Versioned directory', conflict[1]))
1534.7.169 by Aaron Bentley
Add filesystem/inventory conflicts to conflict output
1341
    return new_conflicts
1342
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
1343
1534.7.169 by Aaron Bentley
Add filesystem/inventory conflicts to conflict output
1344
def cook_conflicts(raw_conflicts, tt):
1534.7.170 by Aaron Bentley
Cleaned up filesystem conflict handling
1345
    """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
1346
    from bzrlib.conflicts import Conflict
1347
    conflict_iter = iter_cook_conflicts(raw_conflicts, tt)
1348
    return sorted(conflict_iter, key=Conflict.sort_key)
1534.7.170 by Aaron Bentley
Cleaned up filesystem conflict handling
1349
1534.7.169 by Aaron Bentley
Add filesystem/inventory conflicts to conflict output
1350
1351
def iter_cook_conflicts(raw_conflicts, tt):
1534.10.19 by Aaron Bentley
Stanza conversion, cooking
1352
    from bzrlib.conflicts import Conflict
1534.7.170 by Aaron Bentley
Cleaned up filesystem conflict handling
1353
    fp = FinalPaths(tt)
1534.7.169 by Aaron Bentley
Add filesystem/inventory conflicts to conflict output
1354
    for conflict in raw_conflicts:
1355
        c_type = conflict[0]
1534.7.170 by Aaron Bentley
Cleaned up filesystem conflict handling
1356
        action = conflict[1]
1357
        modified_path = fp.get_path(conflict[2])
1358
        modified_id = tt.final_file_id(conflict[2])
1359
        if len(conflict) == 3:
1534.10.19 by Aaron Bentley
Stanza conversion, cooking
1360
            yield Conflict.factory(c_type, action=action, path=modified_path,
1361
                                     file_id=modified_id)
1362
             
1534.7.170 by Aaron Bentley
Cleaned up filesystem conflict handling
1363
        else:
1364
            conflicting_path = fp.get_path(conflict[3])
1365
            conflicting_id = tt.final_file_id(conflict[3])
1534.10.19 by Aaron Bentley
Stanza conversion, cooking
1366
            yield Conflict.factory(c_type, action=action, path=modified_path,
1367
                                   file_id=modified_id, 
1368
                                   conflict_path=conflicting_path,
1369
                                   conflict_file_id=conflicting_id)