~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
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
1399.1.6 by Robert Collins
move exporting functionality into inventory.py - uncovers bug in symlink support
27
from bzrlib.osutils import appendpath, fingerprint_file
1 by mbp at sourcefrog
import from baz patch-364
28
29
678 by Martin Pool
- export to tarballs
30
exporters = {}
31
558 by Martin Pool
- All top-level classes inherit from object
32
class Tree(object):
1 by mbp at sourcefrog
import from baz patch-364
33
    """Abstract file tree.
34
35
    There are several subclasses:
36
    
37
    * `WorkingTree` exists as files on disk editable by the user.
38
39
    * `RevisionTree` is a tree as recorded at some point in the past.
40
41
    * `EmptyTree`
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
    
54
    def has_filename(self, filename):
55
        """True if the tree has given filename."""
56
        raise NotImplementedError()
57
58
    def has_id(self, file_id):
59
        return self.inventory.has_id(file_id)
60
462 by Martin Pool
- New form 'file_id in tree' to check if the file is present
61
    __contains__ = has_id
62
63
    def __iter__(self):
64
        return iter(self.inventory)
65
1 by mbp at sourcefrog
import from baz patch-364
66
    def id2path(self, file_id):
67
        return self.inventory.id2path(file_id)
68
69
    def _get_inventory(self):
70
        return self._inventory
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
71
    
72
    def get_file_by_path(self, path):
73
        return self.get_file(self._inventory.path2id(path))
1 by mbp at sourcefrog
import from baz patch-364
74
75
    inventory = property(_get_inventory,
76
                         doc="Inventory of this Tree")
77
78
    def _check_retrieved(self, ie, f):
1364 by Martin Pool
- remove extra verification of files retrieved from tree
79
        if not __debug__:
80
            return  
130 by mbp at sourcefrog
- fixup checks on retrieved files to cope with compression,
81
        fp = fingerprint_file(f)
82
        f.seek(0)
83
        
184 by mbp at sourcefrog
pychecker fixups
84
        if ie.text_size != None:
131 by mbp at sourcefrog
check size and sha1 of files retrieved from the tree
85
            if ie.text_size != fp['size']:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
86
                raise BzrError("mismatched size for file %r in %r" % (ie.file_id, self._store),
1 by mbp at sourcefrog
import from baz patch-364
87
                        ["inventory expects %d bytes" % ie.text_size,
130 by mbp at sourcefrog
- fixup checks on retrieved files to cope with compression,
88
                         "file is actually %d bytes" % fp['size'],
1 by mbp at sourcefrog
import from baz patch-364
89
                         "store is probably damaged/corrupt"])
90
130 by mbp at sourcefrog
- fixup checks on retrieved files to cope with compression,
91
        if ie.text_sha1 != fp['sha1']:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
92
            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
93
                    ["inventory expects %s" % ie.text_sha1,
130 by mbp at sourcefrog
- fixup checks on retrieved files to cope with compression,
94
                     "file is actually %s" % fp['sha1'],
1 by mbp at sourcefrog
import from baz patch-364
95
                     "store is probably damaged/corrupt"])
96
97
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
98
    def print_file(self, file_id):
99
        """Print file with id `file_id` to stdout."""
176 by mbp at sourcefrog
New cat command contributed by janmar.
100
        import sys
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
101
        sys.stdout.write(self.get_file_text(file_id))
176 by mbp at sourcefrog
New cat command contributed by janmar.
102
        
103
        
849 by Martin Pool
- Put files inside an exported tarball into a top-level directory rather than
104
    def export(self, dest, format='dir', root=None):
678 by Martin Pool
- export to tarballs
105
        """Export this tree."""
106
        try:
107
            exporter = exporters[format]
108
        except KeyError:
849 by Martin Pool
- Put files inside an exported tarball into a top-level directory rather than
109
            from bzrlib.errors import BzrCommandError
678 by Martin Pool
- export to tarballs
110
            raise BzrCommandError("export format %r not supported" % format)
849 by Martin Pool
- Put files inside an exported tarball into a top-level directory rather than
111
        exporter(self, dest, root)
1 by mbp at sourcefrog
import from baz patch-364
112
113
114
115
class RevisionTree(Tree):
116
    """Tree viewing a previous revision.
117
118
    File text can be retrieved from the text store.
119
254 by Martin Pool
- Doc cleanups from Magnus Therning
120
    TODO: Some kind of `__repr__` method, but a good one
1 by mbp at sourcefrog
import from baz patch-364
121
           probably means knowing the branch and revision number,
122
           or at least passing a description to the constructor.
123
    """
124
    
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
125
    def __init__(self, weave_store, inv, revision_id):
126
        self._weave_store = weave_store
1 by mbp at sourcefrog
import from baz patch-364
127
        self._inventory = inv
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
128
        self._revision_id = revision_id
129
1210 by Martin Pool
- get correct old file version in RevisionTree
130
    def get_weave(self, file_id):
131
        return self._weave_store.get_weave(file_id)
1369 by Martin Pool
- try to avoid redundant conversion of strings when retrieving from weaves
132
133
134
    def get_file_lines(self, file_id):
135
        ie = self._inventory[file_id]
136
        weave = self.get_weave(file_id)
1092.2.22 by Robert Collins
text_version and name_version unification looking reasonable
137
        return weave.get(ie.revision)
1210 by Martin Pool
- get correct old file version in RevisionTree
138
        
139
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
140
    def get_file_text(self, file_id):
1369 by Martin Pool
- try to avoid redundant conversion of strings when retrieving from weaves
141
        return ''.join(self.get_file_lines(file_id))
142
1 by mbp at sourcefrog
import from baz patch-364
143
144
    def get_file(self, file_id):
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
145
        return StringIO(self.get_file_text(file_id))
1 by mbp at sourcefrog
import from baz patch-364
146
147
    def get_file_size(self, file_id):
148
        return self._inventory[file_id].text_size
149
150
    def get_file_sha1(self, file_id):
151
        ie = self._inventory[file_id]
974.1.12 by aaron.bentley at utoronto
Switched from text-id to hashcache for merge optimization
152
        if ie.kind == "file":
153
            return ie.text_sha1
1 by mbp at sourcefrog
import from baz patch-364
154
1398 by Robert Collins
integrate in Gustavos x-bit patch
155
    def is_executable(self, file_id):
156
        return self._inventory[file_id].executable
157
1 by mbp at sourcefrog
import from baz patch-364
158
    def has_filename(self, filename):
159
        return bool(self.inventory.path2id(filename))
160
161
    def list_files(self):
162
        # The only files returned by this are those from the version
163
        for path, entry in self.inventory.iter_entries():
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
164
            yield path, 'V', entry.kind, entry.file_id, entry
1 by mbp at sourcefrog
import from baz patch-364
165
1092.2.6 by Robert Collins
symlink support updated to work
166
    def get_symlink_target(self, file_id):
167
        ie = self._inventory[file_id]
168
        return ie.symlink_target;
1 by mbp at sourcefrog
import from baz patch-364
169
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
170
1 by mbp at sourcefrog
import from baz patch-364
171
class EmptyTree(Tree):
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
172
    def __init__(self):
173
        self._inventory = Inventory()
1 by mbp at sourcefrog
import from baz patch-364
174
1092.2.6 by Robert Collins
symlink support updated to work
175
    def get_symlink_target(self, file_id):
176
        return None
177
1 by mbp at sourcefrog
import from baz patch-364
178
    def has_filename(self, filename):
179
        return False
180
181
    def list_files(self):
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
182
        return iter([])
1 by mbp at sourcefrog
import from baz patch-364
183
    
974.1.12 by aaron.bentley at utoronto
Switched from text-id to hashcache for merge optimization
184
    def __contains__(self, file_id):
185
        return file_id in self._inventory
186
974.1.14 by aaron.bentley at utoronto
Fixed bugs in merge optimization
187
    def get_file_sha1(self, file_id):
188
        assert self._inventory[file_id].kind == "root_directory"
189
        return None
190
191
1 by mbp at sourcefrog
import from baz patch-364
192
######################################################################
193
# diff
194
195
# TODO: Merge these two functions into a single one that can operate
196
# on either a whole tree or a set of files.
197
198
# TODO: Return the diff in order by filename, not by category or in
199
# random order.  Can probably be done by lock-stepping through the
200
# filenames from both trees.
201
202
203
def file_status(filename, old_tree, new_tree):
204
    """Return single-letter status, old and new names for a file.
205
206
    The complexity here is in deciding how to represent renames;
207
    many complex cases are possible.
208
    """
209
    old_inv = old_tree.inventory
210
    new_inv = new_tree.inventory
211
    new_id = new_inv.path2id(filename)
212
    old_id = old_inv.path2id(filename)
213
214
    if not new_id and not old_id:
215
        # easy: doesn't exist in either; not versioned at all
216
        if new_tree.is_ignored(filename):
217
            return 'I', None, None
218
        else:
219
            return '?', None, None
220
    elif new_id:
221
        # There is now a file of this name, great.
222
        pass
223
    else:
224
        # There is no longer a file of this name, but we can describe
225
        # what happened to the file that used to have
226
        # this name.  There are two possibilities: either it was
227
        # deleted entirely, or renamed.
228
        assert old_id
229
        if new_inv.has_id(old_id):
230
            return 'X', old_inv.id2path(old_id), new_inv.id2path(old_id)
231
        else:
232
            return 'D', old_inv.id2path(old_id), None
233
234
    # if the file_id is new in this revision, it is added
235
    if new_id and not old_inv.has_id(new_id):
236
        return 'A'
237
238
    # if there used to be a file of this name, but that ID has now
239
    # disappeared, it is deleted
240
    if old_id and not new_inv.has_id(old_id):
241
        return 'D'
242
243
    return 'wtf?'
244
245
    
246
164 by mbp at sourcefrog
new 'renames' command
247
def find_renames(old_inv, new_inv):
248
    for file_id in old_inv:
249
        if file_id not in new_inv:
250
            continue
251
        old_name = old_inv.id2path(file_id)
252
        new_name = new_inv.id2path(file_id)
253
        if old_name != new_name:
254
            yield (old_name, new_name)
255
            
678 by Martin Pool
- export to tarballs
256
257
258
######################################################################
259
# export
260
849 by Martin Pool
- Put files inside an exported tarball into a top-level directory rather than
261
def dir_exporter(tree, dest, root):
678 by Martin Pool
- export to tarballs
262
    """Export this tree to a new directory.
263
264
    `dest` should not exist, and will be created holding the
265
    contents of this tree.
266
267
    TODO: To handle subdirectories we need to create the
268
           directories first.
269
270
    :note: If the export fails, the destination directory will be
271
           left in a half-assed state.
272
    """
800 by Martin Pool
Merge John's import-speedup branch:
273
    import os
678 by Martin Pool
- export to tarballs
274
    os.mkdir(dest)
275
    mutter('export version %r' % tree)
276
    inv = tree.inventory
277
    for dp, ie in inv.iter_entries():
1399.1.6 by Robert Collins
move exporting functionality into inventory.py - uncovers bug in symlink support
278
        ie.put_on_disk(dest, dp, tree)
279
678 by Martin Pool
- export to tarballs
280
exporters['dir'] = dir_exporter
281
282
try:
283
    import tarfile
284
except ImportError:
285
    pass
286
else:
849 by Martin Pool
- Put files inside an exported tarball into a top-level directory rather than
287
    def get_root_name(dest):
288
        """Get just the root name for a tarball.
289
290
        >>> get_root_name('mytar.tar')
291
        'mytar'
292
        >>> get_root_name('mytar.tar.bz2')
293
        'mytar'
294
        >>> get_root_name('tar.tar.tar.tgz')
295
        'tar.tar.tar'
296
        >>> get_root_name('bzr-0.0.5.tar.gz')
297
        'bzr-0.0.5'
298
        >>> get_root_name('a/long/path/mytar.tgz')
299
        'mytar'
300
        >>> get_root_name('../parent/../dir/other.tbz2')
301
        'other'
302
        """
303
        endings = ['.tar', '.tar.gz', '.tgz', '.tar.bz2', '.tbz2']
304
        dest = os.path.basename(dest)
305
        for end in endings:
306
            if dest.endswith(end):
307
                return dest[:-len(end)]
308
309
    def tar_exporter(tree, dest, root, compression=None):
678 by Martin Pool
- export to tarballs
310
        """Export this tree to a new tar file.
311
312
        `dest` will be created holding the contents of this tree; if it
313
        already exists, it will be clobbered, like with "tar -c".
314
        """
800 by Martin Pool
Merge John's import-speedup branch:
315
        from time import time
316
        now = time()
678 by Martin Pool
- export to tarballs
317
        compression = str(compression or '')
849 by Martin Pool
- Put files inside an exported tarball into a top-level directory rather than
318
        if root is None:
319
            root = get_root_name(dest)
678 by Martin Pool
- export to tarballs
320
        try:
321
            ball = tarfile.open(dest, 'w:' + compression)
322
        except tarfile.CompressionError, e:
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
323
            raise BzrError(str(e))
678 by Martin Pool
- export to tarballs
324
        mutter('export version %r' % tree)
325
        inv = tree.inventory
326
        for dp, ie in inv.iter_entries():
327
            mutter("  export {%s} kind %s to %s" % (ie.file_id, ie.kind, dest))
1399.1.6 by Robert Collins
move exporting functionality into inventory.py - uncovers bug in symlink support
328
            item, fileobj = ie.get_tar_item(root, dp, now, tree)
678 by Martin Pool
- export to tarballs
329
            ball.addfile(item, fileobj)
330
        ball.close()
1399.1.6 by Robert Collins
move exporting functionality into inventory.py - uncovers bug in symlink support
331
678 by Martin Pool
- export to tarballs
332
    exporters['tar'] = tar_exporter
333
849 by Martin Pool
- Put files inside an exported tarball into a top-level directory rather than
334
    def tgz_exporter(tree, dest, root):
335
        tar_exporter(tree, dest, root, compression='gz')
678 by Martin Pool
- export to tarballs
336
    exporters['tgz'] = tgz_exporter
337
849 by Martin Pool
- Put files inside an exported tarball into a top-level directory rather than
338
    def tbz_exporter(tree, dest, root):
339
        tar_exporter(tree, dest, root, compression='bz2')
678 by Martin Pool
- export to tarballs
340
    exporters['tbz2'] = tbz_exporter