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