~bzr-pqm/bzr/bzr.dev

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
1852.5.1 by Robert Collins
Deprecate EmptyTree in favour of using Repository.revision_tree.
22
from warnings import warn
800 by Martin Pool
Merge John's import-speedup branch:
23
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
24
import bzrlib
1852.11.1 by Robert Collins
Deprecate compare_trees and move its body to InterTree.changes_from.
25
from bzrlib import delta
26
from bzrlib.decorators import needs_read_lock
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
27
from bzrlib.errors import BzrError, BzrCheckError
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
28
from bzrlib import errors
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
29
from bzrlib.inventory import Inventory
1852.8.2 by Robert Collins
Add InterTree class to represent InterTree operations.
30
from bzrlib.inter import InterObject
1732.1.1 by John Arbash Meinel
deprecating appendpath, it does exactly what pathjoin does
31
from bzrlib.osutils import fingerprint_file
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
32
import bzrlib.revision
33
from bzrlib.trace import mutter, note
1 by mbp at sourcefrog
import from baz patch-364
34
1852.5.1 by Robert Collins
Deprecate EmptyTree in favour of using Repository.revision_tree.
35
558 by Martin Pool
- All top-level classes inherit from object
36
class Tree(object):
1 by mbp at sourcefrog
import from baz patch-364
37
    """Abstract file tree.
38
39
    There are several subclasses:
40
    
41
    * `WorkingTree` exists as files on disk editable by the user.
42
43
    * `RevisionTree` is a tree as recorded at some point in the past.
44
45
    Trees contain an `Inventory` object, and also know how to retrieve
46
    file texts mentioned in the inventory, either from a working
47
    directory or from a store.
48
49
    It is possible for trees to contain files that are not described
50
    in their inventory or vice versa; for this use `filenames()`.
51
52
    Trees can be compared, etc, regardless of whether they are working
53
    trees or versioned trees.
54
    """
55
    
1852.9.6 by Robert Collins
Merge the change from Tree.compare to Tree.changes_from.
56
    def changes_from(self, other, want_unchanged=False, specific_files=None,
1907.1.1 by Aaron Bentley
Unshelved all changes except those related to removing RootEntry
57
        extra_trees=None, require_versioned=False):
1852.8.8 by Robert Collins
change Tree.compare to Tree.changes_from - its better for the common case.
58
        """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.
59
60
        :param other: A tree to compare with.
61
        :param specific_files: An optional list of file paths to restrict the
62
            comparison to. When mapping filenames to ids, all matches in all
63
            trees (including optional extra_trees) are used, and all children of
64
            matched directories are included.
1852.9.4 by Robert Collins
Add minimal test for Tree.compare(extra_trees=...).
65
        :param want_unchanged: An optional boolean requesting the inclusion of
66
            unchanged entries in the result.
67
        :param extra_trees: An optional list of additional trees to use when
68
            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.
69
        :param require_versioned: An optional boolean (defaults to False). When
70
            supplied and True all the 'specific_files' must be versioned, or
71
            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.
72
1852.8.4 by Robert Collins
Hook InterTree into Tree.
73
        The comparison will be performed by an InterTree object looked up on 
74
        self and other.
75
        """
1852.8.8 by Robert Collins
change Tree.compare to Tree.changes_from - its better for the common case.
76
        # Martin observes that Tree.changes_from returns a TreeDelta and this
77
        # may confuse people, because the class name of the returned object is
78
        # 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.
79
        return InterTree.get(other, self).compare(
1852.9.4 by Robert Collins
Add minimal test for Tree.compare(extra_trees=...).
80
            want_unchanged=want_unchanged,
81
            specific_files=specific_files,
1852.9.5 by Robert Collins
Add tests for require_versioned to the InterTree.compare() test suite.
82
            extra_trees=extra_trees,
83
            require_versioned=require_versioned,
84
            )
1852.8.4 by Robert Collins
Hook InterTree into Tree.
85
    
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
86
    def conflicts(self):
87
        """Get a list of the conflicts in the tree.
88
89
        Each conflict is an instance of bzrlib.conflicts.Conflict.
90
        """
91
        return []
92
93
    def get_parent_ids(self):
94
        """Get the parent ids for this tree. 
95
96
        :return: a list of parent ids. [] is returned to indicate
97
        a tree with no parents.
98
        :raises: BzrError if the parents are not known.
99
        """
100
        raise NotImplementedError(self.get_parent_ids)
101
    
1 by mbp at sourcefrog
import from baz patch-364
102
    def has_filename(self, filename):
103
        """True if the tree has given filename."""
104
        raise NotImplementedError()
105
1185.12.39 by abentley
Propogated has_or_had_id to Tree
106
    def has_id(self, file_id):
107
        return self.inventory.has_id(file_id)
108
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
109
    __contains__ = has_id
110
1185.12.39 by abentley
Propogated has_or_had_id to Tree
111
    def has_or_had_id(self, file_id):
112
        if file_id == self.inventory.root.file_id:
1185.12.38 by abentley
semi-broke merge
113
            return True
1 by mbp at sourcefrog
import from baz patch-364
114
        return self.inventory.has_id(file_id)
115
462 by Martin Pool
- New form 'file_id in tree' to check if the file is present
116
    def __iter__(self):
117
        return iter(self.inventory)
118
1 by mbp at sourcefrog
import from baz patch-364
119
    def id2path(self, file_id):
120
        return self.inventory.id2path(file_id)
121
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
122
    def iter_entries_by_dir(self):
123
        """Walk the tree in 'by_dir' order.
124
125
        This will yield each entry in the tree as a (path, entry) tuple. The
126
        order that they are yielded is: the contents of a directory are 
127
        preceeded by the parent of a directory, and all the contents of a 
128
        directory are grouped together.
129
        """
130
        return self.inventory.iter_entries_by_dir()
131
1465 by Robert Collins
Bugfix the new pull --clobber to not generate spurious conflicts.
132
    def kind(self, file_id):
133
        raise NotImplementedError("subclasses must implement kind")
134
1 by mbp at sourcefrog
import from baz patch-364
135
    def _get_inventory(self):
136
        return self._inventory
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
137
    
138
    def get_file_by_path(self, path):
139
        return self.get_file(self._inventory.path2id(path))
1 by mbp at sourcefrog
import from baz patch-364
140
141
    inventory = property(_get_inventory,
142
                         doc="Inventory of this Tree")
143
144
    def _check_retrieved(self, ie, f):
1364 by Martin Pool
- remove extra verification of files retrieved from tree
145
        if not __debug__:
146
            return  
130 by mbp at sourcefrog
- fixup checks on retrieved files to cope with compression,
147
        fp = fingerprint_file(f)
148
        f.seek(0)
149
        
184 by mbp at sourcefrog
pychecker fixups
150
        if ie.text_size != None:
131 by mbp at sourcefrog
check size and sha1 of files retrieved from the tree
151
            if ie.text_size != fp['size']:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
152
                raise BzrError("mismatched size for file %r in %r" % (ie.file_id, self._store),
1 by mbp at sourcefrog
import from baz patch-364
153
                        ["inventory expects %d bytes" % ie.text_size,
130 by mbp at sourcefrog
- fixup checks on retrieved files to cope with compression,
154
                         "file is actually %d bytes" % fp['size'],
1 by mbp at sourcefrog
import from baz patch-364
155
                         "store is probably damaged/corrupt"])
156
130 by mbp at sourcefrog
- fixup checks on retrieved files to cope with compression,
157
        if ie.text_sha1 != fp['sha1']:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
158
            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
159
                    ["inventory expects %s" % ie.text_sha1,
130 by mbp at sourcefrog
- fixup checks on retrieved files to cope with compression,
160
                     "file is actually %s" % fp['sha1'],
1 by mbp at sourcefrog
import from baz patch-364
161
                     "store is probably damaged/corrupt"])
162
163
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
164
    def print_file(self, file_id):
165
        """Print file with id `file_id` to stdout."""
176 by mbp at sourcefrog
New cat command contributed by janmar.
166
        import sys
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
167
        sys.stdout.write(self.get_file_text(file_id))
1543.1.1 by Denys Duchier
lock operations for trees - use them for diff
168
169
    def lock_read(self):
170
        pass
171
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
172
    def unknowns(self):
173
        """What files are present in this tree and unknown.
174
        
175
        :return: an iterator over the unknown files.
176
        """
177
        return iter([])
178
1543.1.1 by Denys Duchier
lock operations for trees - use them for diff
179
    def unlock(self):
180
        pass
1658.1.9 by Martin Pool
Give an error for bzr diff on an nonexistent file (Malone #3619)
181
182
    def filter_unversioned_files(self, paths):
183
        """Filter out paths that are not versioned.
184
185
        :return: set of paths.
186
        """
1658.1.10 by Martin Pool
diff on unversiond files should give an error (Malone #3619)
187
        # NB: we specifically *don't* call self.has_filename, because for
188
        # WorkingTrees that can indicate files that exist on disk but that 
189
        # are not versioned.
190
        pred = self.inventory.has_filename
191
        return set((p for p in paths if not pred(p)))
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
192
193
194
# for compatibility
195
from bzrlib.revisiontree import RevisionTree
196
 
1465 by Robert Collins
Bugfix the new pull --clobber to not generate spurious conflicts.
197
1 by mbp at sourcefrog
import from baz patch-364
198
class EmptyTree(Tree):
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
199
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
200
    def __init__(self):
1907.1.1 by Aaron Bentley
Unshelved all changes except those related to removing RootEntry
201
        self._inventory = Inventory()
1852.5.1 by Robert Collins
Deprecate EmptyTree in favour of using Repository.revision_tree.
202
        warn('EmptyTree is deprecated as of bzr 0.9 please use '
203
            'repository.revision_tree instead.',
204
            DeprecationWarning, stacklevel=2)
1 by mbp at sourcefrog
import from baz patch-364
205
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
206
    def get_parent_ids(self):
207
        return []
208
1092.2.6 by Robert Collins
symlink support updated to work
209
    def get_symlink_target(self, file_id):
210
        return None
211
1 by mbp at sourcefrog
import from baz patch-364
212
    def has_filename(self, filename):
213
        return False
214
1907.1.4 by Aaron Bentley
Restore RootEntry, but mark it deprecated, restore EmptyTree.kind
215
    def kind(self, file_id):
216
        assert self._inventory[file_id].kind == "directory"
217
        return "directory"
218
1907.1.5 by Aaron Bentley
Remove include_root parameter from list_files
219
    def list_files(self):
1732.1.14 by John Arbash Meinel
Some speedups by not calling pathjoin()
220
        return iter([])
1 by mbp at sourcefrog
import from baz patch-364
221
    
974.1.12 by aaron.bentley at utoronto
Switched from text-id to hashcache for merge optimization
222
    def __contains__(self, file_id):
223
        return file_id in self._inventory
224
1732.1.19 by John Arbash Meinel
If you have the path, use it rather than looking it up again
225
    def get_file_sha1(self, file_id, path=None):
974.1.14 by aaron.bentley at utoronto
Fixed bugs in merge optimization
226
        return None
227
228
1 by mbp at sourcefrog
import from baz patch-364
229
######################################################################
230
# diff
231
232
# TODO: Merge these two functions into a single one that can operate
233
# on either a whole tree or a set of files.
234
235
# TODO: Return the diff in order by filename, not by category or in
236
# random order.  Can probably be done by lock-stepping through the
237
# filenames from both trees.
238
239
240
def file_status(filename, old_tree, new_tree):
241
    """Return single-letter status, old and new names for a file.
242
243
    The complexity here is in deciding how to represent renames;
244
    many complex cases are possible.
245
    """
246
    old_inv = old_tree.inventory
247
    new_inv = new_tree.inventory
248
    new_id = new_inv.path2id(filename)
249
    old_id = old_inv.path2id(filename)
250
251
    if not new_id and not old_id:
252
        # easy: doesn't exist in either; not versioned at all
253
        if new_tree.is_ignored(filename):
254
            return 'I', None, None
255
        else:
256
            return '?', None, None
257
    elif new_id:
258
        # There is now a file of this name, great.
259
        pass
260
    else:
261
        # There is no longer a file of this name, but we can describe
262
        # what happened to the file that used to have
263
        # this name.  There are two possibilities: either it was
264
        # deleted entirely, or renamed.
265
        assert old_id
266
        if new_inv.has_id(old_id):
267
            return 'X', old_inv.id2path(old_id), new_inv.id2path(old_id)
268
        else:
269
            return 'D', old_inv.id2path(old_id), None
270
271
    # if the file_id is new in this revision, it is added
272
    if new_id and not old_inv.has_id(new_id):
273
        return 'A'
274
275
    # if there used to be a file of this name, but that ID has now
276
    # disappeared, it is deleted
277
    if old_id and not new_inv.has_id(old_id):
278
        return 'D'
279
280
    return 'wtf?'
281
282
    
283
164 by mbp at sourcefrog
new 'renames' command
284
def find_renames(old_inv, new_inv):
285
    for file_id in old_inv:
286
        if file_id not in new_inv:
287
            continue
288
        old_name = old_inv.id2path(file_id)
289
        new_name = new_inv.id2path(file_id)
290
        if old_name != new_name:
291
            yield (old_name, new_name)
292
            
678 by Martin Pool
- export to tarballs
293
1551.7.22 by Aaron Bentley
Changes from review
294
def find_ids_across_trees(filenames, trees, require_versioned=True):
295
    """Find the ids corresponding to specified filenames.
296
    
297
    All matches in all trees will be used, and all children of matched
298
    directories will be used.
299
300
    :param filenames: The filenames to find file_ids for
301
    :param trees: The trees to find file_ids within
302
    :param require_versioned: if true, all specified filenames must occur in
303
    at least one tree.
304
    :return: a set of file ids for the specified filenames and their children.
305
    """
306
    if not filenames:
307
        return None
308
    specified_ids = _find_filename_ids_across_trees(filenames, trees, 
309
                                                    require_versioned)
310
    return _find_children_across_trees(specified_ids, trees)
311
312
313
def _find_filename_ids_across_trees(filenames, trees, require_versioned):
314
    """Find the ids corresponding to specified filenames.
315
    
316
    All matches in all trees will be used.
317
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
318
    :param filenames: The filenames to find file_ids for
319
    :param trees: The trees to find file_ids within
1551.7.16 by Aaron Bentley
Fix docs
320
    :param require_versioned: if true, all specified filenames must occur in
321
    at least one tree.
322
    :return: a set of file ids for the specified filenames
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
323
    """
1551.7.17 by Aaron Bentley
Switch to PathsNotVersioned, accept extra_trees
324
    not_versioned = []
1551.7.18 by Aaron Bentley
Indentation and documentation fixes
325
    interesting_ids = set()
326
    for tree_path in filenames:
327
        not_found = True
328
        for tree in trees:
329
            file_id = tree.inventory.path2id(tree_path)
330
            if file_id is not None:
331
                interesting_ids.add(file_id)
332
                not_found = False
333
        if not_found:
334
            not_versioned.append(tree_path)
1551.7.22 by Aaron Bentley
Changes from review
335
    if len(not_versioned) > 0 and require_versioned:
336
        raise errors.PathsNotVersionedError(not_versioned)
337
    return interesting_ids
338
339
340
def _find_children_across_trees(specified_ids, trees):
341
    """Return a set including specified ids and their children
1551.7.18 by Aaron Bentley
Indentation and documentation fixes
342
    
1551.7.22 by Aaron Bentley
Changes from review
343
    All matches in all trees will be used.
344
345
    :param trees: The trees to find file_ids within
346
    :return: a set containing all specified ids and their children 
347
    """
348
    interesting_ids = set(specified_ids)
1551.7.18 by Aaron Bentley
Indentation and documentation fixes
349
    pending = interesting_ids
350
    # now handle children of interesting ids
351
    # we loop so that we handle all children of each id in both trees
352
    while len(pending) > 0:
353
        new_pending = set()
354
        for file_id in pending:
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
355
            for tree in trees:
1551.7.18 by Aaron Bentley
Indentation and documentation fixes
356
                if file_id not in tree:
357
                    continue
358
                entry = tree.inventory[file_id]
359
                for child in getattr(entry, 'children', {}).itervalues():
360
                    if child.file_id not in interesting_ids:
361
                        new_pending.add(child.file_id)
362
        interesting_ids.update(new_pending)
363
        pending = new_pending
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
364
    return interesting_ids
1852.8.2 by Robert Collins
Add InterTree class to represent InterTree operations.
365
366
367
class InterTree(InterObject):
368
    """This class represents operations taking place between two Trees.
369
370
    Its instances have methods like 'compare' and contain references to the
371
    source and target trees these operations are to be carried out on.
372
373
    clients of bzrlib should not need to use InterTree directly, rather they
374
    should use the convenience methods on Tree such as 'Tree.compare()' which
375
    will pass through to InterTree as appropriate.
376
    """
377
378
    _optimisers = set()
379
1852.11.1 by Robert Collins
Deprecate compare_trees and move its body to InterTree.changes_from.
380
    @needs_read_lock
1852.9.4 by Robert Collins
Add minimal test for Tree.compare(extra_trees=...).
381
    def compare(self, want_unchanged=False, specific_files=None,
1907.1.1 by Aaron Bentley
Unshelved all changes except those related to removing RootEntry
382
        extra_trees=None, require_versioned=False):
1852.9.3 by Robert Collins
Convert the test_delta tests to intertree_implementation and workingtree_implementation tests as appropriate.
383
        """Return the changes from source to target.
1852.8.3 by Robert Collins
Implement an InterTreeTestProvider and a trivial test_compare test case.
384
385
        :return: A TreeDelta.
1852.9.4 by Robert Collins
Add minimal test for Tree.compare(extra_trees=...).
386
        :param specific_files: An optional list of file paths to restrict the
387
            comparison to. When mapping filenames to ids, all matches in all
388
            trees (including optional extra_trees) are used, and all children of
389
            matched directories are included.
390
        :param want_unchanged: An optional boolean requesting the inclusion of
391
            unchanged entries in the result.
392
        :param extra_trees: An optional list of additional trees to use when
393
            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.
394
        :param require_versioned: An optional boolean (defaults to False). When
395
            supplied and True all the 'specific_files' must be versioned, or
396
            a PathsNotVersionedError will be thrown.
1852.8.3 by Robert Collins
Implement an InterTreeTestProvider and a trivial test_compare test case.
397
        """
1852.11.1 by Robert Collins
Deprecate compare_trees and move its body to InterTree.changes_from.
398
        # NB: show_status depends on being able to pass in non-versioned files and
399
        # report them as unknown
400
        trees = (self.source, self.target)
401
        if extra_trees is not None:
402
            trees = trees + tuple(extra_trees)
403
        specific_file_ids = find_ids_across_trees(specific_files,
404
            trees, require_versioned=require_versioned)
405
        if specific_files and not specific_file_ids:
406
            # All files are unversioned, so just return an empty delta
407
            # _compare_trees would think we want a complete delta
408
            return delta.TreeDelta()
409
        return delta._compare_trees(self.source, self.target, want_unchanged,
1907.1.1 by Aaron Bentley
Unshelved all changes except those related to removing RootEntry
410
            specific_file_ids)