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