~bzr-pqm/bzr/bzr.dev

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