/brz/remove-bazaar

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