1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
|
# Copyright (C) 2005 Canonical Ltd
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
"""Tree classes, representing directory at point in time.
"""
from sets import Set
import os.path, os, fnmatch
from osutils import pumpfile, compare_files, filesize, quotefn, sha_file, \
joinpath, splitpath, appendpath, isdir, isfile, file_kind, fingerprint_file
import errno
from stat import S_ISREG, S_ISDIR, ST_MODE, ST_SIZE
from inventory import Inventory
from trace import mutter, note
from errors import bailout
import branch
import bzrlib
class Tree:
"""Abstract file tree.
There are several subclasses:
* `WorkingTree` exists as files on disk editable by the user.
* `RevisionTree` is a tree as recorded at some point in the past.
* `EmptyTree`
Trees contain an `Inventory` object, and also know how to retrieve
file texts mentioned in the inventory, either from a working
directory or from a store.
It is possible for trees to contain files that are not described
in their inventory or vice versa; for this use `filenames()`.
Trees can be compared, etc, regardless of whether they are working
trees or versioned trees.
"""
def has_filename(self, filename):
"""True if the tree has given filename."""
raise NotImplementedError()
def has_id(self, file_id):
return self.inventory.has_id(file_id)
def id_set(self):
"""Return set of all ids in this tree."""
return self.inventory.id_set()
def id2path(self, file_id):
return self.inventory.id2path(file_id)
def _get_inventory(self):
return self._inventory
inventory = property(_get_inventory,
doc="Inventory of this Tree")
def _check_retrieved(self, ie, f):
fp = fingerprint_file(f)
f.seek(0)
if ie.text_size != None:
if ie.text_size != fp['size']:
bailout("mismatched size for file %r in %r" % (ie.file_id, self._store),
["inventory expects %d bytes" % ie.text_size,
"file is actually %d bytes" % fp['size'],
"store is probably damaged/corrupt"])
if ie.text_sha1 != fp['sha1']:
bailout("wrong SHA-1 for file %r in %r" % (ie.file_id, self._store),
["inventory expects %s" % ie.text_sha1,
"file is actually %s" % fp['sha1'],
"store is probably damaged/corrupt"])
def print_file(self, fileid):
"""Print file with id `fileid` to stdout."""
import sys
pumpfile(self.get_file(fileid), sys.stdout)
def export(self, dest):
"""Export this tree to a new directory.
`dest` should not exist, and will be created holding the
contents of this tree.
TODO: To handle subdirectories we need to create the
directories first.
:note: If the export fails, the destination directory will be
left in a half-assed state.
"""
os.mkdir(dest)
mutter('export version %r' % self)
inv = self.inventory
for dp, ie in inv.iter_entries():
kind = ie.kind
fullpath = appendpath(dest, dp)
if kind == 'directory':
os.mkdir(fullpath)
elif kind == 'file':
pumpfile(self.get_file(ie.file_id), file(fullpath, 'wb'))
else:
bailout("don't know how to export {%s} of kind %r" % (fid, kind))
mutter(" export {%s} kind %s to %s" % (ie.file_id, kind, fullpath))
class WorkingTree(Tree):
"""Working copy tree.
The inventory is held in the `Branch` working-inventory, and the
files are in a directory on disk.
It is possible for a `WorkingTree` to have a filename which is
not listed in the Inventory and vice versa.
"""
def __init__(self, basedir, inv):
self._inventory = inv
self.basedir = basedir
self.path2id = inv.path2id
def __repr__(self):
return "<%s of %s>" % (self.__class__.__name__,
self.basedir)
def abspath(self, filename):
return os.path.join(self.basedir, filename)
def has_filename(self, filename):
return os.path.exists(self.abspath(filename))
def get_file(self, file_id):
return self.get_file_byname(self.id2path(file_id))
def get_file_byname(self, filename):
return file(self.abspath(filename), 'rb')
def _get_store_filename(self, file_id):
## XXX: badly named; this isn't in the store at all
return self.abspath(self.id2path(file_id))
def has_id(self, file_id):
# files that have been deleted are excluded
if not self.inventory.has_id(file_id):
return False
return os.access(self.abspath(self.inventory.id2path(file_id)), os.F_OK)
def get_file_size(self, file_id):
return os.stat(self._get_store_filename(file_id))[ST_SIZE]
def get_file_sha1(self, file_id):
f = self.get_file(file_id)
return sha_file(f)
def file_class(self, filename):
if self.path2id(filename):
return 'V'
elif self.is_ignored(filename):
return 'I'
else:
return '?'
def list_files(self):
"""Recursively list all files as (path, class, kind, id).
Lists, but does not descend into unversioned directories.
This does not include files that have been deleted in this
tree.
Skips the control directory.
"""
inv = self.inventory
def descend(from_dir_relpath, from_dir_id, dp):
ls = os.listdir(dp)
ls.sort()
for f in ls:
## TODO: If we find a subdirectory with its own .bzr
## directory, then that is a separate tree and we
## should exclude it.
if bzrlib.BZRDIR == f:
continue
# path within tree
fp = appendpath(from_dir_relpath, f)
# absolute path
fap = appendpath(dp, f)
f_ie = inv.get_child(from_dir_id, f)
if f_ie:
c = 'V'
elif self.is_ignored(fp):
c = 'I'
else:
c = '?'
fk = file_kind(fap)
if f_ie:
if f_ie.kind != fk:
bailout("file %r entered as kind %r id %r, now of kind %r"
% (fap, f_ie.kind, f_ie.file_id, fk))
yield fp, c, fk, (f_ie and f_ie.file_id)
if fk != 'directory':
continue
if c != 'V':
# don't descend unversioned directories
continue
for ff in descend(fp, f_ie.file_id, fap):
yield ff
for f in descend('', inv.root.file_id, self.basedir):
yield f
def unknowns(self):
for subp in self.extras():
if not self.is_ignored(subp):
yield subp
def extras(self):
"""Yield all unknown files in this WorkingTree.
If there are any unknown directories then only the directory is
returned, not all its children. But if there are unknown files
under a versioned subdirectory, they are returned.
Currently returned depth-first, sorted by name within directories.
"""
## TODO: Work from given directory downwards
for path, dir_entry in self.inventory.directories():
mutter("search for unknowns in %r" % path)
dirabs = self.abspath(path)
if not isdir(dirabs):
# e.g. directory deleted
continue
fl = []
for subf in os.listdir(dirabs):
if (subf != '.bzr'
and (subf not in dir_entry.children)):
fl.append(subf)
fl.sort()
for subf in fl:
subp = appendpath(path, subf)
yield subp
def ignored_files(self):
"""Yield list of PATH, IGNORE_PATTERN"""
for subp in self.extras():
pat = self.is_ignored(subp)
if pat != None:
yield subp, pat
def get_ignore_list(self):
"""Return list of ignore patterns.
Cached in the Tree object after the first call.
"""
if hasattr(self, '_ignorelist'):
return self._ignorelist
l = bzrlib.DEFAULT_IGNORE[:]
if self.has_filename(bzrlib.IGNORE_FILENAME):
f = self.get_file_byname(bzrlib.IGNORE_FILENAME)
l.extend([line.rstrip("\n\r") for line in f.readlines()])
self._ignorelist = l
return l
def is_ignored(self, filename):
r"""Check whether the filename matches an ignore pattern.
Patterns containing '/' or '\' need to match the whole path;
others match against only the last component.
If the file is ignored, returns the pattern which caused it to
be ignored, otherwise None. So this can simply be used as a
boolean if desired."""
# TODO: Use '**' to match directories, and other extended
# globbing stuff from cvs/rsync.
# XXX: fnmatch is actually not quite what we want: it's only
# approximately the same as real Unix fnmatch, and doesn't
# treat dotfiles correctly and allows * to match /.
# Eventually it should be replaced with something more
# accurate.
for pat in self.get_ignore_list():
if '/' in pat or '\\' in pat:
# as a special case, you can put ./ at the start of a
# pattern; this is good to match in the top-level
# only;
if (pat[:2] == './') or (pat[:2] == '.\\'):
newpat = pat[2:]
else:
newpat = pat
if fnmatch.fnmatchcase(filename, newpat):
return pat
else:
if fnmatch.fnmatchcase(splitpath(filename)[-1], pat):
return pat
return None
class RevisionTree(Tree):
"""Tree viewing a previous revision.
File text can be retrieved from the text store.
TODO: Some kind of `__repr__` method, but a good one
probably means knowing the branch and revision number,
or at least passing a description to the constructor.
"""
def __init__(self, store, inv):
self._store = store
self._inventory = inv
def get_file(self, file_id):
ie = self._inventory[file_id]
f = self._store[ie.text_id]
mutter(" get fileid{%s} from %r" % (file_id, self))
self._check_retrieved(ie, f)
return f
def get_file_size(self, file_id):
return self._inventory[file_id].text_size
def get_file_sha1(self, file_id):
ie = self._inventory[file_id]
return ie.text_sha1
def has_filename(self, filename):
return bool(self.inventory.path2id(filename))
def list_files(self):
# The only files returned by this are those from the version
for path, entry in self.inventory.iter_entries():
yield path, 'V', entry.kind, entry.file_id
class EmptyTree(Tree):
def __init__(self):
self._inventory = Inventory()
def has_filename(self, filename):
return False
def list_files(self):
if False: # just to make it a generator
yield None
######################################################################
# diff
# TODO: Merge these two functions into a single one that can operate
# on either a whole tree or a set of files.
# TODO: Return the diff in order by filename, not by category or in
# random order. Can probably be done by lock-stepping through the
# filenames from both trees.
def file_status(filename, old_tree, new_tree):
"""Return single-letter status, old and new names for a file.
The complexity here is in deciding how to represent renames;
many complex cases are possible.
"""
old_inv = old_tree.inventory
new_inv = new_tree.inventory
new_id = new_inv.path2id(filename)
old_id = old_inv.path2id(filename)
if not new_id and not old_id:
# easy: doesn't exist in either; not versioned at all
if new_tree.is_ignored(filename):
return 'I', None, None
else:
return '?', None, None
elif new_id:
# There is now a file of this name, great.
pass
else:
# There is no longer a file of this name, but we can describe
# what happened to the file that used to have
# this name. There are two possibilities: either it was
# deleted entirely, or renamed.
assert old_id
if new_inv.has_id(old_id):
return 'X', old_inv.id2path(old_id), new_inv.id2path(old_id)
else:
return 'D', old_inv.id2path(old_id), None
# if the file_id is new in this revision, it is added
if new_id and not old_inv.has_id(new_id):
return 'A'
# if there used to be a file of this name, but that ID has now
# disappeared, it is deleted
if old_id and not new_inv.has_id(old_id):
return 'D'
return 'wtf?'
def find_renames(old_inv, new_inv):
for file_id in old_inv:
if file_id not in new_inv:
continue
old_name = old_inv.id2path(file_id)
new_name = new_inv.id2path(file_id)
if old_name != new_name:
yield (old_name, new_name)
|