/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
1 by mbp at sourcefrog
import from baz patch-364
2
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.
7
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.
12
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
1732.1.1 by John Arbash Meinel
deprecating appendpath, it does exactly what pathjoin does
28
from bzrlib.osutils import fingerprint_file
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
29
import bzrlib.revision
30
from bzrlib.trace import mutter, note
1 by mbp at sourcefrog
import from baz patch-364
31
1852.5.1 by Robert Collins
Deprecate EmptyTree in favour of using Repository.revision_tree.
32
558 by Martin Pool
- All top-level classes inherit from object
33
class Tree(object):
1 by mbp at sourcefrog
import from baz patch-364
34
    """Abstract file tree.
35
36
    There are several subclasses:
37
    
38
    * `WorkingTree` exists as files on disk editable by the user.
39
40
    * `RevisionTree` is a tree as recorded at some point in the past.
41
42
    Trees contain an `Inventory` object, and also know how to retrieve
43
    file texts mentioned in the inventory, either from a working
44
    directory or from a store.
45
46
    It is possible for trees to contain files that are not described
47
    in their inventory or vice versa; for this use `filenames()`.
48
49
    Trees can be compared, etc, regardless of whether they are working
50
    trees or versioned trees.
51
    """
52
    
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
53
    def conflicts(self):
54
        """Get a list of the conflicts in the tree.
55
56
        Each conflict is an instance of bzrlib.conflicts.Conflict.
57
        """
58
        return []
59
60
    def get_parent_ids(self):
61
        """Get the parent ids for this tree. 
62
63
        :return: a list of parent ids. [] is returned to indicate
64
        a tree with no parents.
65
        :raises: BzrError if the parents are not known.
66
        """
67
        raise NotImplementedError(self.get_parent_ids)
68
    
1 by mbp at sourcefrog
import from baz patch-364
69
    def has_filename(self, filename):
70
        """True if the tree has given filename."""
71
        raise NotImplementedError()
72
1185.12.39 by abentley
Propogated has_or_had_id to Tree
73
    def has_id(self, file_id):
74
        return self.inventory.has_id(file_id)
75
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
76
    __contains__ = has_id
77
1185.12.39 by abentley
Propogated has_or_had_id to Tree
78
    def has_or_had_id(self, file_id):
79
        if file_id == self.inventory.root.file_id:
1185.12.38 by abentley
semi-broke merge
80
            return True
1 by mbp at sourcefrog
import from baz patch-364
81
        return self.inventory.has_id(file_id)
82
462 by Martin Pool
- New form 'file_id in tree' to check if the file is present
83
    def __iter__(self):
84
        return iter(self.inventory)
85
1 by mbp at sourcefrog
import from baz patch-364
86
    def id2path(self, file_id):
87
        return self.inventory.id2path(file_id)
88
1852.6.9 by Robert Collins
Add more test trees to the tree-implementations tests.
89
    def iter_entries_by_dir(self):
90
        """Walk the tree in 'by_dir' order.
91
92
        This will yield each entry in the tree as a (path, entry) tuple. The
93
        order that they are yielded is: the contents of a directory are 
94
        preceeded by the parent of a directory, and all the contents of a 
95
        directory are grouped together.
96
        """
97
        return self.inventory.iter_entries_by_dir()
98
1465 by Robert Collins
Bugfix the new pull --clobber to not generate spurious conflicts.
99
    def kind(self, file_id):
100
        raise NotImplementedError("subclasses must implement kind")
101
1 by mbp at sourcefrog
import from baz patch-364
102
    def _get_inventory(self):
103
        return self._inventory
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
104
    
105
    def get_file_by_path(self, path):
106
        return self.get_file(self._inventory.path2id(path))
1 by mbp at sourcefrog
import from baz patch-364
107
108
    inventory = property(_get_inventory,
109
                         doc="Inventory of this Tree")
110
111
    def _check_retrieved(self, ie, f):
1364 by Martin Pool
- remove extra verification of files retrieved from tree
112
        if not __debug__:
113
            return  
130 by mbp at sourcefrog
- fixup checks on retrieved files to cope with compression,
114
        fp = fingerprint_file(f)
115
        f.seek(0)
116
        
184 by mbp at sourcefrog
pychecker fixups
117
        if ie.text_size != None:
131 by mbp at sourcefrog
check size and sha1 of files retrieved from the tree
118
            if ie.text_size != fp['size']:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
119
                raise BzrError("mismatched size for file %r in %r" % (ie.file_id, self._store),
1 by mbp at sourcefrog
import from baz patch-364
120
                        ["inventory expects %d bytes" % ie.text_size,
130 by mbp at sourcefrog
- fixup checks on retrieved files to cope with compression,
121
                         "file is actually %d bytes" % fp['size'],
1 by mbp at sourcefrog
import from baz patch-364
122
                         "store is probably damaged/corrupt"])
123
130 by mbp at sourcefrog
- fixup checks on retrieved files to cope with compression,
124
        if ie.text_sha1 != fp['sha1']:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
125
            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
126
                    ["inventory expects %s" % ie.text_sha1,
130 by mbp at sourcefrog
- fixup checks on retrieved files to cope with compression,
127
                     "file is actually %s" % fp['sha1'],
1 by mbp at sourcefrog
import from baz patch-364
128
                     "store is probably damaged/corrupt"])
129
130
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
131
    def print_file(self, file_id):
132
        """Print file with id `file_id` to stdout."""
176 by mbp at sourcefrog
New cat command contributed by janmar.
133
        import sys
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
134
        sys.stdout.write(self.get_file_text(file_id))
1543.1.1 by Denys Duchier
lock operations for trees - use them for diff
135
136
    def lock_read(self):
137
        pass
138
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
139
    def unknowns(self):
140
        """What files are present in this tree and unknown.
141
        
142
        :return: an iterator over the unknown files.
143
        """
144
        return iter([])
145
1543.1.1 by Denys Duchier
lock operations for trees - use them for diff
146
    def unlock(self):
147
        pass
1658.1.9 by Martin Pool
Give an error for bzr diff on an nonexistent file (Malone #3619)
148
149
    def filter_unversioned_files(self, paths):
150
        """Filter out paths that are not versioned.
151
152
        :return: set of paths.
153
        """
1658.1.10 by Martin Pool
diff on unversiond files should give an error (Malone #3619)
154
        # NB: we specifically *don't* call self.has_filename, because for
155
        # WorkingTrees that can indicate files that exist on disk but that 
156
        # are not versioned.
157
        pred = self.inventory.has_filename
158
        return set((p for p in paths if not pred(p)))
176 by mbp at sourcefrog
New cat command contributed by janmar.
159
        
160
        
1 by mbp at sourcefrog
import from baz patch-364
161
class RevisionTree(Tree):
162
    """Tree viewing a previous revision.
163
164
    File text can be retrieved from the text store.
165
254 by Martin Pool
- Doc cleanups from Magnus Therning
166
    TODO: Some kind of `__repr__` method, but a good one
1 by mbp at sourcefrog
import from baz patch-364
167
           probably means knowing the branch and revision number,
168
           or at least passing a description to the constructor.
169
    """
170
    
1185.50.28 by John Arbash Meinel
Lots of updates for 'bzr check'
171
    def __init__(self, branch, inv, revision_id):
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
172
        # for compatability the 'branch' parameter has not been renamed to 
173
        # repository at this point. However, we should change RevisionTree's
174
        # construction to always be via Repository and not via direct 
175
        # construction - this will mean that we can change the constructor
176
        # with much less chance of breaking client code.
177
        self._repository = branch
1185.50.28 by John Arbash Meinel
Lots of updates for 'bzr check'
178
        self._weave_store = branch.weave_store
1 by mbp at sourcefrog
import from baz patch-364
179
        self._inventory = inv
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
180
        self._revision_id = revision_id
181
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
182
    def get_parent_ids(self):
183
        """See Tree.get_parent_ids.
184
185
        A RevisionTree's parents match the revision graph.
186
        """
187
        parent_ids = self._repository.get_revision(self._revision_id).parent_ids
188
        return parent_ids
189
        
1185.82.3 by John Arbash Meinel
Working on creating a factor for serializing changesets.
190
    def get_revision_id(self):
191
        """Return the revision id associated with this tree."""
192
        return self._revision_id
193
1210 by Martin Pool
- get correct old file version in RevisionTree
194
    def get_weave(self, file_id):
1417.1.8 by Robert Collins
use transactions in the weave store interface, which enables caching for log
195
        return self._weave_store.get_weave(file_id,
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
196
                self._repository.get_transaction())
1369 by Martin Pool
- try to avoid redundant conversion of strings when retrieving from weaves
197
198
    def get_file_lines(self, file_id):
199
        ie = self._inventory[file_id]
200
        weave = self.get_weave(file_id)
1563.2.13 by Robert Collins
InterVersionedFile implemented.
201
        return weave.get_lines(ie.revision)
1210 by Martin Pool
- get correct old file version in RevisionTree
202
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
203
    def get_file_text(self, file_id):
1369 by Martin Pool
- try to avoid redundant conversion of strings when retrieving from weaves
204
        return ''.join(self.get_file_lines(file_id))
205
1 by mbp at sourcefrog
import from baz patch-364
206
    def get_file(self, file_id):
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
207
        return StringIO(self.get_file_text(file_id))
1 by mbp at sourcefrog
import from baz patch-364
208
209
    def get_file_size(self, file_id):
210
        return self._inventory[file_id].text_size
211
1732.1.19 by John Arbash Meinel
If you have the path, use it rather than looking it up again
212
    def get_file_sha1(self, file_id, path=None):
1 by mbp at sourcefrog
import from baz patch-364
213
        ie = self._inventory[file_id]
974.1.12 by aaron.bentley at utoronto
Switched from text-id to hashcache for merge optimization
214
        if ie.kind == "file":
215
            return ie.text_sha1
1732.1.19 by John Arbash Meinel
If you have the path, use it rather than looking it up again
216
        return None
1 by mbp at sourcefrog
import from baz patch-364
217
1740.2.5 by Aaron Bentley
Merge from bzr.dev
218
    def get_file_mtime(self, file_id, path=None):
219
        ie = self._inventory[file_id]
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
220
        revision = self._repository.get_revision(ie.revision)
1740.2.5 by Aaron Bentley
Merge from bzr.dev
221
        return revision.timestamp
222
1732.1.19 by John Arbash Meinel
If you have the path, use it rather than looking it up again
223
    def is_executable(self, file_id, path=None):
1185.12.28 by Aaron Bentley
Removed use of readonly path for executability test
224
        ie = self._inventory[file_id]
225
        if ie.kind != "file":
226
            return None 
1398 by Robert Collins
integrate in Gustavos x-bit patch
227
        return self._inventory[file_id].executable
228
1 by mbp at sourcefrog
import from baz patch-364
229
    def has_filename(self, filename):
230
        return bool(self.inventory.path2id(filename))
231
1551.6.36 by Aaron Bentley
Revert --debris/--detritus changes
232
    def list_files(self):
1 by mbp at sourcefrog
import from baz patch-364
233
        # The only files returned by this are those from the version
1852.6.3 by Robert Collins
Make iter(Tree) consistent for all tree types.
234
        entries = self.inventory.iter_entries()
235
        # skip the root for compatability with the current apis.
236
        entries.next()
237
        for path, entry in entries:
1732.1.14 by John Arbash Meinel
Some speedups by not calling pathjoin()
238
            yield path, 'V', entry.kind, entry.file_id, entry
1 by mbp at sourcefrog
import from baz patch-364
239
1092.2.6 by Robert Collins
symlink support updated to work
240
    def get_symlink_target(self, file_id):
241
        ie = self._inventory[file_id]
242
        return ie.symlink_target;
1 by mbp at sourcefrog
import from baz patch-364
243
1185.12.28 by Aaron Bentley
Removed use of readonly path for executability test
244
    def kind(self, file_id):
245
        return self._inventory[file_id].kind
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
246
1543.1.1 by Denys Duchier
lock operations for trees - use them for diff
247
    def lock_read(self):
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
248
        self._repository.lock_read()
1543.1.1 by Denys Duchier
lock operations for trees - use them for diff
249
250
    def unlock(self):
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
251
        self._repository.unlock()
1543.1.1 by Denys Duchier
lock operations for trees - use them for diff
252
1465 by Robert Collins
Bugfix the new pull --clobber to not generate spurious conflicts.
253
1 by mbp at sourcefrog
import from baz patch-364
254
class EmptyTree(Tree):
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
255
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
256
    def __init__(self):
257
        self._inventory = Inventory()
1852.5.1 by Robert Collins
Deprecate EmptyTree in favour of using Repository.revision_tree.
258
        warn('EmptyTree is deprecated as of bzr 0.9 please use '
259
            'repository.revision_tree instead.',
260
            DeprecationWarning, stacklevel=2)
1 by mbp at sourcefrog
import from baz patch-364
261
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
262
    def get_parent_ids(self):
263
        return []
264
1092.2.6 by Robert Collins
symlink support updated to work
265
    def get_symlink_target(self, file_id):
266
        return None
267
1 by mbp at sourcefrog
import from baz patch-364
268
    def has_filename(self, filename):
269
        return False
270
1465 by Robert Collins
Bugfix the new pull --clobber to not generate spurious conflicts.
271
    def kind(self, file_id):
272
        assert self._inventory[file_id].kind == "root_directory"
273
        return "root_directory"
274
1551.6.36 by Aaron Bentley
Revert --debris/--detritus changes
275
    def list_files(self):
1732.1.14 by John Arbash Meinel
Some speedups by not calling pathjoin()
276
        return iter([])
1 by mbp at sourcefrog
import from baz patch-364
277
    
974.1.12 by aaron.bentley at utoronto
Switched from text-id to hashcache for merge optimization
278
    def __contains__(self, file_id):
279
        return file_id in self._inventory
280
1732.1.19 by John Arbash Meinel
If you have the path, use it rather than looking it up again
281
    def get_file_sha1(self, file_id, path=None):
974.1.14 by aaron.bentley at utoronto
Fixed bugs in merge optimization
282
        assert self._inventory[file_id].kind == "root_directory"
283
        return None
284
285
1 by mbp at sourcefrog
import from baz patch-364
286
######################################################################
287
# diff
288
289
# TODO: Merge these two functions into a single one that can operate
290
# on either a whole tree or a set of files.
291
292
# TODO: Return the diff in order by filename, not by category or in
293
# random order.  Can probably be done by lock-stepping through the
294
# filenames from both trees.
295
296
297
def file_status(filename, old_tree, new_tree):
298
    """Return single-letter status, old and new names for a file.
299
300
    The complexity here is in deciding how to represent renames;
301
    many complex cases are possible.
302
    """
303
    old_inv = old_tree.inventory
304
    new_inv = new_tree.inventory
305
    new_id = new_inv.path2id(filename)
306
    old_id = old_inv.path2id(filename)
307
308
    if not new_id and not old_id:
309
        # easy: doesn't exist in either; not versioned at all
310
        if new_tree.is_ignored(filename):
311
            return 'I', None, None
312
        else:
313
            return '?', None, None
314
    elif new_id:
315
        # There is now a file of this name, great.
316
        pass
317
    else:
318
        # There is no longer a file of this name, but we can describe
319
        # what happened to the file that used to have
320
        # this name.  There are two possibilities: either it was
321
        # deleted entirely, or renamed.
322
        assert old_id
323
        if new_inv.has_id(old_id):
324
            return 'X', old_inv.id2path(old_id), new_inv.id2path(old_id)
325
        else:
326
            return 'D', old_inv.id2path(old_id), None
327
328
    # if the file_id is new in this revision, it is added
329
    if new_id and not old_inv.has_id(new_id):
330
        return 'A'
331
332
    # if there used to be a file of this name, but that ID has now
333
    # disappeared, it is deleted
334
    if old_id and not new_inv.has_id(old_id):
335
        return 'D'
336
337
    return 'wtf?'
338
339
    
340
164 by mbp at sourcefrog
new 'renames' command
341
def find_renames(old_inv, new_inv):
342
    for file_id in old_inv:
343
        if file_id not in new_inv:
344
            continue
345
        old_name = old_inv.id2path(file_id)
346
        new_name = new_inv.id2path(file_id)
347
        if old_name != new_name:
348
            yield (old_name, new_name)
349
            
678 by Martin Pool
- export to tarballs
350
1551.7.22 by Aaron Bentley
Changes from review
351
def find_ids_across_trees(filenames, trees, require_versioned=True):
352
    """Find the ids corresponding to specified filenames.
353
    
354
    All matches in all trees will be used, and all children of matched
355
    directories will be used.
356
357
    :param filenames: The filenames to find file_ids for
358
    :param trees: The trees to find file_ids within
359
    :param require_versioned: if true, all specified filenames must occur in
360
    at least one tree.
361
    :return: a set of file ids for the specified filenames and their children.
362
    """
363
    if not filenames:
364
        return None
365
    specified_ids = _find_filename_ids_across_trees(filenames, trees, 
366
                                                    require_versioned)
367
    return _find_children_across_trees(specified_ids, trees)
368
369
370
def _find_filename_ids_across_trees(filenames, trees, require_versioned):
371
    """Find the ids corresponding to specified filenames.
372
    
373
    All matches in all trees will be used.
374
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
375
    :param filenames: The filenames to find file_ids for
376
    :param trees: The trees to find file_ids within
1551.7.16 by Aaron Bentley
Fix docs
377
    :param require_versioned: if true, all specified filenames must occur in
378
    at least one tree.
379
    :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
380
    """
1551.7.17 by Aaron Bentley
Switch to PathsNotVersioned, accept extra_trees
381
    not_versioned = []
1551.7.18 by Aaron Bentley
Indentation and documentation fixes
382
    interesting_ids = set()
383
    for tree_path in filenames:
384
        not_found = True
385
        for tree in trees:
386
            file_id = tree.inventory.path2id(tree_path)
387
            if file_id is not None:
388
                interesting_ids.add(file_id)
389
                not_found = False
390
        if not_found:
391
            not_versioned.append(tree_path)
1551.7.22 by Aaron Bentley
Changes from review
392
    if len(not_versioned) > 0 and require_versioned:
393
        raise errors.PathsNotVersionedError(not_versioned)
394
    return interesting_ids
395
396
397
def _find_children_across_trees(specified_ids, trees):
398
    """Return a set including specified ids and their children
1551.7.18 by Aaron Bentley
Indentation and documentation fixes
399
    
1551.7.22 by Aaron Bentley
Changes from review
400
    All matches in all trees will be used.
401
402
    :param trees: The trees to find file_ids within
403
    :return: a set containing all specified ids and their children 
404
    """
405
    interesting_ids = set(specified_ids)
1551.7.18 by Aaron Bentley
Indentation and documentation fixes
406
    pending = interesting_ids
407
    # now handle children of interesting ids
408
    # we loop so that we handle all children of each id in both trees
409
    while len(pending) > 0:
410
        new_pending = set()
411
        for file_id in pending:
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
412
            for tree in trees:
1551.7.18 by Aaron Bentley
Indentation and documentation fixes
413
                if file_id not in tree:
414
                    continue
415
                entry = tree.inventory[file_id]
416
                for child in getattr(entry, 'children', {}).itervalues():
417
                    if child.file_id not in interesting_ids:
418
                        new_pending.add(child.file_id)
419
        interesting_ids.update(new_pending)
420
        pending = new_pending
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
421
    return interesting_ids