/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
70 by mbp at sourcefrog
Prepare for smart recursive add.
1
# Copyright (C) 2005 Canonical Ltd
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
2
#
1 by mbp at sourcefrog
import from baz patch-364
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
#
1 by mbp at sourcefrog
import from baz patch-364
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
#
1 by mbp at sourcefrog
import from baz patch-364
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
17
"""Tree classes, representing directory at point in time.
18
"""
19
849 by Martin Pool
- Put files inside an exported tarball into a top-level directory rather than
20
import os
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
21
from cStringIO import StringIO
800 by Martin Pool
Merge John's import-speedup branch:
22
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
23
import bzrlib
2079.1.1 by John Arbash Meinel
Create a deprecated bzrlib.tree.RevisionTree() in favor of bzrlib.revisiontree.RevisionTree()
24
from bzrlib import (
25
    delta,
2012.1.8 by Aaron Bentley
Merge from bzr.dev
26
    osutils,
2079.1.1 by John Arbash Meinel
Create a deprecated bzrlib.tree.RevisionTree() in favor of bzrlib.revisiontree.RevisionTree()
27
    symbol_versioning,
28
    )
1852.11.1 by Robert Collins
Deprecate compare_trees and move its body to InterTree.changes_from.
29
from bzrlib.decorators import needs_read_lock
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
30
from bzrlib.errors import BzrError, BzrCheckError
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
31
from bzrlib import errors
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
32
from bzrlib.inventory import Inventory
1852.8.2 by Robert Collins
Add InterTree class to represent InterTree operations.
33
from bzrlib.inter import InterObject
1732.1.1 by John Arbash Meinel
deprecating appendpath, it does exactly what pathjoin does
34
from bzrlib.osutils import fingerprint_file
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
35
import bzrlib.revision
36
from bzrlib.trace import mutter, note
1 by mbp at sourcefrog
import from baz patch-364
37
1852.5.1 by Robert Collins
Deprecate EmptyTree in favour of using Repository.revision_tree.
38
558 by Martin Pool
- All top-level classes inherit from object
39
class Tree(object):
1 by mbp at sourcefrog
import from baz patch-364
40
    """Abstract file tree.
41
42
    There are several subclasses:
43
    
44
    * `WorkingTree` exists as files on disk editable by the user.
45
46
    * `RevisionTree` is a tree as recorded at some point in the past.
47
48
    Trees contain an `Inventory` object, and also know how to retrieve
49
    file texts mentioned in the inventory, either from a working
50
    directory or from a store.
51
52
    It is possible for trees to contain files that are not described
53
    in their inventory or vice versa; for this use `filenames()`.
54
55
    Trees can be compared, etc, regardless of whether they are working
56
    trees or versioned trees.
57
    """
58
    
1852.9.6 by Robert Collins
Merge the change from Tree.compare to Tree.changes_from.
59
    def changes_from(self, other, want_unchanged=False, specific_files=None,
1731.1.33 by Aaron Bentley
Revert no-special-root changes
60
        extra_trees=None, require_versioned=False, include_root=False):
1852.8.8 by Robert Collins
change Tree.compare to Tree.changes_from - its better for the common case.
61
        """Return a TreeDelta of the changes from other to this tree.
1852.9.3 by Robert Collins
Convert the test_delta tests to intertree_implementation and workingtree_implementation tests as appropriate.
62
63
        :param other: A tree to compare with.
64
        :param specific_files: An optional list of file paths to restrict the
65
            comparison to. When mapping filenames to ids, all matches in all
66
            trees (including optional extra_trees) are used, and all children of
67
            matched directories are included.
1852.9.4 by Robert Collins
Add minimal test for Tree.compare(extra_trees=...).
68
        :param want_unchanged: An optional boolean requesting the inclusion of
69
            unchanged entries in the result.
70
        :param extra_trees: An optional list of additional trees to use when
71
            mapping the contents of specific_files (paths) to file_ids.
1852.9.5 by Robert Collins
Add tests for require_versioned to the InterTree.compare() test suite.
72
        :param require_versioned: An optional boolean (defaults to False). When
73
            supplied and True all the 'specific_files' must be versioned, or
74
            a PathsNotVersionedError will be thrown.
1852.9.3 by Robert Collins
Convert the test_delta tests to intertree_implementation and workingtree_implementation tests as appropriate.
75
1852.8.4 by Robert Collins
Hook InterTree into Tree.
76
        The comparison will be performed by an InterTree object looked up on 
77
        self and other.
78
        """
1852.8.8 by Robert Collins
change Tree.compare to Tree.changes_from - its better for the common case.
79
        # Martin observes that Tree.changes_from returns a TreeDelta and this
80
        # may confuse people, because the class name of the returned object is
81
        # a synonym of the object referenced in the method name.
1852.9.6 by Robert Collins
Merge the change from Tree.compare to Tree.changes_from.
82
        return InterTree.get(other, self).compare(
1852.9.4 by Robert Collins
Add minimal test for Tree.compare(extra_trees=...).
83
            want_unchanged=want_unchanged,
84
            specific_files=specific_files,
1852.9.5 by Robert Collins
Add tests for require_versioned to the InterTree.compare() test suite.
85
            extra_trees=extra_trees,
86
            require_versioned=require_versioned,
1731.1.33 by Aaron Bentley
Revert no-special-root changes
87
            include_root=include_root
1852.9.5 by Robert Collins
Add tests for require_versioned to the InterTree.compare() test suite.
88
            )
2012.1.1 by Aaron Bentley
Implement change iterator
89
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
90
    def _iter_changes(self, from_tree, include_unchanged=False,
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
91
                     specific_files=None, pb=None, extra_trees=None,
92
                     require_versioned=True):
2012.1.5 by Aaron Bentley
Implement specific file id and dangling id handling
93
        intertree = InterTree.get(from_tree, self)
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
94
        return intertree._iter_changes(include_unchanged, specific_files, pb,
95
            extra_trees, require_versioned)
1852.8.4 by Robert Collins
Hook InterTree into Tree.
96
    
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
97
    def conflicts(self):
98
        """Get a list of the conflicts in the tree.
99
100
        Each conflict is an instance of bzrlib.conflicts.Conflict.
101
        """
102
        return []
103
104
    def get_parent_ids(self):
105
        """Get the parent ids for this tree. 
106
107
        :return: a list of parent ids. [] is returned to indicate
108
        a tree with no parents.
109
        :raises: BzrError if the parents are not known.
110
        """
111
        raise NotImplementedError(self.get_parent_ids)
112
    
1 by mbp at sourcefrog
import from baz patch-364
113
    def has_filename(self, filename):
114
        """True if the tree has given filename."""
115
        raise NotImplementedError()
116
1185.12.39 by abentley
Propogated has_or_had_id to Tree
117
    def has_id(self, file_id):
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
118
        file_id = osutils.safe_file_id(file_id)
1185.12.39 by abentley
Propogated has_or_had_id to Tree
119
        return self.inventory.has_id(file_id)
120
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
121
    __contains__ = has_id
122
1185.12.39 by abentley
Propogated has_or_had_id to Tree
123
    def has_or_had_id(self, file_id):
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
124
        file_id = osutils.safe_file_id(file_id)
1185.12.39 by abentley
Propogated has_or_had_id to Tree
125
        if file_id == self.inventory.root.file_id:
1185.12.38 by abentley
semi-broke merge
126
            return True
1 by mbp at sourcefrog
import from baz patch-364
127
        return self.inventory.has_id(file_id)
128
462 by Martin Pool
- New form 'file_id in tree' to check if the file is present
129
    def __iter__(self):
130
        return iter(self.inventory)
131
1 by mbp at sourcefrog
import from baz patch-364
132
    def id2path(self, file_id):
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
133
        file_id = osutils.safe_file_id(file_id)
1 by mbp at sourcefrog
import from baz patch-364
134
        return self.inventory.id2path(file_id)
135
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
136
    def is_control_filename(self, filename):
137
        """True if filename is the name of a control file in this tree.
138
        
139
        :param filename: A filename within the tree. This is a relative path
140
        from the root of this tree.
141
142
        This is true IF and ONLY IF the filename is part of the meta data
143
        that bzr controls in this tree. I.E. a random .bzr directory placed
144
        on disk will not be a control file for this tree.
145
        """
146
        return self.bzrdir.is_control_filename(filename)
147
2255.2.15 by Robert Collins
Dirstate - truncate state file fixing bug in saving a smaller file, get more tree_implementation tests passing.
148
    @needs_read_lock
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
149
    def iter_entries_by_dir(self, specific_file_ids=None):
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
150
        """Walk the tree in 'by_dir' order.
151
152
        This will yield each entry in the tree as a (path, entry) tuple. The
153
        order that they are yielded is: the contents of a directory are 
154
        preceeded by the parent of a directory, and all the contents of a 
155
        directory are grouped together.
156
        """
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
157
        return self.inventory.iter_entries_by_dir(
158
            specific_file_ids=specific_file_ids)
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
159
2100.3.27 by Aaron Bentley
Enable nested commits
160
    def iter_reference_entries(self):
161
        for path, entry in self.iter_entries_by_dir():
162
            if entry.kind == 'tree-reference':
163
                yield path, entry
164
1465 by Robert Collins
Bugfix the new pull --clobber to not generate spurious conflicts.
165
    def kind(self, file_id):
2255.2.159 by Martin Pool
reference-trees in dirstate pass all tests.
166
        raise NotImplementedError("Tree subclass %s must implement kind"
167
            % self.__class__.__name__)
1465 by Robert Collins
Bugfix the new pull --clobber to not generate spurious conflicts.
168
2100.3.20 by Aaron Bentley
Implement tree comparison for tree references
169
    def get_reference_revision(self, entry, path=None):
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
170
        raise NotImplementedError("Tree subclass %s must implement "
171
                                  "get_reference_revision"
172
            % self.__class__.__name__)
2100.3.20 by Aaron Bentley
Implement tree comparison for tree references
173
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
174
    def _comparison_data(self, entry, path):
2012.1.15 by Aaron Bentley
Minor tweaks
175
        """Return a tuple of kind, executable, stat_value for a file.
176
177
        entry may be None if there is no inventory entry for the file, but
178
        path must always be supplied.
179
180
        kind is None if there is no file present (even if an inventory id is
181
        present).  executable is False for non-file entries.
182
        """
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
183
        raise NotImplementedError(self._comparison_data)
184
2255.2.10 by Robert Collins
Now all tests matching dirstate pass - added generation of inventories for parent trees.
185
    def _file_size(self, entry, stat_value):
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
186
        raise NotImplementedError(self._file_size)
187
1 by mbp at sourcefrog
import from baz patch-364
188
    def _get_inventory(self):
189
        return self._inventory
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
190
    
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
191
    def get_file(self, file_id):
192
        """Return a file object for the file file_id in the tree."""
193
        raise NotImplementedError(self.get_file)
2255.7.36 by John Arbash Meinel
All trees should implement get_file_mtime()
194
195
    def get_file_mtime(self, file_id, path=None):
196
        """Return the modification time for a file.
197
198
        :param file_id: The handle for this file.
199
        :param path: The path that this file can be found at.
200
            These must point to the same object.
201
        """
202
        raise NotImplementedError(self.get_file_mtime)
203
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
204
    def get_file_by_path(self, path):
205
        return self.get_file(self._inventory.path2id(path))
1 by mbp at sourcefrog
import from baz patch-364
206
2255.2.134 by John Arbash Meinel
Add a tree-test for get_symlink_target
207
    def get_symlink_target(self, file_id):
208
        """Get the target for a given file_id.
209
210
        It is assumed that the caller already knows that file_id is referencing
211
        a symlink.
212
        :param file_id: Handle for the symlink entry.
213
        :return: The path the symlink points to.
214
        """
215
        raise NotImplementedError(self.get_symlink_target)
216
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
217
    def annotate_iter(self, file_id):
1551.9.18 by Aaron Bentley
Updates from review comments
218
        """Return an iterator of revision_id, line tuples
219
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
220
        For working trees (and mutable trees in general), the special
221
        revision_id 'current:' will be used for lines that are new in this
222
        tree, e.g. uncommitted changes.
223
        :param file_id: The file to produce an annotated version from
224
        """
225
        raise NotImplementedError(self.annotate_iter)
226
1 by mbp at sourcefrog
import from baz patch-364
227
    inventory = property(_get_inventory,
228
                         doc="Inventory of this Tree")
229
230
    def _check_retrieved(self, ie, f):
1364 by Martin Pool
- remove extra verification of files retrieved from tree
231
        if not __debug__:
232
            return  
130 by mbp at sourcefrog
- fixup checks on retrieved files to cope with compression,
233
        fp = fingerprint_file(f)
234
        f.seek(0)
235
        
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
236
        if ie.text_size is not None:
131 by mbp at sourcefrog
check size and sha1 of files retrieved from the tree
237
            if ie.text_size != fp['size']:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
238
                raise BzrError("mismatched size for file %r in %r" % (ie.file_id, self._store),
1 by mbp at sourcefrog
import from baz patch-364
239
                        ["inventory expects %d bytes" % ie.text_size,
130 by mbp at sourcefrog
- fixup checks on retrieved files to cope with compression,
240
                         "file is actually %d bytes" % fp['size'],
1 by mbp at sourcefrog
import from baz patch-364
241
                         "store is probably damaged/corrupt"])
242
130 by mbp at sourcefrog
- fixup checks on retrieved files to cope with compression,
243
        if ie.text_sha1 != fp['sha1']:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
244
            raise BzrError("wrong SHA-1 for file %r in %r" % (ie.file_id, self._store),
1 by mbp at sourcefrog
import from baz patch-364
245
                    ["inventory expects %s" % ie.text_sha1,
130 by mbp at sourcefrog
- fixup checks on retrieved files to cope with compression,
246
                     "file is actually %s" % fp['sha1'],
1 by mbp at sourcefrog
import from baz patch-364
247
                     "store is probably damaged/corrupt"])
248
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
249
    def path2id(self, path):
250
        """Return the id for path in this tree."""
251
        return self._inventory.path2id(path)
1 by mbp at sourcefrog
import from baz patch-364
252
2255.2.101 by Robert Collins
Finish making Tree.ids2paths support the file_ids_across_trees api.
253
    def paths2ids(self, paths, trees=[], require_versioned=True):
2255.2.100 by Robert Collins
Create a paths2ids api to replace find_ids_across_trees, with tests.
254
        """Return all the ids that can be reached by walking from paths.
255
        
256
        Each path is looked up in each this tree and any extras provided in
257
        trees, and this is repeated recursively: the children in an extra tree
258
        of a directory that has been renamed under a provided path in this tree
259
        are all returned, even if none exist until a provided path in this
260
        tree, and vice versa.
2255.2.101 by Robert Collins
Finish making Tree.ids2paths support the file_ids_across_trees api.
261
262
        :param paths: An iterable of paths to start converting to ids from.
2255.2.104 by Robert Collins
Add WorkingTree4.paths2ids which is inventory-usage free if the trees being examined are in the dirstate.
263
            Alternatively, if paths is None, no ids should be calculated and None
264
            will be returned. This is offered to make calling the api unconditional
265
            for code that *might* take a list of files.
2255.2.101 by Robert Collins
Finish making Tree.ids2paths support the file_ids_across_trees api.
266
        :param trees: Additional trees to consider.
267
        :param require_versioned: If False, do not raise NotVersionedError if
268
            an element of paths is not versioned in this tree and all of trees.
2255.2.100 by Robert Collins
Create a paths2ids api to replace find_ids_across_trees, with tests.
269
        """
2255.2.105 by Robert Collins
Unfuck InterTree.compare which I broke with the paths2ids implementation.
270
        return find_ids_across_trees(paths, [self] + list(trees), require_versioned)
2255.2.100 by Robert Collins
Create a paths2ids api to replace find_ids_across_trees, with tests.
271
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
272
    def print_file(self, file_id):
273
        """Print file with id `file_id` to stdout."""
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
274
        file_id = osutils.safe_file_id(file_id)
176 by mbp at sourcefrog
New cat command contributed by janmar.
275
        import sys
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
276
        sys.stdout.write(self.get_file_text(file_id))
1543.1.1 by Denys Duchier
lock operations for trees - use them for diff
277
278
    def lock_read(self):
279
        pass
280
1908.11.1 by Robert Collins
Add a new method ``Tree.revision_tree`` which allows access to cached
281
    def revision_tree(self, revision_id):
282
        """Obtain a revision tree for the revision revision_id.
283
284
        The intention of this method is to allow access to possibly cached
285
        tree data. Implementors of this method should raise NoSuchRevision if
286
        the tree is not locally available, even if they could obtain the 
287
        tree via a repository or some other means. Callers are responsible 
288
        for finding the ultimate source for a revision tree.
289
290
        :param revision_id: The revision_id of the requested tree.
291
        :return: A Tree.
292
        :raises: NoSuchRevision if the tree cannot be obtained.
293
        """
294
        raise errors.NoSuchRevisionInTree(self, revision_id)
295
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
296
    def unknowns(self):
297
        """What files are present in this tree and unknown.
298
        
299
        :return: an iterator over the unknown files.
300
        """
301
        return iter([])
302
1543.1.1 by Denys Duchier
lock operations for trees - use them for diff
303
    def unlock(self):
304
        pass
1658.1.9 by Martin Pool
Give an error for bzr diff on an nonexistent file (Malone #3619)
305
306
    def filter_unversioned_files(self, paths):
307
        """Filter out paths that are not versioned.
308
309
        :return: set of paths.
310
        """
1658.1.10 by Martin Pool
diff on unversiond files should give an error (Malone #3619)
311
        # NB: we specifically *don't* call self.has_filename, because for
312
        # WorkingTrees that can indicate files that exist on disk but that 
313
        # are not versioned.
314
        pred = self.inventory.has_filename
315
        return set((p for p in paths if not pred(p)))
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
316
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
317
    def walkdirs(self, prefix=""):
318
        """Walk the contents of this tree from path down.
319
320
        This yields all the data about the contents of a directory at a time.
321
        After each directory has been yielded, if the caller has mutated the
322
        list to exclude some directories, they are then not descended into.
323
        
324
        The data yielded is of the form:
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
325
        ((directory-relpath, directory-path-from-root, directory-fileid),
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
326
        [(relpath, basename, kind, lstat, path_from_tree_root, file_id, 
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
327
          versioned_kind), ...]),
328
         - directory-relpath is the containing dirs relpath from prefix
329
         - directory-path-from-root is the containing dirs path from /
330
         - directory-fileid is the id of the directory if it is versioned.
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
331
         - relpath is the relative path within the subtree being walked.
332
         - basename is the basename
333
         - kind is the kind of the file now. If unknonwn then the file is not
334
           present within the tree - but it may be recorded as versioned. See
335
           versioned_kind.
336
         - lstat is the stat data *if* the file was statted.
337
         - path_from_tree_root is the path from the root of the tree.
338
         - file_id is the file_id is the entry is versioned.
339
         - versioned_kind is the kind of the file as last recorded in the 
340
           versioning system. If 'unknown' the file is not versioned.
341
        One of 'kind' and 'versioned_kind' must not be 'unknown'.
342
343
        :param prefix: Start walking from prefix within the tree rather than
344
        at the root. This allows one to walk a subtree but get paths that are
345
        relative to a tree rooted higher up.
346
        :return: an iterator over the directory data.
347
        """
348
        raise NotImplementedError(self.walkdirs)
349
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
350
1 by mbp at sourcefrog
import from baz patch-364
351
class EmptyTree(Tree):
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
352
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
353
    def __init__(self):
1731.1.33 by Aaron Bentley
Revert no-special-root changes
354
        self._inventory = Inventory(root_id=None)
2079.1.1 by John Arbash Meinel
Create a deprecated bzrlib.tree.RevisionTree() in favor of bzrlib.revisiontree.RevisionTree()
355
        symbol_versioning.warn('EmptyTree is deprecated as of bzr 0.9 please'
356
                               ' use repository.revision_tree instead.',
357
                               DeprecationWarning, stacklevel=2)
1 by mbp at sourcefrog
import from baz patch-364
358
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
359
    def get_parent_ids(self):
360
        return []
361
1092.2.6 by Robert Collins
symlink support updated to work
362
    def get_symlink_target(self, file_id):
363
        return None
364
1 by mbp at sourcefrog
import from baz patch-364
365
    def has_filename(self, filename):
366
        return False
367
1907.1.4 by Aaron Bentley
Restore RootEntry, but mark it deprecated, restore EmptyTree.kind
368
    def kind(self, file_id):
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
369
        file_id = osutils.safe_file_id(file_id)
1907.1.4 by Aaron Bentley
Restore RootEntry, but mark it deprecated, restore EmptyTree.kind
370
        assert self._inventory[file_id].kind == "directory"
371
        return "directory"
372
1731.1.56 by Aaron Bentley
Fix EmptyTree's default include_root
373
    def list_files(self, include_root=False):
1732.1.14 by John Arbash Meinel
Some speedups by not calling pathjoin()
374
        return iter([])
1 by mbp at sourcefrog
import from baz patch-364
375
    
974.1.12 by aaron.bentley at utoronto
Switched from text-id to hashcache for merge optimization
376
    def __contains__(self, file_id):
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
377
        file_id = osutils.safe_file_id(file_id)
1711.9.11 by John Arbash Meinel
change return foo in bar to return (foo in bar)
378
        return (file_id in self._inventory)
974.1.12 by aaron.bentley at utoronto
Switched from text-id to hashcache for merge optimization
379
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
380
    def get_file_sha1(self, file_id, path=None, stat_value=None):
974.1.14 by aaron.bentley at utoronto
Fixed bugs in merge optimization
381
        return None
382
383
1 by mbp at sourcefrog
import from baz patch-364
384
######################################################################
385
# diff
386
387
# TODO: Merge these two functions into a single one that can operate
388
# on either a whole tree or a set of files.
389
390
# TODO: Return the diff in order by filename, not by category or in
391
# random order.  Can probably be done by lock-stepping through the
392
# filenames from both trees.
393
394
395
def file_status(filename, old_tree, new_tree):
396
    """Return single-letter status, old and new names for a file.
397
398
    The complexity here is in deciding how to represent renames;
399
    many complex cases are possible.
400
    """
401
    old_inv = old_tree.inventory
402
    new_inv = new_tree.inventory
403
    new_id = new_inv.path2id(filename)
404
    old_id = old_inv.path2id(filename)
405
406
    if not new_id and not old_id:
407
        # easy: doesn't exist in either; not versioned at all
408
        if new_tree.is_ignored(filename):
409
            return 'I', None, None
410
        else:
411
            return '?', None, None
412
    elif new_id:
413
        # There is now a file of this name, great.
414
        pass
415
    else:
416
        # There is no longer a file of this name, but we can describe
417
        # what happened to the file that used to have
418
        # this name.  There are two possibilities: either it was
419
        # deleted entirely, or renamed.
420
        assert old_id
421
        if new_inv.has_id(old_id):
422
            return 'X', old_inv.id2path(old_id), new_inv.id2path(old_id)
423
        else:
424
            return 'D', old_inv.id2path(old_id), None
425
426
    # if the file_id is new in this revision, it is added
427
    if new_id and not old_inv.has_id(new_id):
428
        return 'A'
429
430
    # if there used to be a file of this name, but that ID has now
431
    # disappeared, it is deleted
432
    if old_id and not new_inv.has_id(old_id):
433
        return 'D'
434
435
    return 'wtf?'
436
437
    
438
164 by mbp at sourcefrog
new 'renames' command
439
def find_renames(old_inv, new_inv):
440
    for file_id in old_inv:
441
        if file_id not in new_inv:
442
            continue
443
        old_name = old_inv.id2path(file_id)
444
        new_name = new_inv.id2path(file_id)
445
        if old_name != new_name:
446
            yield (old_name, new_name)
447
            
678 by Martin Pool
- export to tarballs
448
1551.7.22 by Aaron Bentley
Changes from review
449
def find_ids_across_trees(filenames, trees, require_versioned=True):
450
    """Find the ids corresponding to specified filenames.
451
    
452
    All matches in all trees will be used, and all children of matched
453
    directories will be used.
454
1551.10.7 by Aaron Bentley
Use new-style output for status
455
    :param filenames: The filenames to find file_ids for (if None, returns
456
        None)
1551.7.22 by Aaron Bentley
Changes from review
457
    :param trees: The trees to find file_ids within
458
    :param require_versioned: if true, all specified filenames must occur in
459
    at least one tree.
460
    :return: a set of file ids for the specified filenames and their children.
461
    """
462
    if not filenames:
463
        return None
2255.2.82 by Robert Collins
various notes about find_ids_across_trees
464
    specified_path_ids = _find_ids_across_trees(filenames, trees,
465
        require_versioned)
466
    return _find_children_across_trees(specified_path_ids, trees)
467
#    specified_ids = [id for path, id in _find_path_ids_across_trees(filenames, trees, require_versioned)]
468
#    return _find_children_across_trees(specified_ids, trees)
469
470
def find_path_ids_across_trees(filenames, trees, require_versioned=True):
471
    """Find the paths and ids corresponding to specified filenames.
472
    
473
    All matches in all trees will be used, and all children of matched
474
    directories will be included
475
476
    :param filenames: The filenames to find file_ids for
477
    :param trees: The trees to find file_ids within
478
    :param require_versioned: if true, all specified filenames must occur in
479
        at least one tree.
480
    :return: a set of (path, file ids) for the specified filenames and their
481
        children. The returned path is the path of the id in the first tree
482
        that contains it. This matters when files have been moved 
483
    """
484
    if not filenames:
485
        return set()
486
    # This function needs to know the ids for filenames in all trees, then
487
    # search for those same files and children in all the other trees.
488
    # it is complicated by the same path in two trees being able to have
489
    # different ids, which might both be present in both trees.
490
    # consider two trees, which have had 'mv foo bar' and 'mv baz foo' done
491
    # in this case, a diff of 'foo' should should changes to both the current
492
    # 'bar' and the current 'foo' which was baz. Its arguable that if 
493
    # the situation is 'mv parent/foo bar' and 'mv baz parent/foo', that 
494
    # we should return the current bar and the current parent/foo' - at the 
495
    # moment we do, but we loop around all ids and all trees: I*T checks.
496
    
497
    # Updating this algorithm to be fast in the common case:
498
    # nothing has moved, all files have the same id in parent, child and there
499
    # are only two trees (or one is working tree and the others are parents).
500
    # walk the dirstate. as we find each path, gather the paths of that
501
    # id in all trees. add a mapping from the id to the path in those trees.
502
    # now lookup children by id, again in all trees; for these trees that
503
    # nothing has moved in, the id->path mapping will allow us to find the
504
    # parent trivially. To answer 'has anything been moved' in one of the
505
    # dirstate parent trees though, we will need to stare harder at it.
506
507
    #  Now, given a path index, that is trivial for any one tree, and given
508
    #  that we can ask for additional data from a dirstate tree, its a single
509
    #  pass, though it will require scanning the entire tree to find paths
510
    #  that were at the current location.
511
    # ideal results?: There are three things: tree, path, id. Pathologically
512
    # we can have completely disjoint ids for each tree; but we cannot have 
513
    # disjoin paths for each tree, except if we scan each tree for the 
514
    # different ids from other trees.
515
516
    specified_path_ids = _find_ids_across_trees(filenames, trees,
517
        require_versioned)
518
    return _find_path_id_children_across_trees(specified_path_ids, trees)
519
520
521
def _find_ids_across_trees(filenames, trees, require_versioned):
1551.7.22 by Aaron Bentley
Changes from review
522
    """Find the ids corresponding to specified filenames.
523
    
2255.2.82 by Robert Collins
various notes about find_ids_across_trees
524
    All matches in all trees will be used, but subdirectories are not scanned.
1551.7.22 by Aaron Bentley
Changes from review
525
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
526
    :param filenames: The filenames to find file_ids for
527
    :param trees: The trees to find file_ids within
1551.7.16 by Aaron Bentley
Fix docs
528
    :param require_versioned: if true, all specified filenames must occur in
2255.2.82 by Robert Collins
various notes about find_ids_across_trees
529
        at least one tree.
530
    :return: a set of (path, file ids) for the specified filenames
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
531
    """
1551.7.17 by Aaron Bentley
Switch to PathsNotVersioned, accept extra_trees
532
    not_versioned = []
1551.7.18 by Aaron Bentley
Indentation and documentation fixes
533
    interesting_ids = set()
534
    for tree_path in filenames:
535
        not_found = True
536
        for tree in trees:
2255.2.82 by Robert Collins
various notes about find_ids_across_trees
537
            file_id = tree.path2id(tree_path)
1551.7.18 by Aaron Bentley
Indentation and documentation fixes
538
            if file_id is not None:
539
                interesting_ids.add(file_id)
540
                not_found = False
541
        if not_found:
542
            not_versioned.append(tree_path)
1551.7.22 by Aaron Bentley
Changes from review
543
    if len(not_versioned) > 0 and require_versioned:
544
        raise errors.PathsNotVersionedError(not_versioned)
545
    return interesting_ids
546
547
548
def _find_children_across_trees(specified_ids, trees):
549
    """Return a set including specified ids and their children
1551.7.18 by Aaron Bentley
Indentation and documentation fixes
550
    
1551.7.22 by Aaron Bentley
Changes from review
551
    All matches in all trees will be used.
552
553
    :param trees: The trees to find file_ids within
554
    :return: a set containing all specified ids and their children 
555
    """
556
    interesting_ids = set(specified_ids)
1551.7.18 by Aaron Bentley
Indentation and documentation fixes
557
    pending = interesting_ids
558
    # now handle children of interesting ids
559
    # we loop so that we handle all children of each id in both trees
560
    while len(pending) > 0:
561
        new_pending = set()
562
        for file_id in pending:
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
563
            for tree in trees:
2255.2.82 by Robert Collins
various notes about find_ids_across_trees
564
                if not tree.has_id(file_id):
1551.7.18 by Aaron Bentley
Indentation and documentation fixes
565
                    continue
566
                entry = tree.inventory[file_id]
567
                for child in getattr(entry, 'children', {}).itervalues():
568
                    if child.file_id not in interesting_ids:
569
                        new_pending.add(child.file_id)
570
        interesting_ids.update(new_pending)
571
        pending = new_pending
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
572
    return interesting_ids
1852.8.2 by Robert Collins
Add InterTree class to represent InterTree operations.
573
574
575
class InterTree(InterObject):
576
    """This class represents operations taking place between two Trees.
577
578
    Its instances have methods like 'compare' and contain references to the
579
    source and target trees these operations are to be carried out on.
580
581
    clients of bzrlib should not need to use InterTree directly, rather they
582
    should use the convenience methods on Tree such as 'Tree.compare()' which
583
    will pass through to InterTree as appropriate.
584
    """
585
1910.2.15 by Aaron Bentley
Back out inter.get changes, make optimizers an ordered list
586
    _optimisers = []
1852.8.2 by Robert Collins
Add InterTree class to represent InterTree operations.
587
1852.11.1 by Robert Collins
Deprecate compare_trees and move its body to InterTree.changes_from.
588
    @needs_read_lock
1852.9.4 by Robert Collins
Add minimal test for Tree.compare(extra_trees=...).
589
    def compare(self, want_unchanged=False, specific_files=None,
1731.1.33 by Aaron Bentley
Revert no-special-root changes
590
        extra_trees=None, require_versioned=False, include_root=False):
1852.9.3 by Robert Collins
Convert the test_delta tests to intertree_implementation and workingtree_implementation tests as appropriate.
591
        """Return the changes from source to target.
1852.8.3 by Robert Collins
Implement an InterTreeTestProvider and a trivial test_compare test case.
592
593
        :return: A TreeDelta.
1852.9.4 by Robert Collins
Add minimal test for Tree.compare(extra_trees=...).
594
        :param specific_files: An optional list of file paths to restrict the
595
            comparison to. When mapping filenames to ids, all matches in all
596
            trees (including optional extra_trees) are used, and all children of
597
            matched directories are included.
598
        :param want_unchanged: An optional boolean requesting the inclusion of
599
            unchanged entries in the result.
600
        :param extra_trees: An optional list of additional trees to use when
601
            mapping the contents of specific_files (paths) to file_ids.
1852.9.5 by Robert Collins
Add tests for require_versioned to the InterTree.compare() test suite.
602
        :param require_versioned: An optional boolean (defaults to False). When
603
            supplied and True all the 'specific_files' must be versioned, or
604
            a PathsNotVersionedError will be thrown.
1852.8.3 by Robert Collins
Implement an InterTreeTestProvider and a trivial test_compare test case.
605
        """
2255.2.82 by Robert Collins
various notes about find_ids_across_trees
606
        # NB: show_status depends on being able to pass in non-versioned files
607
        # and report them as unknown
2255.2.105 by Robert Collins
Unfuck InterTree.compare which I broke with the paths2ids implementation.
608
        trees = (self.source,)
1852.11.1 by Robert Collins
Deprecate compare_trees and move its body to InterTree.changes_from.
609
        if extra_trees is not None:
610
            trees = trees + tuple(extra_trees)
2255.2.102 by Robert Collins
Use Tree.path2ids in status operations.
611
        # target is usually the newer tree:
2255.2.105 by Robert Collins
Unfuck InterTree.compare which I broke with the paths2ids implementation.
612
        specific_file_ids = self.target.paths2ids(specific_files, trees,
2255.2.102 by Robert Collins
Use Tree.path2ids in status operations.
613
            require_versioned=require_versioned)
1852.11.1 by Robert Collins
Deprecate compare_trees and move its body to InterTree.changes_from.
614
        if specific_files and not specific_file_ids:
615
            # All files are unversioned, so just return an empty delta
616
            # _compare_trees would think we want a complete delta
617
            return delta.TreeDelta()
618
        return delta._compare_trees(self.source, self.target, want_unchanged,
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
619
            specific_files, include_root, extra_trees=extra_trees)
2012.1.1 by Aaron Bentley
Implement change iterator
620
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
621
    def _iter_changes(self, include_unchanged=False,
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
622
                      specific_files=None, pb=None, extra_trees=[],
623
                      require_versioned=True):
2012.1.1 by Aaron Bentley
Implement change iterator
624
        """Generate an iterator of changes between trees.
625
626
        A tuple is returned:
627
        (file_id, path, changed_content, versioned, parent, name, kind,
628
         executable)
629
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
630
        Path is relative to the target tree.  changed_content is True if the
631
        file's content has changed.  This includes changes to its kind, and to
2012.1.3 by Aaron Bentley
Always generate tuples (because kind is always used, even when not different)
632
        a symlink's target.
2012.1.1 by Aaron Bentley
Implement change iterator
633
2012.1.15 by Aaron Bentley
Minor tweaks
634
        versioned, parent, name, kind, executable are tuples of (from, to).
635
        If a file is missing in a tree, its kind is None.
2012.1.1 by Aaron Bentley
Implement change iterator
636
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
637
        Iteration is done in parent-to-child order, relative to the target
638
        tree.
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
639
640
        There is no guarantee that all paths are in sorted order: the
641
        requirement to expand the search due to renames may result in children
642
        that should be found early being found late in the search, after
643
        lexically later results have been returned.
644
        :param require_versioned: Raise errors.PathsNotVersionedError if a
645
            path in the specific_files list is not versioned in one of
646
            source, target or extra_trees.
2012.1.1 by Aaron Bentley
Implement change iterator
647
        """
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
648
        # this must return a sequence rather than a list so that it can hold a
649
        # read-lock for the whole time.
650
        #
651
        # TODO: this really only needs to lock the trees not the branches, so
652
        # could do with lock_tree_read() -- mbp 20070227
653
        result = []
654
        self.source.lock_read()
655
        self.target.lock_read()
656
        try:
657
            lookup_trees = [self.source]
658
            if extra_trees:
659
                 lookup_trees.extend(extra_trees)
660
            specific_file_ids = self.target.paths2ids(specific_files,
661
                lookup_trees, require_versioned=require_versioned)
662
            to_paths = {}
663
            from_entries_by_dir = list(self.source.inventory.iter_entries_by_dir(
664
                specific_file_ids=specific_file_ids))
665
            from_data = dict((e.file_id, (p, e)) for p, e in from_entries_by_dir)
666
            to_entries_by_dir = list(self.target.inventory.iter_entries_by_dir(
667
                specific_file_ids=specific_file_ids))
668
            num_entries = len(from_entries_by_dir) + len(to_entries_by_dir)
669
            entry_count = 0
670
            for to_path, to_entry in to_entries_by_dir:
671
                file_id = to_entry.file_id
672
                to_paths[file_id] = to_path
673
                entry_count += 1
674
                changed_content = False
675
                from_path, from_entry = from_data.get(file_id, (None, None))
676
                from_versioned = (from_entry is not None)
677
                if from_entry is not None:
678
                    from_versioned = True
679
                    from_name = from_entry.name
680
                    from_parent = from_entry.parent_id
681
                    from_kind, from_executable, from_stat = \
682
                        self.source._comparison_data(from_entry, from_path)
683
                    entry_count += 1
684
                else:
685
                    from_versioned = False
686
                    from_kind = None
687
                    from_parent = None
688
                    from_name = None
689
                    from_executable = None
690
                versioned = (from_versioned, True)
691
                to_kind, to_executable, to_stat = \
692
                    self.target._comparison_data(to_entry, to_path)
693
                kind = (from_kind, to_kind)
694
                if kind[0] != kind[1]:
695
                    changed_content = True
696
                elif from_kind == 'file':
697
                    from_size = self.source._file_size(from_entry, from_stat)
698
                    to_size = self.target._file_size(to_entry, to_stat)
699
                    if from_size != to_size:
700
                        changed_content = True
701
                    elif (self.source.get_file_sha1(file_id, from_path, from_stat) !=
702
                        self.target.get_file_sha1(file_id, to_path, to_stat)):
703
                        changed_content = True
704
                elif from_kind == 'symlink':
705
                    if (self.source.get_symlink_target(file_id) != 
706
                        self.target.get_symlink_target(file_id)):
707
                        changed_content = True
708
                elif from_kind == 'tree-reference':
709
                    if (self.source.get_reference_revision(from_entry, from_path)
710
                        != self.target.get_reference_revision(to_entry, to_path)):
711
                        changed_content = True 
712
                parent = (from_parent, to_entry.parent_id)
713
                name = (from_name, to_entry.name)
714
                executable = (from_executable, to_executable)
715
                if pb is not None:
716
                    pb.update('comparing files', entry_count, num_entries)
717
                if (changed_content is not False or versioned[0] != versioned[1] 
718
                    or parent[0] != parent[1] or name[0] != name[1] or 
719
                    executable[0] != executable[1] or include_unchanged):
720
                    result.append((file_id, to_path, changed_content, versioned, parent,
721
                           name, kind, executable))
722
            def get_to_path(from_entry):
723
                if from_entry.parent_id is None:
724
                    to_path = ''
725
                else:
726
                    if from_entry.parent_id not in to_paths:
727
                        get_to_path(self.source.inventory[from_entry.parent_id])
728
                    to_path = osutils.pathjoin(to_paths[from_entry.parent_id],
729
                                               from_entry.name)
730
                to_paths[from_entry.file_id] = to_path
731
                return to_path
732
733
            for path, from_entry in from_entries_by_dir:
734
                file_id = from_entry.file_id
735
                if file_id in to_paths:
736
                    continue
737
                to_path = get_to_path(from_entry)
738
                entry_count += 1
739
                if pb is not None:
740
                    pb.update('comparing files', entry_count, num_entries)
741
                versioned = (True, False)
742
                parent = (from_entry.parent_id, None)
743
                name = (from_entry.name, None)
744
                from_kind, from_executable, stat_value = \
745
                    self.source._comparison_data(from_entry, path)
746
                kind = (from_kind, None)
747
                executable = (from_executable, None)
2012.1.1 by Aaron Bentley
Implement change iterator
748
                changed_content = True
2255.2.158 by Martin Pool
Most of the integration of dirstate and subtree
749
                # the parent's path is necessarily known at this point.
750
                result.append((file_id, to_path, changed_content, versioned, parent,
751
                      name, kind, executable))
752
        finally:
753
            self.source.unlock()
754
            self.target.unlock()
755
        return result
756
2012.1.8 by Aaron Bentley
Merge from bzr.dev
757
2079.1.1 by John Arbash Meinel
Create a deprecated bzrlib.tree.RevisionTree() in favor of bzrlib.revisiontree.RevisionTree()
758
# This was deprecated before 0.12, but did not have an official warning
759
@symbol_versioning.deprecated_function(symbol_versioning.zero_twelve)
760
def RevisionTree(*args, **kwargs):
761
    """RevisionTree has moved to bzrlib.revisiontree.RevisionTree()
762
763
    Accessing it as bzrlib.tree.RevisionTree has been deprecated as of
764
    bzr 0.12.
765
    """
766
    from bzrlib.revisiontree import RevisionTree as _RevisionTree
767
    return _RevisionTree(*args, **kwargs)
768
 
769