/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
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)))
1852.7.1 by Robert Collins
Move RevisionTree out of tree.py.
149
150
151
# for compatibility
152
from bzrlib.revisiontree import RevisionTree
153
 
1465 by Robert Collins
Bugfix the new pull --clobber to not generate spurious conflicts.
154
1 by mbp at sourcefrog
import from baz patch-364
155
class EmptyTree(Tree):
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
156
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
157
    def __init__(self):
158
        self._inventory = Inventory()
1852.5.1 by Robert Collins
Deprecate EmptyTree in favour of using Repository.revision_tree.
159
        warn('EmptyTree is deprecated as of bzr 0.9 please use '
160
            'repository.revision_tree instead.',
161
            DeprecationWarning, stacklevel=2)
1 by mbp at sourcefrog
import from baz patch-364
162
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
163
    def get_parent_ids(self):
164
        return []
165
1092.2.6 by Robert Collins
symlink support updated to work
166
    def get_symlink_target(self, file_id):
167
        return None
168
1 by mbp at sourcefrog
import from baz patch-364
169
    def has_filename(self, filename):
170
        return False
171
1465 by Robert Collins
Bugfix the new pull --clobber to not generate spurious conflicts.
172
    def kind(self, file_id):
173
        assert self._inventory[file_id].kind == "root_directory"
174
        return "root_directory"
175
1551.6.36 by Aaron Bentley
Revert --debris/--detritus changes
176
    def list_files(self):
1732.1.14 by John Arbash Meinel
Some speedups by not calling pathjoin()
177
        return iter([])
1 by mbp at sourcefrog
import from baz patch-364
178
    
974.1.12 by aaron.bentley at utoronto
Switched from text-id to hashcache for merge optimization
179
    def __contains__(self, file_id):
180
        return file_id in self._inventory
181
1732.1.19 by John Arbash Meinel
If you have the path, use it rather than looking it up again
182
    def get_file_sha1(self, file_id, path=None):
974.1.14 by aaron.bentley at utoronto
Fixed bugs in merge optimization
183
        assert self._inventory[file_id].kind == "root_directory"
184
        return None
185
186
1 by mbp at sourcefrog
import from baz patch-364
187
######################################################################
188
# diff
189
190
# TODO: Merge these two functions into a single one that can operate
191
# on either a whole tree or a set of files.
192
193
# TODO: Return the diff in order by filename, not by category or in
194
# random order.  Can probably be done by lock-stepping through the
195
# filenames from both trees.
196
197
198
def file_status(filename, old_tree, new_tree):
199
    """Return single-letter status, old and new names for a file.
200
201
    The complexity here is in deciding how to represent renames;
202
    many complex cases are possible.
203
    """
204
    old_inv = old_tree.inventory
205
    new_inv = new_tree.inventory
206
    new_id = new_inv.path2id(filename)
207
    old_id = old_inv.path2id(filename)
208
209
    if not new_id and not old_id:
210
        # easy: doesn't exist in either; not versioned at all
211
        if new_tree.is_ignored(filename):
212
            return 'I', None, None
213
        else:
214
            return '?', None, None
215
    elif new_id:
216
        # There is now a file of this name, great.
217
        pass
218
    else:
219
        # There is no longer a file of this name, but we can describe
220
        # what happened to the file that used to have
221
        # this name.  There are two possibilities: either it was
222
        # deleted entirely, or renamed.
223
        assert old_id
224
        if new_inv.has_id(old_id):
225
            return 'X', old_inv.id2path(old_id), new_inv.id2path(old_id)
226
        else:
227
            return 'D', old_inv.id2path(old_id), None
228
229
    # if the file_id is new in this revision, it is added
230
    if new_id and not old_inv.has_id(new_id):
231
        return 'A'
232
233
    # if there used to be a file of this name, but that ID has now
234
    # disappeared, it is deleted
235
    if old_id and not new_inv.has_id(old_id):
236
        return 'D'
237
238
    return 'wtf?'
239
240
    
241
164 by mbp at sourcefrog
new 'renames' command
242
def find_renames(old_inv, new_inv):
243
    for file_id in old_inv:
244
        if file_id not in new_inv:
245
            continue
246
        old_name = old_inv.id2path(file_id)
247
        new_name = new_inv.id2path(file_id)
248
        if old_name != new_name:
249
            yield (old_name, new_name)
250
            
678 by Martin Pool
- export to tarballs
251
1551.7.22 by Aaron Bentley
Changes from review
252
def find_ids_across_trees(filenames, trees, require_versioned=True):
253
    """Find the ids corresponding to specified filenames.
254
    
255
    All matches in all trees will be used, and all children of matched
256
    directories will be used.
257
258
    :param filenames: The filenames to find file_ids for
259
    :param trees: The trees to find file_ids within
260
    :param require_versioned: if true, all specified filenames must occur in
261
    at least one tree.
262
    :return: a set of file ids for the specified filenames and their children.
263
    """
264
    if not filenames:
265
        return None
266
    specified_ids = _find_filename_ids_across_trees(filenames, trees, 
267
                                                    require_versioned)
268
    return _find_children_across_trees(specified_ids, trees)
269
270
271
def _find_filename_ids_across_trees(filenames, trees, require_versioned):
272
    """Find the ids corresponding to specified filenames.
273
    
274
    All matches in all trees will be used.
275
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
276
    :param filenames: The filenames to find file_ids for
277
    :param trees: The trees to find file_ids within
1551.7.16 by Aaron Bentley
Fix docs
278
    :param require_versioned: if true, all specified filenames must occur in
279
    at least one tree.
280
    :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
281
    """
1551.7.17 by Aaron Bentley
Switch to PathsNotVersioned, accept extra_trees
282
    not_versioned = []
1551.7.18 by Aaron Bentley
Indentation and documentation fixes
283
    interesting_ids = set()
284
    for tree_path in filenames:
285
        not_found = True
286
        for tree in trees:
287
            file_id = tree.inventory.path2id(tree_path)
288
            if file_id is not None:
289
                interesting_ids.add(file_id)
290
                not_found = False
291
        if not_found:
292
            not_versioned.append(tree_path)
1551.7.22 by Aaron Bentley
Changes from review
293
    if len(not_versioned) > 0 and require_versioned:
294
        raise errors.PathsNotVersionedError(not_versioned)
295
    return interesting_ids
296
297
298
def _find_children_across_trees(specified_ids, trees):
299
    """Return a set including specified ids and their children
1551.7.18 by Aaron Bentley
Indentation and documentation fixes
300
    
1551.7.22 by Aaron Bentley
Changes from review
301
    All matches in all trees will be used.
302
303
    :param trees: The trees to find file_ids within
304
    :return: a set containing all specified ids and their children 
305
    """
306
    interesting_ids = set(specified_ids)
1551.7.18 by Aaron Bentley
Indentation and documentation fixes
307
    pending = interesting_ids
308
    # now handle children of interesting ids
309
    # we loop so that we handle all children of each id in both trees
310
    while len(pending) > 0:
311
        new_pending = set()
312
        for file_id in pending:
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
313
            for tree in trees:
1551.7.18 by Aaron Bentley
Indentation and documentation fixes
314
                if file_id not in tree:
315
                    continue
316
                entry = tree.inventory[file_id]
317
                for child in getattr(entry, 'children', {}).itervalues():
318
                    if child.file_id not in interesting_ids:
319
                        new_pending.add(child.file_id)
320
        interesting_ids.update(new_pending)
321
        pending = new_pending
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
322
    return interesting_ids