/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
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
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
24
from bzrlib.trace import mutter, note
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
25
from bzrlib.errors import BzrError, BzrCheckError
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
1 by mbp at sourcefrog
import from baz patch-364
28
1732.1.3 by John Arbash Meinel
use iter_entries instead of lots of id2path calls
29
558 by Martin Pool
- All top-level classes inherit from object
30
class Tree(object):
1 by mbp at sourcefrog
import from baz patch-364
31
    """Abstract file tree.
32
33
    There are several subclasses:
34
    
35
    * `WorkingTree` exists as files on disk editable by the user.
36
37
    * `RevisionTree` is a tree as recorded at some point in the past.
38
39
    * `EmptyTree`
40
41
    Trees contain an `Inventory` object, and also know how to retrieve
42
    file texts mentioned in the inventory, either from a working
43
    directory or from a store.
44
45
    It is possible for trees to contain files that are not described
46
    in their inventory or vice versa; for this use `filenames()`.
47
48
    Trees can be compared, etc, regardless of whether they are working
49
    trees or versioned trees.
50
    """
51
    
52
    def has_filename(self, filename):
53
        """True if the tree has given filename."""
54
        raise NotImplementedError()
55
1185.12.39 by abentley
Propogated has_or_had_id to Tree
56
    def has_id(self, file_id):
57
        return self.inventory.has_id(file_id)
58
59
    def has_or_had_id(self, file_id):
60
        if file_id == self.inventory.root.file_id:
1185.12.38 by abentley
semi-broke merge
61
            return True
1 by mbp at sourcefrog
import from baz patch-364
62
        return self.inventory.has_id(file_id)
63
462 by Martin Pool
- New form 'file_id in tree' to check if the file is present
64
    __contains__ = has_id
65
66
    def __iter__(self):
67
        return iter(self.inventory)
68
1 by mbp at sourcefrog
import from baz patch-364
69
    def id2path(self, file_id):
70
        return self.inventory.id2path(file_id)
71
1465 by Robert Collins
Bugfix the new pull --clobber to not generate spurious conflicts.
72
    def kind(self, file_id):
73
        raise NotImplementedError("subclasses must implement kind")
74
1 by mbp at sourcefrog
import from baz patch-364
75
    def _get_inventory(self):
76
        return self._inventory
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
77
    
78
    def get_file_by_path(self, path):
79
        return self.get_file(self._inventory.path2id(path))
1 by mbp at sourcefrog
import from baz patch-364
80
81
    inventory = property(_get_inventory,
82
                         doc="Inventory of this Tree")
83
84
    def _check_retrieved(self, ie, f):
1364 by Martin Pool
- remove extra verification of files retrieved from tree
85
        if not __debug__:
86
            return  
130 by mbp at sourcefrog
- fixup checks on retrieved files to cope with compression,
87
        fp = fingerprint_file(f)
88
        f.seek(0)
89
        
184 by mbp at sourcefrog
pychecker fixups
90
        if ie.text_size != None:
131 by mbp at sourcefrog
check size and sha1 of files retrieved from the tree
91
            if ie.text_size != fp['size']:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
92
                raise BzrError("mismatched size for file %r in %r" % (ie.file_id, self._store),
1 by mbp at sourcefrog
import from baz patch-364
93
                        ["inventory expects %d bytes" % ie.text_size,
130 by mbp at sourcefrog
- fixup checks on retrieved files to cope with compression,
94
                         "file is actually %d bytes" % fp['size'],
1 by mbp at sourcefrog
import from baz patch-364
95
                         "store is probably damaged/corrupt"])
96
130 by mbp at sourcefrog
- fixup checks on retrieved files to cope with compression,
97
        if ie.text_sha1 != fp['sha1']:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
98
            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
99
                    ["inventory expects %s" % ie.text_sha1,
130 by mbp at sourcefrog
- fixup checks on retrieved files to cope with compression,
100
                     "file is actually %s" % fp['sha1'],
1 by mbp at sourcefrog
import from baz patch-364
101
                     "store is probably damaged/corrupt"])
102
103
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
104
    def print_file(self, file_id):
105
        """Print file with id `file_id` to stdout."""
176 by mbp at sourcefrog
New cat command contributed by janmar.
106
        import sys
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
107
        sys.stdout.write(self.get_file_text(file_id))
1543.1.1 by Denys Duchier
lock operations for trees - use them for diff
108
109
    def lock_read(self):
110
        pass
111
112
    def unlock(self):
113
        pass
1658.1.9 by Martin Pool
Give an error for bzr diff on an nonexistent file (Malone #3619)
114
115
    def filter_unversioned_files(self, paths):
116
        """Filter out paths that are not versioned.
117
118
        :return: set of paths.
119
        """
1658.1.10 by Martin Pool
diff on unversiond files should give an error (Malone #3619)
120
        # NB: we specifically *don't* call self.has_filename, because for
121
        # WorkingTrees that can indicate files that exist on disk but that 
122
        # are not versioned.
123
        pred = self.inventory.has_filename
124
        return set((p for p in paths if not pred(p)))
176 by mbp at sourcefrog
New cat command contributed by janmar.
125
        
126
        
1 by mbp at sourcefrog
import from baz patch-364
127
class RevisionTree(Tree):
128
    """Tree viewing a previous revision.
129
130
    File text can be retrieved from the text store.
131
254 by Martin Pool
- Doc cleanups from Magnus Therning
132
    TODO: Some kind of `__repr__` method, but a good one
1 by mbp at sourcefrog
import from baz patch-364
133
           probably means knowing the branch and revision number,
134
           or at least passing a description to the constructor.
135
    """
136
    
1185.50.28 by John Arbash Meinel
Lots of updates for 'bzr check'
137
    def __init__(self, branch, inv, revision_id):
138
        self._branch = branch
139
        self._weave_store = branch.weave_store
1 by mbp at sourcefrog
import from baz patch-364
140
        self._inventory = inv
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
141
        self._revision_id = revision_id
142
1210 by Martin Pool
- get correct old file version in RevisionTree
143
    def get_weave(self, file_id):
1417.1.8 by Robert Collins
use transactions in the weave store interface, which enables caching for log
144
        return self._weave_store.get_weave(file_id,
1185.50.28 by John Arbash Meinel
Lots of updates for 'bzr check'
145
                self._branch.get_transaction())
1369 by Martin Pool
- try to avoid redundant conversion of strings when retrieving from weaves
146
147
    def get_file_lines(self, file_id):
148
        ie = self._inventory[file_id]
149
        weave = self.get_weave(file_id)
1563.2.13 by Robert Collins
InterVersionedFile implemented.
150
        return weave.get_lines(ie.revision)
1210 by Martin Pool
- get correct old file version in RevisionTree
151
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
152
    def get_file_text(self, file_id):
1369 by Martin Pool
- try to avoid redundant conversion of strings when retrieving from weaves
153
        return ''.join(self.get_file_lines(file_id))
154
1 by mbp at sourcefrog
import from baz patch-364
155
    def get_file(self, file_id):
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
156
        return StringIO(self.get_file_text(file_id))
1 by mbp at sourcefrog
import from baz patch-364
157
158
    def get_file_size(self, file_id):
159
        return self._inventory[file_id].text_size
160
161
    def get_file_sha1(self, file_id):
162
        ie = self._inventory[file_id]
974.1.12 by aaron.bentley at utoronto
Switched from text-id to hashcache for merge optimization
163
        if ie.kind == "file":
164
            return ie.text_sha1
1 by mbp at sourcefrog
import from baz patch-364
165
1398 by Robert Collins
integrate in Gustavos x-bit patch
166
    def is_executable(self, file_id):
1185.12.28 by Aaron Bentley
Removed use of readonly path for executability test
167
        ie = self._inventory[file_id]
168
        if ie.kind != "file":
169
            return None 
1398 by Robert Collins
integrate in Gustavos x-bit patch
170
        return self._inventory[file_id].executable
171
1 by mbp at sourcefrog
import from baz patch-364
172
    def has_filename(self, filename):
173
        return bool(self.inventory.path2id(filename))
174
1732.1.3 by John Arbash Meinel
use iter_entries instead of lots of id2path calls
175
    def has_file_or_id(self, filename, file_id):
176
        """Do we have this filename or file_id?
177
178
        Some trees are faster to lookup by filename, some
179
        are faster by id, if we have both, figure out which
180
        one is better.
181
        """
182
        # Default to has_id, since that is best for Revision trees
183
        return self.has_id(file_id)
184
1 by mbp at sourcefrog
import from baz patch-364
185
    def list_files(self):
186
        # The only files returned by this are those from the version
187
        for path, entry in self.inventory.iter_entries():
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
188
            yield path, 'V', entry.kind, entry.file_id, entry
1 by mbp at sourcefrog
import from baz patch-364
189
1092.2.6 by Robert Collins
symlink support updated to work
190
    def get_symlink_target(self, file_id):
191
        ie = self._inventory[file_id]
192
        return ie.symlink_target;
1 by mbp at sourcefrog
import from baz patch-364
193
1185.12.28 by Aaron Bentley
Removed use of readonly path for executability test
194
    def kind(self, file_id):
195
        return self._inventory[file_id].kind
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
196
1543.1.1 by Denys Duchier
lock operations for trees - use them for diff
197
    def lock_read(self):
198
        self._branch.lock_read()
199
200
    def unlock(self):
201
        self._branch.unlock()
202
1465 by Robert Collins
Bugfix the new pull --clobber to not generate spurious conflicts.
203
1 by mbp at sourcefrog
import from baz patch-364
204
class EmptyTree(Tree):
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
205
    def __init__(self):
206
        self._inventory = Inventory()
1 by mbp at sourcefrog
import from baz patch-364
207
1092.2.6 by Robert Collins
symlink support updated to work
208
    def get_symlink_target(self, file_id):
209
        return None
210
1 by mbp at sourcefrog
import from baz patch-364
211
    def has_filename(self, filename):
212
        return False
213
1465 by Robert Collins
Bugfix the new pull --clobber to not generate spurious conflicts.
214
    def kind(self, file_id):
215
        assert self._inventory[file_id].kind == "root_directory"
216
        return "root_directory"
217
1 by mbp at sourcefrog
import from baz patch-364
218
    def list_files(self):
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
219
        return iter([])
1 by mbp at sourcefrog
import from baz patch-364
220
    
974.1.12 by aaron.bentley at utoronto
Switched from text-id to hashcache for merge optimization
221
    def __contains__(self, file_id):
222
        return file_id in self._inventory
223
974.1.14 by aaron.bentley at utoronto
Fixed bugs in merge optimization
224
    def get_file_sha1(self, file_id):
225
        assert self._inventory[file_id].kind == "root_directory"
226
        return None
227
228
1 by mbp at sourcefrog
import from baz patch-364
229
######################################################################
230
# diff
231
232
# TODO: Merge these two functions into a single one that can operate
233
# on either a whole tree or a set of files.
234
235
# TODO: Return the diff in order by filename, not by category or in
236
# random order.  Can probably be done by lock-stepping through the
237
# filenames from both trees.
238
239
240
def file_status(filename, old_tree, new_tree):
241
    """Return single-letter status, old and new names for a file.
242
243
    The complexity here is in deciding how to represent renames;
244
    many complex cases are possible.
245
    """
246
    old_inv = old_tree.inventory
247
    new_inv = new_tree.inventory
248
    new_id = new_inv.path2id(filename)
249
    old_id = old_inv.path2id(filename)
250
251
    if not new_id and not old_id:
252
        # easy: doesn't exist in either; not versioned at all
253
        if new_tree.is_ignored(filename):
254
            return 'I', None, None
255
        else:
256
            return '?', None, None
257
    elif new_id:
258
        # There is now a file of this name, great.
259
        pass
260
    else:
261
        # There is no longer a file of this name, but we can describe
262
        # what happened to the file that used to have
263
        # this name.  There are two possibilities: either it was
264
        # deleted entirely, or renamed.
265
        assert old_id
266
        if new_inv.has_id(old_id):
267
            return 'X', old_inv.id2path(old_id), new_inv.id2path(old_id)
268
        else:
269
            return 'D', old_inv.id2path(old_id), None
270
271
    # if the file_id is new in this revision, it is added
272
    if new_id and not old_inv.has_id(new_id):
273
        return 'A'
274
275
    # if there used to be a file of this name, but that ID has now
276
    # disappeared, it is deleted
277
    if old_id and not new_inv.has_id(old_id):
278
        return 'D'
279
280
    return 'wtf?'
281
282
    
283
164 by mbp at sourcefrog
new 'renames' command
284
def find_renames(old_inv, new_inv):
285
    for file_id in old_inv:
286
        if file_id not in new_inv:
287
            continue
288
        old_name = old_inv.id2path(file_id)
289
        new_name = new_inv.id2path(file_id)
290
        if old_name != new_name:
291
            yield (old_name, new_name)
292
            
678 by Martin Pool
- export to tarballs
293
294