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