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