~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
20
from sets import Set
21
import os.path, os, fnmatch
22
475 by Martin Pool
- rewrite diff using compare_trees()
23
from osutils import pumpfile, filesize, quotefn, sha_file, \
157 by mbp at sourcefrog
fix test case breakage
24
     joinpath, splitpath, appendpath, isdir, isfile, file_kind, fingerprint_file
25
import errno
26
from stat import S_ISREG, S_ISDIR, ST_MODE, ST_SIZE
27
1 by mbp at sourcefrog
import from baz patch-364
28
from inventory import Inventory
29
from trace import mutter, note
30
from errors import bailout
31
import branch
32
33
import bzrlib
34
558 by Martin Pool
- All top-level classes inherit from object
35
class Tree(object):
1 by mbp at sourcefrog
import from baz patch-364
36
    """Abstract file tree.
37
38
    There are several subclasses:
39
    
40
    * `WorkingTree` exists as files on disk editable by the user.
41
42
    * `RevisionTree` is a tree as recorded at some point in the past.
43
44
    * `EmptyTree`
45
46
    Trees contain an `Inventory` object, and also know how to retrieve
47
    file texts mentioned in the inventory, either from a working
48
    directory or from a store.
49
50
    It is possible for trees to contain files that are not described
51
    in their inventory or vice versa; for this use `filenames()`.
52
53
    Trees can be compared, etc, regardless of whether they are working
54
    trees or versioned trees.
55
    """
56
    
57
    def has_filename(self, filename):
58
        """True if the tree has given filename."""
59
        raise NotImplementedError()
60
61
    def has_id(self, file_id):
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
72
    def _get_inventory(self):
73
        return self._inventory
74
75
    inventory = property(_get_inventory,
76
                         doc="Inventory of this Tree")
77
78
    def _check_retrieved(self, ie, f):
130 by mbp at sourcefrog
- fixup checks on retrieved files to cope with compression,
79
        fp = fingerprint_file(f)
80
        f.seek(0)
81
        
184 by mbp at sourcefrog
pychecker fixups
82
        if ie.text_size != None:
131 by mbp at sourcefrog
check size and sha1 of files retrieved from the tree
83
            if ie.text_size != fp['size']:
1 by mbp at sourcefrog
import from baz patch-364
84
                bailout("mismatched size for file %r in %r" % (ie.file_id, self._store),
85
                        ["inventory expects %d bytes" % ie.text_size,
130 by mbp at sourcefrog
- fixup checks on retrieved files to cope with compression,
86
                         "file is actually %d bytes" % fp['size'],
1 by mbp at sourcefrog
import from baz patch-364
87
                         "store is probably damaged/corrupt"])
88
130 by mbp at sourcefrog
- fixup checks on retrieved files to cope with compression,
89
        if ie.text_sha1 != fp['sha1']:
1 by mbp at sourcefrog
import from baz patch-364
90
            bailout("wrong SHA-1 for file %r in %r" % (ie.file_id, self._store),
91
                    ["inventory expects %s" % ie.text_sha1,
130 by mbp at sourcefrog
- fixup checks on retrieved files to cope with compression,
92
                     "file is actually %s" % fp['sha1'],
1 by mbp at sourcefrog
import from baz patch-364
93
                     "store is probably damaged/corrupt"])
94
95
176 by mbp at sourcefrog
New cat command contributed by janmar.
96
    def print_file(self, fileid):
97
        """Print file with id `fileid` to stdout."""
98
        import sys
99
        pumpfile(self.get_file(fileid), sys.stdout)
100
        
101
        
102
    def export(self, dest):        
1 by mbp at sourcefrog
import from baz patch-364
103
        """Export this tree to a new directory.
104
105
        `dest` should not exist, and will be created holding the
106
        contents of this tree.
107
254 by Martin Pool
- Doc cleanups from Magnus Therning
108
        TODO: To handle subdirectories we need to create the
1 by mbp at sourcefrog
import from baz patch-364
109
               directories first.
110
111
        :note: If the export fails, the destination directory will be
112
               left in a half-assed state.
113
        """
114
        os.mkdir(dest)
115
        mutter('export version %r' % self)
116
        inv = self.inventory
117
        for dp, ie in inv.iter_entries():
118
            kind = ie.kind
119
            fullpath = appendpath(dest, dp)
120
            if kind == 'directory':
121
                os.mkdir(fullpath)
122
            elif kind == 'file':
123
                pumpfile(self.get_file(ie.file_id), file(fullpath, 'wb'))
124
            else:
453 by Martin Pool
- Split WorkingTree into its own file
125
                bailout("don't know how to export {%s} of kind %r" % (ie.file_id, kind))
1 by mbp at sourcefrog
import from baz patch-364
126
            mutter("  export {%s} kind %s to %s" % (ie.file_id, kind, fullpath))
127
128
129
130
class RevisionTree(Tree):
131
    """Tree viewing a previous revision.
132
133
    File text can be retrieved from the text store.
134
254 by Martin Pool
- Doc cleanups from Magnus Therning
135
    TODO: Some kind of `__repr__` method, but a good one
1 by mbp at sourcefrog
import from baz patch-364
136
           probably means knowing the branch and revision number,
137
           or at least passing a description to the constructor.
138
    """
139
    
140
    def __init__(self, store, inv):
141
        self._store = store
142
        self._inventory = inv
143
144
    def get_file(self, file_id):
145
        ie = self._inventory[file_id]
146
        f = self._store[ie.text_id]
147
        mutter("  get fileid{%s} from %r" % (file_id, self))
131 by mbp at sourcefrog
check size and sha1 of files retrieved from the tree
148
        self._check_retrieved(ie, f)
1 by mbp at sourcefrog
import from baz patch-364
149
        return f
150
151
    def get_file_size(self, file_id):
152
        return self._inventory[file_id].text_size
153
154
    def get_file_sha1(self, file_id):
155
        ie = self._inventory[file_id]
156
        return ie.text_sha1
157
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():
164
            yield path, 'V', entry.kind, entry.file_id
165
166
167
class EmptyTree(Tree):
168
    def __init__(self):
169
        self._inventory = Inventory()
170
171
    def has_filename(self, filename):
172
        return False
173
174
    def list_files(self):
175
        if False:  # just to make it a generator
176
            yield None
177
    
178
179
180
######################################################################
181
# diff
182
183
# TODO: Merge these two functions into a single one that can operate
184
# on either a whole tree or a set of files.
185
186
# TODO: Return the diff in order by filename, not by category or in
187
# random order.  Can probably be done by lock-stepping through the
188
# filenames from both trees.
189
190
191
def file_status(filename, old_tree, new_tree):
192
    """Return single-letter status, old and new names for a file.
193
194
    The complexity here is in deciding how to represent renames;
195
    many complex cases are possible.
196
    """
197
    old_inv = old_tree.inventory
198
    new_inv = new_tree.inventory
199
    new_id = new_inv.path2id(filename)
200
    old_id = old_inv.path2id(filename)
201
202
    if not new_id and not old_id:
203
        # easy: doesn't exist in either; not versioned at all
204
        if new_tree.is_ignored(filename):
205
            return 'I', None, None
206
        else:
207
            return '?', None, None
208
    elif new_id:
209
        # There is now a file of this name, great.
210
        pass
211
    else:
212
        # There is no longer a file of this name, but we can describe
213
        # what happened to the file that used to have
214
        # this name.  There are two possibilities: either it was
215
        # deleted entirely, or renamed.
216
        assert old_id
217
        if new_inv.has_id(old_id):
218
            return 'X', old_inv.id2path(old_id), new_inv.id2path(old_id)
219
        else:
220
            return 'D', old_inv.id2path(old_id), None
221
222
    # if the file_id is new in this revision, it is added
223
    if new_id and not old_inv.has_id(new_id):
224
        return 'A'
225
226
    # if there used to be a file of this name, but that ID has now
227
    # disappeared, it is deleted
228
    if old_id and not new_inv.has_id(old_id):
229
        return 'D'
230
231
    return 'wtf?'
232
233
    
234
164 by mbp at sourcefrog
new 'renames' command
235
def find_renames(old_inv, new_inv):
236
    for file_id in old_inv:
237
        if file_id not in new_inv:
238
            continue
239
        old_name = old_inv.id2path(file_id)
240
        new_name = new_inv.id2path(file_id)
241
        if old_name != new_name:
242
            yield (old_name, new_name)
243