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