/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
1465 by Robert Collins
Bugfix the new pull --clobber to not generate spurious conflicts.
160
    def kind(self, file_id):
161
        raise NotImplementedError("subclasses must implement kind")
162
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
163
    def _comparison_data(self, entry, path):
2012.1.15 by Aaron Bentley
Minor tweaks
164
        """Return a tuple of kind, executable, stat_value for a file.
165
166
        entry may be None if there is no inventory entry for the file, but
167
        path must always be supplied.
168
169
        kind is None if there is no file present (even if an inventory id is
170
        present).  executable is False for non-file entries.
171
        """
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
172
        raise NotImplementedError(self._comparison_data)
173
2255.2.10 by Robert Collins
Now all tests matching dirstate pass - added generation of inventories for parent trees.
174
    def _file_size(self, entry, stat_value):
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
175
        raise NotImplementedError(self._file_size)
176
1 by mbp at sourcefrog
import from baz patch-364
177
    def _get_inventory(self):
178
        return self._inventory
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
179
    
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
180
    def get_file(self, file_id):
181
        """Return a file object for the file file_id in the tree."""
182
        raise NotImplementedError(self.get_file)
2255.7.36 by John Arbash Meinel
All trees should implement get_file_mtime()
183
184
    def get_file_mtime(self, file_id, path=None):
185
        """Return the modification time for a file.
186
187
        :param file_id: The handle for this file.
188
        :param path: The path that this file can be found at.
189
            These must point to the same object.
190
        """
191
        raise NotImplementedError(self.get_file_mtime)
192
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
193
    def get_file_by_path(self, path):
194
        return self.get_file(self._inventory.path2id(path))
1 by mbp at sourcefrog
import from baz patch-364
195
2255.2.134 by John Arbash Meinel
Add a tree-test for get_symlink_target
196
    def get_symlink_target(self, file_id):
197
        """Get the target for a given file_id.
198
199
        It is assumed that the caller already knows that file_id is referencing
200
        a symlink.
201
        :param file_id: Handle for the symlink entry.
202
        :return: The path the symlink points to.
203
        """
204
        raise NotImplementedError(self.get_symlink_target)
205
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
206
    def annotate_iter(self, file_id):
1551.9.18 by Aaron Bentley
Updates from review comments
207
        """Return an iterator of revision_id, line tuples
208
1551.9.16 by Aaron Bentley
Implement Tree.annotate_iter for RevisionTree and WorkingTree
209
        For working trees (and mutable trees in general), the special
210
        revision_id 'current:' will be used for lines that are new in this
211
        tree, e.g. uncommitted changes.
212
        :param file_id: The file to produce an annotated version from
213
        """
214
        raise NotImplementedError(self.annotate_iter)
215
1 by mbp at sourcefrog
import from baz patch-364
216
    inventory = property(_get_inventory,
217
                         doc="Inventory of this Tree")
218
219
    def _check_retrieved(self, ie, f):
1364 by Martin Pool
- remove extra verification of files retrieved from tree
220
        if not __debug__:
221
            return  
130 by mbp at sourcefrog
- fixup checks on retrieved files to cope with compression,
222
        fp = fingerprint_file(f)
223
        f.seek(0)
224
        
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
225
        if ie.text_size is not None:
131 by mbp at sourcefrog
check size and sha1 of files retrieved from the tree
226
            if ie.text_size != fp['size']:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
227
                raise BzrError("mismatched size for file %r in %r" % (ie.file_id, self._store),
1 by mbp at sourcefrog
import from baz patch-364
228
                        ["inventory expects %d bytes" % ie.text_size,
130 by mbp at sourcefrog
- fixup checks on retrieved files to cope with compression,
229
                         "file is actually %d bytes" % fp['size'],
1 by mbp at sourcefrog
import from baz patch-364
230
                         "store is probably damaged/corrupt"])
231
130 by mbp at sourcefrog
- fixup checks on retrieved files to cope with compression,
232
        if ie.text_sha1 != fp['sha1']:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
233
            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
234
                    ["inventory expects %s" % ie.text_sha1,
130 by mbp at sourcefrog
- fixup checks on retrieved files to cope with compression,
235
                     "file is actually %s" % fp['sha1'],
1 by mbp at sourcefrog
import from baz patch-364
236
                     "store is probably damaged/corrupt"])
237
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
238
    def path2id(self, path):
239
        """Return the id for path in this tree."""
240
        return self._inventory.path2id(path)
1 by mbp at sourcefrog
import from baz patch-364
241
2255.2.101 by Robert Collins
Finish making Tree.ids2paths support the file_ids_across_trees api.
242
    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.
243
        """Return all the ids that can be reached by walking from paths.
244
        
245
        Each path is looked up in each this tree and any extras provided in
246
        trees, and this is repeated recursively: the children in an extra tree
247
        of a directory that has been renamed under a provided path in this tree
248
        are all returned, even if none exist until a provided path in this
249
        tree, and vice versa.
2255.2.101 by Robert Collins
Finish making Tree.ids2paths support the file_ids_across_trees api.
250
251
        :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.
252
            Alternatively, if paths is None, no ids should be calculated and None
253
            will be returned. This is offered to make calling the api unconditional
254
            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.
255
        :param trees: Additional trees to consider.
256
        :param require_versioned: If False, do not raise NotVersionedError if
257
            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.
258
        """
2255.2.105 by Robert Collins
Unfuck InterTree.compare which I broke with the paths2ids implementation.
259
        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.
260
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
261
    def print_file(self, file_id):
262
        """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
263
        file_id = osutils.safe_file_id(file_id)
176 by mbp at sourcefrog
New cat command contributed by janmar.
264
        import sys
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
265
        sys.stdout.write(self.get_file_text(file_id))
1543.1.1 by Denys Duchier
lock operations for trees - use them for diff
266
267
    def lock_read(self):
268
        pass
269
1908.11.1 by Robert Collins
Add a new method ``Tree.revision_tree`` which allows access to cached
270
    def revision_tree(self, revision_id):
271
        """Obtain a revision tree for the revision revision_id.
272
273
        The intention of this method is to allow access to possibly cached
274
        tree data. Implementors of this method should raise NoSuchRevision if
275
        the tree is not locally available, even if they could obtain the 
276
        tree via a repository or some other means. Callers are responsible 
277
        for finding the ultimate source for a revision tree.
278
279
        :param revision_id: The revision_id of the requested tree.
280
        :return: A Tree.
281
        :raises: NoSuchRevision if the tree cannot be obtained.
282
        """
283
        raise errors.NoSuchRevisionInTree(self, revision_id)
284
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
285
    def unknowns(self):
286
        """What files are present in this tree and unknown.
287
        
288
        :return: an iterator over the unknown files.
289
        """
290
        return iter([])
291
1543.1.1 by Denys Duchier
lock operations for trees - use them for diff
292
    def unlock(self):
293
        pass
1658.1.9 by Martin Pool
Give an error for bzr diff on an nonexistent file (Malone #3619)
294
295
    def filter_unversioned_files(self, paths):
2255.7.62 by Robert Collins
Update the Tree.filter_unversioned_files docstring to reflect what the existing implementations actually do, and change the WorkingTree4 implementation to match a newly created test for it.
296
        """Filter out paths that are versioned.
1658.1.9 by Martin Pool
Give an error for bzr diff on an nonexistent file (Malone #3619)
297
298
        :return: set of paths.
299
        """
1658.1.10 by Martin Pool
diff on unversiond files should give an error (Malone #3619)
300
        # NB: we specifically *don't* call self.has_filename, because for
301
        # WorkingTrees that can indicate files that exist on disk but that 
302
        # are not versioned.
303
        pred = self.inventory.has_filename
304
        return set((p for p in paths if not pred(p)))
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
305
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
306
    def walkdirs(self, prefix=""):
307
        """Walk the contents of this tree from path down.
308
309
        This yields all the data about the contents of a directory at a time.
310
        After each directory has been yielded, if the caller has mutated the
311
        list to exclude some directories, they are then not descended into.
312
        
313
        The data yielded is of the form:
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
314
        ((directory-relpath, directory-path-from-root, directory-fileid),
1852.15.3 by Robert Collins
Add a first-cut Tree.walkdirs method.
315
        [(relpath, basename, kind, lstat, path_from_tree_root, file_id, 
1852.15.7 by Robert Collins
Start testing behaviour of unknowns in WorkingTree.walkdirs.
316
          versioned_kind), ...]),
317
         - directory-relpath is the containing dirs relpath from prefix
318
         - directory-path-from-root is the containing dirs path from /
319
         - 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.
320
         - relpath is the relative path within the subtree being walked.
321
         - basename is the basename
322
         - kind is the kind of the file now. If unknonwn then the file is not
323
           present within the tree - but it may be recorded as versioned. See
324
           versioned_kind.
325
         - lstat is the stat data *if* the file was statted.
326
         - path_from_tree_root is the path from the root of the tree.
327
         - file_id is the file_id is the entry is versioned.
328
         - versioned_kind is the kind of the file as last recorded in the 
329
           versioning system. If 'unknown' the file is not versioned.
330
        One of 'kind' and 'versioned_kind' must not be 'unknown'.
331
332
        :param prefix: Start walking from prefix within the tree rather than
333
        at the root. This allows one to walk a subtree but get paths that are
334
        relative to a tree rooted higher up.
335
        :return: an iterator over the directory data.
336
        """
337
        raise NotImplementedError(self.walkdirs)
338
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
339
1 by mbp at sourcefrog
import from baz patch-364
340
class EmptyTree(Tree):
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
341
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
342
    def __init__(self):
1731.1.33 by Aaron Bentley
Revert no-special-root changes
343
        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()
344
        symbol_versioning.warn('EmptyTree is deprecated as of bzr 0.9 please'
345
                               ' use repository.revision_tree instead.',
346
                               DeprecationWarning, stacklevel=2)
1 by mbp at sourcefrog
import from baz patch-364
347
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
348
    def get_parent_ids(self):
349
        return []
350
1092.2.6 by Robert Collins
symlink support updated to work
351
    def get_symlink_target(self, file_id):
352
        return None
353
1 by mbp at sourcefrog
import from baz patch-364
354
    def has_filename(self, filename):
355
        return False
356
1907.1.4 by Aaron Bentley
Restore RootEntry, but mark it deprecated, restore EmptyTree.kind
357
    def kind(self, file_id):
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
358
        file_id = osutils.safe_file_id(file_id)
1907.1.4 by Aaron Bentley
Restore RootEntry, but mark it deprecated, restore EmptyTree.kind
359
        assert self._inventory[file_id].kind == "directory"
360
        return "directory"
361
1731.1.56 by Aaron Bentley
Fix EmptyTree's default include_root
362
    def list_files(self, include_root=False):
1732.1.14 by John Arbash Meinel
Some speedups by not calling pathjoin()
363
        return iter([])
1 by mbp at sourcefrog
import from baz patch-364
364
    
974.1.12 by aaron.bentley at utoronto
Switched from text-id to hashcache for merge optimization
365
    def __contains__(self, file_id):
2294.1.10 by John Arbash Meinel
Switch all apis over to utf8 file ids. All tests pass
366
        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)
367
        return (file_id in self._inventory)
974.1.12 by aaron.bentley at utoronto
Switched from text-id to hashcache for merge optimization
368
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
369
    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
370
        return None
371
372
1 by mbp at sourcefrog
import from baz patch-364
373
######################################################################
374
# diff
375
376
# TODO: Merge these two functions into a single one that can operate
377
# on either a whole tree or a set of files.
378
379
# TODO: Return the diff in order by filename, not by category or in
380
# random order.  Can probably be done by lock-stepping through the
381
# filenames from both trees.
382
383
384
def file_status(filename, old_tree, new_tree):
385
    """Return single-letter status, old and new names for a file.
386
387
    The complexity here is in deciding how to represent renames;
388
    many complex cases are possible.
389
    """
390
    old_inv = old_tree.inventory
391
    new_inv = new_tree.inventory
392
    new_id = new_inv.path2id(filename)
393
    old_id = old_inv.path2id(filename)
394
395
    if not new_id and not old_id:
396
        # easy: doesn't exist in either; not versioned at all
397
        if new_tree.is_ignored(filename):
398
            return 'I', None, None
399
        else:
400
            return '?', None, None
401
    elif new_id:
402
        # There is now a file of this name, great.
403
        pass
404
    else:
405
        # There is no longer a file of this name, but we can describe
406
        # what happened to the file that used to have
407
        # this name.  There are two possibilities: either it was
408
        # deleted entirely, or renamed.
409
        assert old_id
410
        if new_inv.has_id(old_id):
411
            return 'X', old_inv.id2path(old_id), new_inv.id2path(old_id)
412
        else:
413
            return 'D', old_inv.id2path(old_id), None
414
415
    # if the file_id is new in this revision, it is added
416
    if new_id and not old_inv.has_id(new_id):
417
        return 'A'
418
419
    # if there used to be a file of this name, but that ID has now
420
    # disappeared, it is deleted
421
    if old_id and not new_inv.has_id(old_id):
422
        return 'D'
423
424
    return 'wtf?'
425
426
    
427
164 by mbp at sourcefrog
new 'renames' command
428
def find_renames(old_inv, new_inv):
429
    for file_id in old_inv:
430
        if file_id not in new_inv:
431
            continue
432
        old_name = old_inv.id2path(file_id)
433
        new_name = new_inv.id2path(file_id)
434
        if old_name != new_name:
435
            yield (old_name, new_name)
436
            
678 by Martin Pool
- export to tarballs
437
1551.7.22 by Aaron Bentley
Changes from review
438
def find_ids_across_trees(filenames, trees, require_versioned=True):
439
    """Find the ids corresponding to specified filenames.
440
    
441
    All matches in all trees will be used, and all children of matched
442
    directories will be used.
443
1551.10.7 by Aaron Bentley
Use new-style output for status
444
    :param filenames: The filenames to find file_ids for (if None, returns
445
        None)
1551.7.22 by Aaron Bentley
Changes from review
446
    :param trees: The trees to find file_ids within
447
    :param require_versioned: if true, all specified filenames must occur in
448
    at least one tree.
449
    :return: a set of file ids for the specified filenames and their children.
450
    """
451
    if not filenames:
452
        return None
2255.2.82 by Robert Collins
various notes about find_ids_across_trees
453
    specified_path_ids = _find_ids_across_trees(filenames, trees,
454
        require_versioned)
455
    return _find_children_across_trees(specified_path_ids, trees)
456
457
458
def _find_ids_across_trees(filenames, trees, require_versioned):
1551.7.22 by Aaron Bentley
Changes from review
459
    """Find the ids corresponding to specified filenames.
460
    
2255.2.82 by Robert Collins
various notes about find_ids_across_trees
461
    All matches in all trees will be used, but subdirectories are not scanned.
1551.7.22 by Aaron Bentley
Changes from review
462
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
463
    :param filenames: The filenames to find file_ids for
464
    :param trees: The trees to find file_ids within
1551.7.16 by Aaron Bentley
Fix docs
465
    :param require_versioned: if true, all specified filenames must occur in
2255.2.82 by Robert Collins
various notes about find_ids_across_trees
466
        at least one tree.
467
    :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
468
    """
1551.7.17 by Aaron Bentley
Switch to PathsNotVersioned, accept extra_trees
469
    not_versioned = []
1551.7.18 by Aaron Bentley
Indentation and documentation fixes
470
    interesting_ids = set()
471
    for tree_path in filenames:
472
        not_found = True
473
        for tree in trees:
2255.2.82 by Robert Collins
various notes about find_ids_across_trees
474
            file_id = tree.path2id(tree_path)
1551.7.18 by Aaron Bentley
Indentation and documentation fixes
475
            if file_id is not None:
476
                interesting_ids.add(file_id)
477
                not_found = False
478
        if not_found:
479
            not_versioned.append(tree_path)
1551.7.22 by Aaron Bentley
Changes from review
480
    if len(not_versioned) > 0 and require_versioned:
481
        raise errors.PathsNotVersionedError(not_versioned)
482
    return interesting_ids
483
484
485
def _find_children_across_trees(specified_ids, trees):
486
    """Return a set including specified ids and their children
1551.7.18 by Aaron Bentley
Indentation and documentation fixes
487
    
1551.7.22 by Aaron Bentley
Changes from review
488
    All matches in all trees will be used.
489
490
    :param trees: The trees to find file_ids within
491
    :return: a set containing all specified ids and their children 
492
    """
493
    interesting_ids = set(specified_ids)
1551.7.18 by Aaron Bentley
Indentation and documentation fixes
494
    pending = interesting_ids
495
    # now handle children of interesting ids
496
    # we loop so that we handle all children of each id in both trees
497
    while len(pending) > 0:
498
        new_pending = set()
499
        for file_id in pending:
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
500
            for tree in trees:
2255.2.82 by Robert Collins
various notes about find_ids_across_trees
501
                if not tree.has_id(file_id):
1551.7.18 by Aaron Bentley
Indentation and documentation fixes
502
                    continue
503
                entry = tree.inventory[file_id]
504
                for child in getattr(entry, 'children', {}).itervalues():
505
                    if child.file_id not in interesting_ids:
506
                        new_pending.add(child.file_id)
507
        interesting_ids.update(new_pending)
508
        pending = new_pending
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
509
    return interesting_ids
1852.8.2 by Robert Collins
Add InterTree class to represent InterTree operations.
510
511
512
class InterTree(InterObject):
513
    """This class represents operations taking place between two Trees.
514
515
    Its instances have methods like 'compare' and contain references to the
516
    source and target trees these operations are to be carried out on.
517
518
    clients of bzrlib should not need to use InterTree directly, rather they
519
    should use the convenience methods on Tree such as 'Tree.compare()' which
520
    will pass through to InterTree as appropriate.
521
    """
522
1910.2.15 by Aaron Bentley
Back out inter.get changes, make optimizers an ordered list
523
    _optimisers = []
1852.8.2 by Robert Collins
Add InterTree class to represent InterTree operations.
524
1852.11.1 by Robert Collins
Deprecate compare_trees and move its body to InterTree.changes_from.
525
    @needs_read_lock
1852.9.4 by Robert Collins
Add minimal test for Tree.compare(extra_trees=...).
526
    def compare(self, want_unchanged=False, specific_files=None,
1731.1.33 by Aaron Bentley
Revert no-special-root changes
527
        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.
528
        """Return the changes from source to target.
1852.8.3 by Robert Collins
Implement an InterTreeTestProvider and a trivial test_compare test case.
529
530
        :return: A TreeDelta.
1852.9.4 by Robert Collins
Add minimal test for Tree.compare(extra_trees=...).
531
        :param specific_files: An optional list of file paths to restrict the
532
            comparison to. When mapping filenames to ids, all matches in all
533
            trees (including optional extra_trees) are used, and all children of
534
            matched directories are included.
535
        :param want_unchanged: An optional boolean requesting the inclusion of
536
            unchanged entries in the result.
537
        :param extra_trees: An optional list of additional trees to use when
538
            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.
539
        :param require_versioned: An optional boolean (defaults to False). When
540
            supplied and True all the 'specific_files' must be versioned, or
541
            a PathsNotVersionedError will be thrown.
1852.8.3 by Robert Collins
Implement an InterTreeTestProvider and a trivial test_compare test case.
542
        """
2255.2.82 by Robert Collins
various notes about find_ids_across_trees
543
        # NB: show_status depends on being able to pass in non-versioned files
544
        # and report them as unknown
2255.2.105 by Robert Collins
Unfuck InterTree.compare which I broke with the paths2ids implementation.
545
        trees = (self.source,)
1852.11.1 by Robert Collins
Deprecate compare_trees and move its body to InterTree.changes_from.
546
        if extra_trees is not None:
547
            trees = trees + tuple(extra_trees)
2255.2.102 by Robert Collins
Use Tree.path2ids in status operations.
548
        # target is usually the newer tree:
2255.2.105 by Robert Collins
Unfuck InterTree.compare which I broke with the paths2ids implementation.
549
        specific_file_ids = self.target.paths2ids(specific_files, trees,
2255.2.102 by Robert Collins
Use Tree.path2ids in status operations.
550
            require_versioned=require_versioned)
1852.11.1 by Robert Collins
Deprecate compare_trees and move its body to InterTree.changes_from.
551
        if specific_files and not specific_file_ids:
552
            # All files are unversioned, so just return an empty delta
553
            # _compare_trees would think we want a complete delta
554
            return delta.TreeDelta()
555
        return delta._compare_trees(self.source, self.target, want_unchanged,
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
556
            specific_files, include_root, extra_trees=extra_trees)
2012.1.1 by Aaron Bentley
Implement change iterator
557
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
558
    def _iter_changes(self, include_unchanged=False,
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
559
                      specific_files=None, pb=None, extra_trees=[],
560
                      require_versioned=True):
2012.1.1 by Aaron Bentley
Implement change iterator
561
        """Generate an iterator of changes between trees.
562
563
        A tuple is returned:
564
        (file_id, path, changed_content, versioned, parent, name, kind,
565
         executable)
566
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
567
        Path is relative to the target tree.  changed_content is True if the
568
        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)
569
        a symlink's target.
2012.1.1 by Aaron Bentley
Implement change iterator
570
2012.1.15 by Aaron Bentley
Minor tweaks
571
        versioned, parent, name, kind, executable are tuples of (from, to).
572
        If a file is missing in a tree, its kind is None.
2012.1.1 by Aaron Bentley
Implement change iterator
573
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
574
        Iteration is done in parent-to-child order, relative to the target
575
        tree.
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
576
577
        There is no guarantee that all paths are in sorted order: the
578
        requirement to expand the search due to renames may result in children
579
        that should be found early being found late in the search, after
580
        lexically later results have been returned.
581
        :param require_versioned: Raise errors.PathsNotVersionedError if a
582
            path in the specific_files list is not versioned in one of
583
            source, target or extra_trees.
2012.1.1 by Aaron Bentley
Implement change iterator
584
        """
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
585
        lookup_trees = [self.source]
586
        if extra_trees:
587
             lookup_trees.extend(extra_trees)
588
        specific_file_ids = self.target.paths2ids(specific_files,
589
            lookup_trees, require_versioned=require_versioned)
2012.1.1 by Aaron Bentley
Implement change iterator
590
        to_paths = {}
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
591
        from_entries_by_dir = list(self.source.inventory.iter_entries_by_dir(
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
592
            specific_file_ids=specific_file_ids))
2012.1.16 by Aaron Bentley
Support progress bars in iter_changes
593
        from_data = dict((e.file_id, (p, e)) for p, e in from_entries_by_dir)
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
594
        to_entries_by_dir = list(self.target.inventory.iter_entries_by_dir(
1551.9.31 by Aaron Bentley
Handle to_paths correctly when parent of file is not in specified_ids
595
            specific_file_ids=specific_file_ids))
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
596
        num_entries = len(from_entries_by_dir) + len(to_entries_by_dir)
2012.1.16 by Aaron Bentley
Support progress bars in iter_changes
597
        entry_count = 0
598
        for to_path, to_entry in to_entries_by_dir:
2012.1.1 by Aaron Bentley
Implement change iterator
599
            file_id = to_entry.file_id
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
600
            to_paths[file_id] = to_path
2012.1.16 by Aaron Bentley
Support progress bars in iter_changes
601
            entry_count += 1
2012.1.1 by Aaron Bentley
Implement change iterator
602
            changed_content = False
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
603
            from_path, from_entry = from_data.get(file_id, (None, None))
604
            from_versioned = (from_entry is not None)
605
            if from_entry is not None:
606
                from_versioned = True
607
                from_name = from_entry.name
2012.1.1 by Aaron Bentley
Implement change iterator
608
                from_parent = from_entry.parent_id
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
609
                from_kind, from_executable, from_stat = \
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
610
                    self.source._comparison_data(from_entry, from_path)
1551.9.29 by Aaron Bentley
Optimize Tree._iter_changes with specific file_ids
611
                entry_count += 1
2012.1.1 by Aaron Bentley
Implement change iterator
612
            else:
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
613
                from_versioned = False
2012.1.1 by Aaron Bentley
Implement change iterator
614
                from_kind = None
615
                from_parent = None
616
                from_name = None
617
                from_executable = None
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
618
            versioned = (from_versioned, True)
619
            to_kind, to_executable, to_stat = \
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
620
                self.target._comparison_data(to_entry, to_path)
2012.1.3 by Aaron Bentley
Always generate tuples (because kind is always used, even when not different)
621
            kind = (from_kind, to_kind)
622
            if kind[0] != kind[1]:
2012.1.1 by Aaron Bentley
Implement change iterator
623
                changed_content = True
2012.1.2 by Aaron Bentley
reimplement compare_trees
624
            elif from_kind == 'file':
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
625
                from_size = self.source._file_size(from_entry, from_stat)
626
                to_size = self.target._file_size(to_entry, to_stat)
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
627
                if from_size != to_size:
628
                    changed_content = True
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
629
                elif (self.source.get_file_sha1(file_id, from_path, from_stat) !=
630
                    self.target.get_file_sha1(file_id, to_path, to_stat)):
2012.1.2 by Aaron Bentley
reimplement compare_trees
631
                    changed_content = True
632
            elif from_kind == 'symlink':
2255.7.2 by Robert Collins
Add a (currently) disabled test for unversioned paths in the target tree with _iter_changes.
633
                if (self.source.get_symlink_target(file_id) !=
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
634
                    self.target.get_symlink_target(file_id)):
2012.1.2 by Aaron Bentley
reimplement compare_trees
635
                    changed_content = True
2012.1.3 by Aaron Bentley
Always generate tuples (because kind is always used, even when not different)
636
            parent = (from_parent, to_entry.parent_id)
637
            name = (from_name, to_entry.name)
638
            executable = (from_executable, to_executable)
2012.1.16 by Aaron Bentley
Support progress bars in iter_changes
639
            if pb is not None:
640
                pb.update('comparing files', entry_count, num_entries)
2255.7.2 by Robert Collins
Add a (currently) disabled test for unversioned paths in the target tree with _iter_changes.
641
            if (changed_content is not False or versioned[0] != versioned[1]
2012.1.3 by Aaron Bentley
Always generate tuples (because kind is always used, even when not different)
642
                or parent[0] != parent[1] or name[0] != name[1] or 
643
                executable[0] != executable[1] or include_unchanged):
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
644
                yield (file_id, to_path, changed_content, versioned, parent,
2012.1.1 by Aaron Bentley
Implement change iterator
645
                       name, kind, executable)
646
1551.9.31 by Aaron Bentley
Handle to_paths correctly when parent of file is not in specified_ids
647
        def get_to_path(from_entry):
648
            if from_entry.parent_id is None:
649
                to_path = ''
650
            else:
651
                if from_entry.parent_id not in to_paths:
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
652
                    get_to_path(self.source.inventory[from_entry.parent_id])
1551.9.31 by Aaron Bentley
Handle to_paths correctly when parent of file is not in specified_ids
653
                to_path = osutils.pathjoin(to_paths[from_entry.parent_id],
654
                                           from_entry.name)
655
            to_paths[from_entry.file_id] = to_path
656
            return to_path
657
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
658
        for path, from_entry in from_entries_by_dir:
2012.1.1 by Aaron Bentley
Implement change iterator
659
            file_id = from_entry.file_id
660
            if file_id in to_paths:
661
                continue
1551.9.31 by Aaron Bentley
Handle to_paths correctly when parent of file is not in specified_ids
662
            to_path = get_to_path(from_entry)
2012.1.16 by Aaron Bentley
Support progress bars in iter_changes
663
            entry_count += 1
664
            if pb is not None:
665
                pb.update('comparing files', entry_count, num_entries)
2012.1.1 by Aaron Bentley
Implement change iterator
666
            versioned = (True, False)
667
            parent = (from_entry.parent_id, None)
668
            name = (from_entry.name, None)
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
669
            from_kind, from_executable, stat_value = \
2255.2.122 by Robert Collins
Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
670
                self.source._comparison_data(from_entry, path)
2012.1.7 by Aaron Bentley
Get tree._iter_changed down to ~ 1 stat per file
671
            kind = (from_kind, None)
2012.1.2 by Aaron Bentley
reimplement compare_trees
672
            executable = (from_executable, None)
2012.1.1 by Aaron Bentley
Implement change iterator
673
            changed_content = True
674
            # the parent's path is necessarily known at this point.
675
            yield(file_id, to_path, changed_content, versioned, parent,
676
                  name, kind, executable)
2012.1.8 by Aaron Bentley
Merge from bzr.dev
677
2079.1.1 by John Arbash Meinel
Create a deprecated bzrlib.tree.RevisionTree() in favor of bzrlib.revisiontree.RevisionTree()
678
679
# This was deprecated before 0.12, but did not have an official warning
680
@symbol_versioning.deprecated_function(symbol_versioning.zero_twelve)
681
def RevisionTree(*args, **kwargs):
682
    """RevisionTree has moved to bzrlib.revisiontree.RevisionTree()
683
684
    Accessing it as bzrlib.tree.RevisionTree has been deprecated as of
685
    bzr 0.12.
686
    """
687
    from bzrlib.revisiontree import RevisionTree as _RevisionTree
688
    return _RevisionTree(*args, **kwargs)
689
 
690