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
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
1433
1434
1435
1436
1437
1438
1439
1440
1441
1442
1443
1444
1445
1446
1447
1448
1449
1450
1451
1452
1453
|
# Copyright (C) 2005, 2006, 2007 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
# FIXME: This refactoring of the workingtree code doesn't seem to keep
# the WorkingTree's copy of the inventory in sync with the branch. The
# branch modifies its working inventory when it does a commit to make
# missing files permanently removed.
# TODO: Maybe also keep the full path of the entry, and the children?
# But those depend on its position within a particular inventory, and
# it would be nice not to need to hold the backpointer here.
# This should really be an id randomly assigned when the tree is
# created, but it's not for now.
ROOT_ID = "TREE_ROOT"
import os
import re
import sys
from bzrlib.lazy_import import lazy_import
lazy_import(globals(), """
import collections
import tarfile
import bzrlib
from bzrlib import (
errors,
generate_ids,
osutils,
symbol_versioning,
workingtree,
)
""")
from bzrlib.errors import (
BzrCheckError,
BzrError,
)
from bzrlib.symbol_versioning import deprecated_method, zero_ninetyone
from bzrlib.trace import mutter
class InventoryEntry(object):
"""Description of a versioned file.
An InventoryEntry has the following fields, which are also
present in the XML inventory-entry element:
file_id
name
(within the parent directory)
parent_id
file_id of the parent directory, or ROOT_ID
revision
the revision_id in which this variation of this file was
introduced.
executable
Indicates that this file should be executable on systems
that support it.
text_sha1
sha-1 of the text of the file
text_size
size in bytes of the text of the file
(reading a version 4 tree created a text_id field.)
>>> i = Inventory()
>>> i.path2id('')
'TREE_ROOT'
>>> i.add(InventoryDirectory('123', 'src', ROOT_ID))
InventoryDirectory('123', 'src', parent_id='TREE_ROOT', revision=None)
>>> i.add(InventoryFile('2323', 'hello.c', parent_id='123'))
InventoryFile('2323', 'hello.c', parent_id='123', sha1=None, len=None)
>>> shouldbe = {0: '', 1: 'src', 2: 'src/hello.c'}
>>> for ix, j in enumerate(i.iter_entries()):
... print (j[0] == shouldbe[ix], j[1])
...
(True, InventoryDirectory('TREE_ROOT', u'', parent_id=None, revision=None))
(True, InventoryDirectory('123', 'src', parent_id='TREE_ROOT', revision=None))
(True, InventoryFile('2323', 'hello.c', parent_id='123', sha1=None, len=None))
>>> i.add(InventoryFile('2324', 'bye.c', '123'))
InventoryFile('2324', 'bye.c', parent_id='123', sha1=None, len=None)
>>> i.add(InventoryDirectory('2325', 'wibble', '123'))
InventoryDirectory('2325', 'wibble', parent_id='123', revision=None)
>>> i.path2id('src/wibble')
'2325'
>>> '2325' in i
True
>>> i.add(InventoryFile('2326', 'wibble.c', '2325'))
InventoryFile('2326', 'wibble.c', parent_id='2325', sha1=None, len=None)
>>> i['2326']
InventoryFile('2326', 'wibble.c', parent_id='2325', sha1=None, len=None)
>>> for path, entry in i.iter_entries():
... print path
... assert i.path2id(path)
...
<BLANKLINE>
src
src/bye.c
src/hello.c
src/wibble
src/wibble/wibble.c
>>> i.id2path('2326')
'src/wibble/wibble.c'
"""
# Constants returned by describe_change()
#
# TODO: These should probably move to some kind of FileChangeDescription
# class; that's like what's inside a TreeDelta but we want to be able to
# generate them just for one file at a time.
RENAMED = 'renamed'
MODIFIED_AND_RENAMED = 'modified and renamed'
__slots__ = []
def detect_changes(self, old_entry):
"""Return a (text_modified, meta_modified) from this to old_entry.
_read_tree_state must have been called on self and old_entry prior to
calling detect_changes.
"""
return False, False
def diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree,
output_to, reverse=False):
"""Perform a diff from this to to_entry.
text_diff will be used for textual difference calculation.
This is a template method, override _diff in child classes.
"""
self._read_tree_state(tree.id2path(self.file_id), tree)
if to_entry:
# cannot diff from one kind to another - you must do a removal
# and an addif they do not match.
assert self.kind == to_entry.kind
to_entry._read_tree_state(to_tree.id2path(to_entry.file_id),
to_tree)
self._diff(text_diff, from_label, tree, to_label, to_entry, to_tree,
output_to, reverse)
def _diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree,
output_to, reverse=False):
"""Perform a diff between two entries of the same kind."""
def parent_candidates(self, previous_inventories):
"""Find possible per-file graph parents.
This is currently defined by:
- The kind has not changed (* not sure why this is a clause *)
- Select the last changed revision in the parent inventory.
- Do deal with a short lived bug in bzr 0.8's development two entries
that have the same last changed but different 'x' bit settings are
changed in-place.
"""
# revision:ie mapping for each ie found in previous_inventories.
candidates = {}
# identify candidate head revision ids.
for inv in previous_inventories:
if self.file_id in inv:
ie = inv[self.file_id]
assert ie.file_id == self.file_id
if ie.kind != self.kind:
# Can't be a candidate if the kind has changed.
continue
if ie.revision in candidates:
# same revision value in two different inventories:
# correct possible inconsistencies:
# * there was a bug in revision updates with 'x' bit
# support.
try:
if candidates[ie.revision].executable != ie.executable:
candidates[ie.revision].executable = False
ie.executable = False
except AttributeError:
pass
# must now be the same.
assert candidates[ie.revision] == ie
else:
# add this revision as a candidate.
candidates[ie.revision] = ie
return candidates
@deprecated_method(zero_ninetyone)
def find_previous_heads(self, previous_inventories,
versioned_file_store,
transaction,
entry_vf=None):
"""Return the revisions and entries that directly precede this.
Returned as a map from revision to inventory entry.
This is a map containing the file revisions in all parents
for which the file exists, and its revision is not a parent of
any other. If the file is new, the set will be empty.
:param versioned_file_store: A store where ancestry data on this
file id can be queried.
:param transaction: The transaction that queries to the versioned
file store should be completed under.
:param entry_vf: The entry versioned file, if its already available.
"""
candidates = self.parent_candidates(previous_inventories)
# revision:ie mapping with one revision for each head.
heads = {}
# common case optimisation
if len(candidates) == 1:
# if there is only one candidate revision found
# then we can avoid opening the versioned file to access ancestry:
# there cannot be any ancestors to eliminate when there is
# only one revision available.
return candidates
# --- what follows is now encapsulated in repository.get_graph.heads(),
# but that is not accessible from here as we have no repository
# pointer. Note that the repository.get_graph.heads() call can return
# different results *at the moment* because of the kind-changing check
# we have in parent_candidates().
# eliminate ancestors amongst the available candidates:
# heads are those that are not an ancestor of any other candidate
# - this provides convergence at a per-file level.
def get_ancestors(weave, entry):
return set(weave.get_ancestry(entry.revision, topo_sorted=False))
# revision: ancestor list for each head
head_ancestors = {}
for ie in candidates.values():
# may be an ancestor of a known head:
already_present = 0 != len(
[head for head in heads
if ie.revision in head_ancestors[head]])
if already_present:
# an ancestor of an analyzed candidate.
continue
# not an ancestor of a known head:
# load the versioned file for this file id if needed
if entry_vf is None:
entry_vf = versioned_file_store.get_weave_or_empty(
self.file_id, transaction)
ancestors = get_ancestors(entry_vf, ie)
# may knock something else out:
check_heads = list(heads.keys())
for head in check_heads:
if head in ancestors:
# this previously discovered 'head' is not
# really a head - its an ancestor of the newly
# found head,
heads.pop(head)
head_ancestors[ie.revision] = ancestors
heads[ie.revision] = ie
return heads
def get_tar_item(self, root, dp, now, tree):
"""Get a tarfile item and a file stream for its content."""
item = tarfile.TarInfo(osutils.pathjoin(root, dp).encode('utf8'))
# TODO: would be cool to actually set it to the timestamp of the
# revision it was last changed
item.mtime = now
fileobj = self._put_in_tar(item, tree)
return item, fileobj
def has_text(self):
"""Return true if the object this entry represents has textual data.
Note that textual data includes binary content.
Also note that all entries get weave files created for them.
This attribute is primarily used when upgrading from old trees that
did not have the weave index for all inventory entries.
"""
return False
def __init__(self, file_id, name, parent_id, text_id=None):
"""Create an InventoryEntry
The filename must be a single component, relative to the
parent directory; it cannot be a whole path or relative name.
>>> e = InventoryFile('123', 'hello.c', ROOT_ID)
>>> e.name
'hello.c'
>>> e.file_id
'123'
>>> e = InventoryFile('123', 'src/hello.c', ROOT_ID)
Traceback (most recent call last):
InvalidEntryName: Invalid entry name: src/hello.c
"""
assert isinstance(name, basestring), name
if '/' in name or '\\' in name:
raise errors.InvalidEntryName(name=name)
self.executable = False
self.revision = None
self.text_sha1 = None
self.text_size = None
self.file_id = file_id
assert isinstance(file_id, (str, None.__class__)), \
'bad type %r for %r' % (type(file_id), file_id)
self.name = name
self.text_id = text_id
self.parent_id = parent_id
self.symlink_target = None
self.reference_revision = None
def kind_character(self):
"""Return a short kind indicator useful for appending to names."""
raise BzrError('unknown kind %r' % self.kind)
known_kinds = ('file', 'directory', 'symlink')
def _put_in_tar(self, item, tree):
"""populate item for stashing in a tar, and return the content stream.
If no content is available, return None.
"""
raise BzrError("don't know how to export {%s} of kind %r" %
(self.file_id, self.kind))
def put_on_disk(self, dest, dp, tree):
"""Create a representation of self on disk in the prefix dest.
This is a template method - implement _put_on_disk in subclasses.
"""
fullpath = osutils.pathjoin(dest, dp)
self._put_on_disk(fullpath, tree)
# mutter(" export {%s} kind %s to %s", self.file_id,
# self.kind, fullpath)
def _put_on_disk(self, fullpath, tree):
"""Put this entry onto disk at fullpath, from tree tree."""
raise BzrError("don't know how to export {%s} of kind %r" % (self.file_id, self.kind))
def sorted_children(self):
return sorted(self.children.items())
@staticmethod
def versionable_kind(kind):
return (kind in ('file', 'directory', 'symlink', 'tree-reference'))
def check(self, checker, rev_id, inv, tree):
"""Check this inventory entry is intact.
This is a template method, override _check for kind specific
tests.
:param checker: Check object providing context for the checks;
can be used to find out what parts of the repository have already
been checked.
:param rev_id: Revision id from which this InventoryEntry was loaded.
Not necessarily the last-changed revision for this file.
:param inv: Inventory from which the entry was loaded.
:param tree: RevisionTree for this entry.
"""
if self.parent_id is not None:
if not inv.has_id(self.parent_id):
raise BzrCheckError('missing parent {%s} in inventory for revision {%s}'
% (self.parent_id, rev_id))
self._check(checker, rev_id, tree)
def _check(self, checker, rev_id, tree):
"""Check this inventory entry for kind specific errors."""
raise BzrCheckError('unknown entry kind %r in revision {%s}' %
(self.kind, rev_id))
def copy(self):
"""Clone this inventory entry."""
raise NotImplementedError
@staticmethod
def describe_change(old_entry, new_entry):
"""Describe the change between old_entry and this.
This smells of being an InterInventoryEntry situation, but as its
the first one, we're making it a static method for now.
An entry with a different parent, or different name is considered
to be renamed. Reparenting is an internal detail.
Note that renaming the parent does not trigger a rename for the
child entry itself.
"""
# TODO: Perhaps return an object rather than just a string
if old_entry is new_entry:
# also the case of both being None
return 'unchanged'
elif old_entry is None:
return 'added'
elif new_entry is None:
return 'removed'
if old_entry.kind != new_entry.kind:
return 'modified'
text_modified, meta_modified = new_entry.detect_changes(old_entry)
if text_modified or meta_modified:
modified = True
else:
modified = False
# TODO 20060511 (mbp, rbc) factor out 'detect_rename' here.
if old_entry.parent_id != new_entry.parent_id:
renamed = True
elif old_entry.name != new_entry.name:
renamed = True
else:
renamed = False
if renamed and not modified:
return InventoryEntry.RENAMED
if modified and not renamed:
return 'modified'
if modified and renamed:
return InventoryEntry.MODIFIED_AND_RENAMED
return 'unchanged'
def __repr__(self):
return ("%s(%r, %r, parent_id=%r, revision=%r)"
% (self.__class__.__name__,
self.file_id,
self.name,
self.parent_id,
self.revision))
def snapshot(self, revision, path, previous_entries,
work_tree, commit_builder):
"""Make a snapshot of this entry which may or may not have changed.
This means that all its fields are populated, that it has its
text stored in the text store or weave.
:return: True if anything was recorded
"""
# cannot be unchanged unless there is only one parent file rev.
self._read_tree_state(path, work_tree)
if len(previous_entries) == 1:
parent_ie = previous_entries.values()[0]
if self._unchanged(parent_ie):
self.revision = parent_ie.revision
return False
self.revision = revision
return self._snapshot_text(previous_entries, work_tree, commit_builder)
def _snapshot_text(self, file_parents, work_tree, commit_builder):
"""Record the 'text' of this entry, whatever form that takes.
:return: True if anything was recorded
"""
raise NotImplementedError(self._snapshot_text)
def __eq__(self, other):
if not isinstance(other, InventoryEntry):
return NotImplemented
return ((self.file_id == other.file_id)
and (self.name == other.name)
and (other.symlink_target == self.symlink_target)
and (self.text_sha1 == other.text_sha1)
and (self.text_size == other.text_size)
and (self.text_id == other.text_id)
and (self.parent_id == other.parent_id)
and (self.kind == other.kind)
and (self.revision == other.revision)
and (self.executable == other.executable)
and (self.reference_revision == other.reference_revision)
)
def __ne__(self, other):
return not (self == other)
def __hash__(self):
raise ValueError('not hashable')
def _unchanged(self, previous_ie):
"""Has this entry changed relative to previous_ie.
This method should be overridden in child classes.
"""
compatible = True
# different inv parent
if previous_ie.parent_id != self.parent_id:
compatible = False
# renamed
elif previous_ie.name != self.name:
compatible = False
elif previous_ie.kind != self.kind:
compatible = False
return compatible
def _read_tree_state(self, path, work_tree):
"""Populate fields in the inventory entry from the given tree.
Note that this should be modified to be a noop on virtual trees
as all entries created there are prepopulated.
"""
# TODO: Rather than running this manually, we should check the
# working sha1 and other expensive properties when they're
# first requested, or preload them if they're already known
pass # nothing to do by default
def _forget_tree_state(self):
pass
class RootEntry(InventoryEntry):
__slots__ = ['text_sha1', 'text_size', 'file_id', 'name', 'kind',
'text_id', 'parent_id', 'children', 'executable',
'revision', 'symlink_target', 'reference_revision']
def _check(self, checker, rev_id, tree):
"""See InventoryEntry._check"""
def __init__(self, file_id):
self.file_id = file_id
self.children = {}
self.kind = 'directory'
self.parent_id = None
self.name = u''
self.revision = None
symbol_versioning.warn('RootEntry is deprecated as of bzr 0.10.'
' Please use InventoryDirectory instead.',
DeprecationWarning, stacklevel=2)
def __eq__(self, other):
if not isinstance(other, RootEntry):
return NotImplemented
return (self.file_id == other.file_id) \
and (self.children == other.children)
class InventoryDirectory(InventoryEntry):
"""A directory in an inventory."""
__slots__ = ['text_sha1', 'text_size', 'file_id', 'name', 'kind',
'text_id', 'parent_id', 'children', 'executable',
'revision', 'symlink_target', 'reference_revision']
def _check(self, checker, rev_id, tree):
"""See InventoryEntry._check"""
if self.text_sha1 is not None or self.text_size is not None or self.text_id is not None:
raise BzrCheckError('directory {%s} has text in revision {%s}'
% (self.file_id, rev_id))
def copy(self):
other = InventoryDirectory(self.file_id, self.name, self.parent_id)
other.revision = self.revision
# note that children are *not* copied; they're pulled across when
# others are added
return other
def __init__(self, file_id, name, parent_id):
super(InventoryDirectory, self).__init__(file_id, name, parent_id)
self.children = {}
self.kind = 'directory'
def kind_character(self):
"""See InventoryEntry.kind_character."""
return '/'
def _put_in_tar(self, item, tree):
"""See InventoryEntry._put_in_tar."""
item.type = tarfile.DIRTYPE
fileobj = None
item.name += '/'
item.size = 0
item.mode = 0755
return fileobj
def _put_on_disk(self, fullpath, tree):
"""See InventoryEntry._put_on_disk."""
os.mkdir(fullpath)
def _snapshot_text(self, file_parents, work_tree, commit_builder):
"""See InventoryEntry._snapshot_text."""
commit_builder.modified_directory(self.file_id, file_parents)
return True
class InventoryFile(InventoryEntry):
"""A file in an inventory."""
__slots__ = ['text_sha1', 'text_size', 'file_id', 'name', 'kind',
'text_id', 'parent_id', 'children', 'executable',
'revision', 'symlink_target', 'reference_revision']
def _check(self, checker, tree_revision_id, tree):
"""See InventoryEntry._check"""
t = (self.file_id, self.revision)
if t in checker.checked_texts:
prev_sha = checker.checked_texts[t]
if prev_sha != self.text_sha1:
raise BzrCheckError('mismatched sha1 on {%s} in {%s}' %
(self.file_id, tree_revision_id))
else:
checker.repeated_text_cnt += 1
return
if self.file_id not in checker.checked_weaves:
mutter('check weave {%s}', self.file_id)
w = tree._get_weave(self.file_id)
# Not passing a progress bar, because it creates a new
# progress, which overwrites the current progress,
# and doesn't look nice
w.check()
checker.checked_weaves[self.file_id] = True
else:
w = tree._get_weave(self.file_id)
mutter('check version {%s} of {%s}', tree_revision_id, self.file_id)
checker.checked_text_cnt += 1
# We can't check the length, because Weave doesn't store that
# information, and the whole point of looking at the weave's
# sha1sum is that we don't have to extract the text.
if self.text_sha1 != w.get_sha1(self.revision):
raise BzrCheckError('text {%s} version {%s} wrong sha1'
% (self.file_id, self.revision))
checker.checked_texts[t] = self.text_sha1
def copy(self):
other = InventoryFile(self.file_id, self.name, self.parent_id)
other.executable = self.executable
other.text_id = self.text_id
other.text_sha1 = self.text_sha1
other.text_size = self.text_size
other.revision = self.revision
return other
def detect_changes(self, old_entry):
"""See InventoryEntry.detect_changes."""
assert self.text_sha1 is not None
assert old_entry.text_sha1 is not None
text_modified = (self.text_sha1 != old_entry.text_sha1)
meta_modified = (self.executable != old_entry.executable)
return text_modified, meta_modified
def _diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree,
output_to, reverse=False):
"""See InventoryEntry._diff."""
try:
from_text = tree.get_file(self.file_id).readlines()
if to_entry:
to_text = to_tree.get_file(to_entry.file_id).readlines()
else:
to_text = []
if not reverse:
text_diff(from_label, from_text,
to_label, to_text, output_to)
else:
text_diff(to_label, to_text,
from_label, from_text, output_to)
except errors.BinaryFile:
if reverse:
label_pair = (to_label, from_label)
else:
label_pair = (from_label, to_label)
print >> output_to, \
("Binary files %s and %s differ" % label_pair).encode('utf8')
def has_text(self):
"""See InventoryEntry.has_text."""
return True
def __init__(self, file_id, name, parent_id):
super(InventoryFile, self).__init__(file_id, name, parent_id)
self.kind = 'file'
def kind_character(self):
"""See InventoryEntry.kind_character."""
return ''
def _put_in_tar(self, item, tree):
"""See InventoryEntry._put_in_tar."""
item.type = tarfile.REGTYPE
fileobj = tree.get_file(self.file_id)
item.size = self.text_size
if tree.is_executable(self.file_id):
item.mode = 0755
else:
item.mode = 0644
return fileobj
def _put_on_disk(self, fullpath, tree):
"""See InventoryEntry._put_on_disk."""
osutils.pumpfile(tree.get_file(self.file_id), file(fullpath, 'wb'))
if tree.is_executable(self.file_id):
os.chmod(fullpath, 0755)
def _read_tree_state(self, path, work_tree):
"""See InventoryEntry._read_tree_state."""
self.text_sha1 = work_tree.get_file_sha1(self.file_id, path=path)
# FIXME: 20050930 probe for the text size when getting sha1
# in _read_tree_state
self.executable = work_tree.is_executable(self.file_id, path=path)
def __repr__(self):
return ("%s(%r, %r, parent_id=%r, sha1=%r, len=%s)"
% (self.__class__.__name__,
self.file_id,
self.name,
self.parent_id,
self.text_sha1,
self.text_size))
def _forget_tree_state(self):
self.text_sha1 = None
def snapshot(self, revision, path, previous_entries,
work_tree, commit_builder):
"""See InventoryEntry.snapshot."""
# Note: We use a custom implementation of this method for files
# because it's a performance critical part of commit.
# If this is the initial commit for this file, we know the sha is
# coming later so skip calculating it now (in _read_tree_state())
if len(previous_entries) == 0:
self.executable = work_tree.is_executable(self.file_id, path=path)
else:
self._read_tree_state(path, work_tree)
# If nothing is changed from the sole parent, there's nothing to do
if len(previous_entries) == 1:
parent_ie = previous_entries.values()[0]
if self._unchanged(parent_ie):
self.revision = parent_ie.revision
return False
# Add the file to the repository
self.revision = revision
def get_content_byte_lines():
return work_tree.get_file(self.file_id, path).readlines()
self.text_sha1, self.text_size = commit_builder.modified_file_text(
self.file_id, previous_entries, get_content_byte_lines,
self.text_sha1, self.text_size)
return True
def _unchanged(self, previous_ie):
"""See InventoryEntry._unchanged."""
compatible = super(InventoryFile, self)._unchanged(previous_ie)
if self.text_sha1 != previous_ie.text_sha1:
compatible = False
else:
# FIXME: 20050930 probe for the text size when getting sha1
# in _read_tree_state
self.text_size = previous_ie.text_size
if self.executable != previous_ie.executable:
compatible = False
return compatible
class InventoryLink(InventoryEntry):
"""A file in an inventory."""
__slots__ = ['text_sha1', 'text_size', 'file_id', 'name', 'kind',
'text_id', 'parent_id', 'children', 'executable',
'revision', 'symlink_target', 'reference_revision']
def _check(self, checker, rev_id, tree):
"""See InventoryEntry._check"""
if self.text_sha1 is not None or self.text_size is not None or self.text_id is not None:
raise BzrCheckError('symlink {%s} has text in revision {%s}'
% (self.file_id, rev_id))
if self.symlink_target is None:
raise BzrCheckError('symlink {%s} has no target in revision {%s}'
% (self.file_id, rev_id))
def copy(self):
other = InventoryLink(self.file_id, self.name, self.parent_id)
other.symlink_target = self.symlink_target
other.revision = self.revision
return other
def detect_changes(self, old_entry):
"""See InventoryEntry.detect_changes."""
# FIXME: which _modified field should we use ? RBC 20051003
text_modified = (self.symlink_target != old_entry.symlink_target)
if text_modified:
mutter(" symlink target changed")
meta_modified = False
return text_modified, meta_modified
def _diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree,
output_to, reverse=False):
"""See InventoryEntry._diff."""
from_text = self.symlink_target
if to_entry is not None:
to_text = to_entry.symlink_target
if reverse:
temp = from_text
from_text = to_text
to_text = temp
print >>output_to, '=== target changed %r => %r' % (from_text, to_text)
else:
if not reverse:
print >>output_to, '=== target was %r' % self.symlink_target
else:
print >>output_to, '=== target is %r' % self.symlink_target
def __init__(self, file_id, name, parent_id):
super(InventoryLink, self).__init__(file_id, name, parent_id)
self.kind = 'symlink'
def kind_character(self):
"""See InventoryEntry.kind_character."""
return ''
def _put_in_tar(self, item, tree):
"""See InventoryEntry._put_in_tar."""
item.type = tarfile.SYMTYPE
fileobj = None
item.size = 0
item.mode = 0755
item.linkname = self.symlink_target
return fileobj
def _put_on_disk(self, fullpath, tree):
"""See InventoryEntry._put_on_disk."""
try:
os.symlink(self.symlink_target, fullpath)
except OSError,e:
raise BzrError("Failed to create symlink %r -> %r, error: %s" % (fullpath, self.symlink_target, e))
def _read_tree_state(self, path, work_tree):
"""See InventoryEntry._read_tree_state."""
self.symlink_target = work_tree.get_symlink_target(self.file_id)
def _forget_tree_state(self):
self.symlink_target = None
def _unchanged(self, previous_ie):
"""See InventoryEntry._unchanged."""
compatible = super(InventoryLink, self)._unchanged(previous_ie)
if self.symlink_target != previous_ie.symlink_target:
compatible = False
return compatible
def _snapshot_text(self, file_parents, work_tree, commit_builder):
"""See InventoryEntry._snapshot_text."""
commit_builder.modified_link(
self.file_id, file_parents, self.symlink_target)
return True
class TreeReference(InventoryEntry):
kind = 'tree-reference'
def __init__(self, file_id, name, parent_id, revision=None,
reference_revision=None):
InventoryEntry.__init__(self, file_id, name, parent_id)
self.revision = revision
self.reference_revision = reference_revision
def copy(self):
return TreeReference(self.file_id, self.name, self.parent_id,
self.revision, self.reference_revision)
def _snapshot_text(self, file_parents, work_tree, commit_builder):
commit_builder.modified_reference(self.file_id, file_parents)
return True
def _read_tree_state(self, path, work_tree):
"""Populate fields in the inventory entry from the given tree.
"""
self.reference_revision = work_tree.get_reference_revision(
self.file_id, path)
def _forget_tree_state(self):
self.reference_revision = None
class Inventory(object):
"""Inventory of versioned files in a tree.
This describes which file_id is present at each point in the tree,
and possibly the SHA-1 or other information about the file.
Entries can be looked up either by path or by file_id.
The inventory represents a typical unix file tree, with
directories containing files and subdirectories. We never store
the full path to a file, because renaming a directory implicitly
moves all of its contents. This class internally maintains a
lookup tree that allows the children under a directory to be
returned quickly.
InventoryEntry objects must not be modified after they are
inserted, other than through the Inventory API.
>>> inv = Inventory()
>>> inv.add(InventoryFile('123-123', 'hello.c', ROOT_ID))
InventoryFile('123-123', 'hello.c', parent_id='TREE_ROOT', sha1=None, len=None)
>>> inv['123-123'].name
'hello.c'
May be treated as an iterator or set to look up file ids:
>>> bool(inv.path2id('hello.c'))
True
>>> '123-123' in inv
True
May also look up by name:
>>> [x[0] for x in inv.iter_entries()]
['', u'hello.c']
>>> inv = Inventory('TREE_ROOT-12345678-12345678')
>>> inv.add(InventoryFile('123-123', 'hello.c', ROOT_ID))
Traceback (most recent call last):
BzrError: parent_id {TREE_ROOT} not in inventory
>>> inv.add(InventoryFile('123-123', 'hello.c', 'TREE_ROOT-12345678-12345678'))
InventoryFile('123-123', 'hello.c', parent_id='TREE_ROOT-12345678-12345678', sha1=None, len=None)
"""
def __init__(self, root_id=ROOT_ID, revision_id=None):
"""Create or read an inventory.
If a working directory is specified, the inventory is read
from there. If the file is specified, read from that. If not,
the inventory is created empty.
The inventory is created with a default root directory, with
an id of None.
"""
if root_id is not None:
assert root_id.__class__ == str
self._set_root(InventoryDirectory(root_id, u'', None))
else:
self.root = None
self._byid = {}
self.revision_id = revision_id
def _set_root(self, ie):
self.root = ie
self._byid = {self.root.file_id: self.root}
def copy(self):
# TODO: jam 20051218 Should copy also copy the revision_id?
entries = self.iter_entries()
other = Inventory(entries.next()[1].file_id)
# copy recursively so we know directories will be added before
# their children. There are more efficient ways than this...
for path, entry in entries():
other.add(entry.copy())
return other
def __iter__(self):
return iter(self._byid)
def __len__(self):
"""Returns number of entries."""
return len(self._byid)
def iter_entries(self, from_dir=None):
"""Return (path, entry) pairs, in order by name."""
if from_dir is None:
if self.root is None:
return
from_dir = self.root
yield '', self.root
elif isinstance(from_dir, basestring):
from_dir = self._byid[from_dir]
# unrolling the recursive called changed the time from
# 440ms/663ms (inline/total) to 116ms/116ms
children = from_dir.children.items()
children.sort()
children = collections.deque(children)
stack = [(u'', children)]
while stack:
from_dir_relpath, children = stack[-1]
while children:
name, ie = children.popleft()
# we know that from_dir_relpath never ends in a slash
# and 'f' doesn't begin with one, we can do a string op, rather
# than the checks of pathjoin(), though this means that all paths
# start with a slash
path = from_dir_relpath + '/' + name
yield path[1:], ie
if ie.kind != 'directory':
continue
# But do this child first
new_children = ie.children.items()
new_children.sort()
new_children = collections.deque(new_children)
stack.append((path, new_children))
# Break out of inner loop, so that we start outer loop with child
break
else:
# if we finished all children, pop it off the stack
stack.pop()
def iter_entries_by_dir(self, from_dir=None, specific_file_ids=None):
"""Iterate over the entries in a directory first order.
This returns all entries for a directory before returning
the entries for children of a directory. This is not
lexicographically sorted order, and is a hybrid between
depth-first and breadth-first.
:return: This yields (path, entry) pairs
"""
if specific_file_ids:
safe = osutils.safe_file_id
specific_file_ids = set(safe(fid) for fid in specific_file_ids)
# TODO? Perhaps this should return the from_dir so that the root is
# yielded? or maybe an option?
if from_dir is None:
if self.root is None:
return
# Optimize a common case
if specific_file_ids is not None and len(specific_file_ids) == 1:
file_id = list(specific_file_ids)[0]
if file_id in self:
yield self.id2path(file_id), self[file_id]
return
from_dir = self.root
if (specific_file_ids is None or
self.root.file_id in specific_file_ids):
yield u'', self.root
elif isinstance(from_dir, basestring):
from_dir = self._byid[from_dir]
if specific_file_ids is not None:
# TODO: jam 20070302 This could really be done as a loop rather
# than a bunch of recursive calls.
parents = set()
byid = self._byid
def add_ancestors(file_id):
if file_id not in byid:
return
parent_id = byid[file_id].parent_id
if parent_id is None:
return
if parent_id not in parents:
parents.add(parent_id)
add_ancestors(parent_id)
for file_id in specific_file_ids:
add_ancestors(file_id)
else:
parents = None
stack = [(u'', from_dir)]
while stack:
cur_relpath, cur_dir = stack.pop()
child_dirs = []
for child_name, child_ie in sorted(cur_dir.children.iteritems()):
child_relpath = cur_relpath + child_name
if (specific_file_ids is None or
child_ie.file_id in specific_file_ids):
yield child_relpath, child_ie
if child_ie.kind == 'directory':
if parents is None or child_ie.file_id in parents:
child_dirs.append((child_relpath+'/', child_ie))
stack.extend(reversed(child_dirs))
def make_entry(self, kind, name, parent_id, file_id=None):
"""Simple thunk to bzrlib.inventory.make_entry."""
return make_entry(kind, name, parent_id, file_id)
def entries(self):
"""Return list of (path, ie) for all entries except the root.
This may be faster than iter_entries.
"""
accum = []
def descend(dir_ie, dir_path):
kids = dir_ie.children.items()
kids.sort()
for name, ie in kids:
child_path = osutils.pathjoin(dir_path, name)
accum.append((child_path, ie))
if ie.kind == 'directory':
descend(ie, child_path)
descend(self.root, u'')
return accum
def directories(self):
"""Return (path, entry) pairs for all directories, including the root.
"""
accum = []
def descend(parent_ie, parent_path):
accum.append((parent_path, parent_ie))
kids = [(ie.name, ie) for ie in parent_ie.children.itervalues() if ie.kind == 'directory']
kids.sort()
for name, child_ie in kids:
child_path = osutils.pathjoin(parent_path, name)
descend(child_ie, child_path)
descend(self.root, u'')
return accum
def __contains__(self, file_id):
"""True if this entry contains a file with given id.
>>> inv = Inventory()
>>> inv.add(InventoryFile('123', 'foo.c', ROOT_ID))
InventoryFile('123', 'foo.c', parent_id='TREE_ROOT', sha1=None, len=None)
>>> '123' in inv
True
>>> '456' in inv
False
"""
file_id = osutils.safe_file_id(file_id)
return (file_id in self._byid)
def __getitem__(self, file_id):
"""Return the entry for given file_id.
>>> inv = Inventory()
>>> inv.add(InventoryFile('123123', 'hello.c', ROOT_ID))
InventoryFile('123123', 'hello.c', parent_id='TREE_ROOT', sha1=None, len=None)
>>> inv['123123'].name
'hello.c'
"""
file_id = osutils.safe_file_id(file_id)
try:
return self._byid[file_id]
except KeyError:
# really we're passing an inventory, not a tree...
raise errors.NoSuchId(self, file_id)
def get_file_kind(self, file_id):
file_id = osutils.safe_file_id(file_id)
return self._byid[file_id].kind
def get_child(self, parent_id, filename):
parent_id = osutils.safe_file_id(parent_id)
return self[parent_id].children.get(filename)
def _add_child(self, entry):
"""Add an entry to the inventory, without adding it to its parent"""
if entry.file_id in self._byid:
raise BzrError("inventory already contains entry with id {%s}" %
entry.file_id)
self._byid[entry.file_id] = entry
for child in getattr(entry, 'children', {}).itervalues():
self._add_child(child)
return entry
def add(self, entry):
"""Add entry to inventory.
To add a file to a branch ready to be committed, use Branch.add,
which calls this.
Returns the new entry object.
"""
if entry.file_id in self._byid:
raise errors.DuplicateFileId(entry.file_id,
self._byid[entry.file_id])
if entry.parent_id is None:
assert self.root is None and len(self._byid) == 0
self.root = entry
else:
try:
parent = self._byid[entry.parent_id]
except KeyError:
raise BzrError("parent_id {%s} not in inventory" %
entry.parent_id)
if entry.name in parent.children:
raise BzrError("%s is already versioned" %
osutils.pathjoin(self.id2path(parent.file_id),
entry.name).encode('utf-8'))
parent.children[entry.name] = entry
return self._add_child(entry)
def add_path(self, relpath, kind, file_id=None, parent_id=None):
"""Add entry from a path.
The immediate parent must already be versioned.
Returns the new entry object."""
parts = osutils.splitpath(relpath)
if len(parts) == 0:
if file_id is None:
file_id = generate_ids.gen_root_id()
else:
file_id = osutils.safe_file_id(file_id)
self.root = InventoryDirectory(file_id, '', None)
self._byid = {self.root.file_id: self.root}
return self.root
else:
parent_path = parts[:-1]
parent_id = self.path2id(parent_path)
if parent_id is None:
raise errors.NotVersionedError(path=parent_path)
ie = make_entry(kind, parts[-1], parent_id, file_id)
return self.add(ie)
def __delitem__(self, file_id):
"""Remove entry by id.
>>> inv = Inventory()
>>> inv.add(InventoryFile('123', 'foo.c', ROOT_ID))
InventoryFile('123', 'foo.c', parent_id='TREE_ROOT', sha1=None, len=None)
>>> '123' in inv
True
>>> del inv['123']
>>> '123' in inv
False
"""
file_id = osutils.safe_file_id(file_id)
ie = self[file_id]
assert ie.parent_id is None or \
self[ie.parent_id].children[ie.name] == ie
del self._byid[file_id]
if ie.parent_id is not None:
del self[ie.parent_id].children[ie.name]
def __eq__(self, other):
"""Compare two sets by comparing their contents.
>>> i1 = Inventory()
>>> i2 = Inventory()
>>> i1 == i2
True
>>> i1.add(InventoryFile('123', 'foo', ROOT_ID))
InventoryFile('123', 'foo', parent_id='TREE_ROOT', sha1=None, len=None)
>>> i1 == i2
False
>>> i2.add(InventoryFile('123', 'foo', ROOT_ID))
InventoryFile('123', 'foo', parent_id='TREE_ROOT', sha1=None, len=None)
>>> i1 == i2
True
"""
if not isinstance(other, Inventory):
return NotImplemented
return self._byid == other._byid
def __ne__(self, other):
return not self.__eq__(other)
def __hash__(self):
raise ValueError('not hashable')
def _iter_file_id_parents(self, file_id):
"""Yield the parents of file_id up to the root."""
file_id = osutils.safe_file_id(file_id)
while file_id is not None:
try:
ie = self._byid[file_id]
except KeyError:
raise errors.NoSuchId(tree=None, file_id=file_id)
yield ie
file_id = ie.parent_id
def get_idpath(self, file_id):
"""Return a list of file_ids for the path to an entry.
The list contains one element for each directory followed by
the id of the file itself. So the length of the returned list
is equal to the depth of the file in the tree, counting the
root directory as depth 1.
"""
file_id = osutils.safe_file_id(file_id)
p = []
for parent in self._iter_file_id_parents(file_id):
p.insert(0, parent.file_id)
return p
def id2path(self, file_id):
"""Return as a string the path to file_id.
>>> i = Inventory()
>>> e = i.add(InventoryDirectory('src-id', 'src', ROOT_ID))
>>> e = i.add(InventoryFile('foo-id', 'foo.c', parent_id='src-id'))
>>> print i.id2path('foo-id')
src/foo.c
"""
file_id = osutils.safe_file_id(file_id)
# get all names, skipping root
return '/'.join(reversed(
[parent.name for parent in
self._iter_file_id_parents(file_id)][:-1]))
def path2id(self, name):
"""Walk down through directories to return entry of last component.
names may be either a list of path components, or a single
string, in which case it is automatically split.
This returns the entry of the last component in the path,
which may be either a file or a directory.
Returns None IFF the path is not found.
"""
if isinstance(name, basestring):
name = osutils.splitpath(name)
# mutter("lookup path %r" % name)
parent = self.root
if parent is None:
return None
for f in name:
try:
children = getattr(parent, 'children', None)
if children is None:
return None
cie = children[f]
assert cie.name == f
assert cie.parent_id == parent.file_id
parent = cie
except KeyError:
# or raise an error?
return None
return parent.file_id
def has_filename(self, names):
return bool(self.path2id(names))
def has_id(self, file_id):
file_id = osutils.safe_file_id(file_id)
return (file_id in self._byid)
def remove_recursive_id(self, file_id):
"""Remove file_id, and children, from the inventory.
:param file_id: A file_id to remove.
"""
file_id = osutils.safe_file_id(file_id)
to_find_delete = [self._byid[file_id]]
to_delete = []
while to_find_delete:
ie = to_find_delete.pop()
to_delete.append(ie.file_id)
if ie.kind == 'directory':
to_find_delete.extend(ie.children.values())
for file_id in reversed(to_delete):
ie = self[file_id]
del self._byid[file_id]
if ie.parent_id is not None:
del self[ie.parent_id].children[ie.name]
else:
self.root = None
def rename(self, file_id, new_parent_id, new_name):
"""Move a file within the inventory.
This can change either the name, or the parent, or both.
This does not move the working file.
"""
file_id = osutils.safe_file_id(file_id)
if not is_valid_name(new_name):
raise BzrError("not an acceptable filename: %r" % new_name)
new_parent = self._byid[new_parent_id]
if new_name in new_parent.children:
raise BzrError("%r already exists in %r" % (new_name, self.id2path(new_parent_id)))
new_parent_idpath = self.get_idpath(new_parent_id)
if file_id in new_parent_idpath:
raise BzrError("cannot move directory %r into a subdirectory of itself, %r"
% (self.id2path(file_id), self.id2path(new_parent_id)))
file_ie = self._byid[file_id]
old_parent = self._byid[file_ie.parent_id]
# TODO: Don't leave things messed up if this fails
del old_parent.children[file_ie.name]
new_parent.children[new_name] = file_ie
file_ie.name = new_name
file_ie.parent_id = new_parent_id
def is_root(self, file_id):
file_id = osutils.safe_file_id(file_id)
return self.root is not None and file_id == self.root.file_id
entry_factory = {
'directory': InventoryDirectory,
'file': InventoryFile,
'symlink': InventoryLink,
'tree-reference': TreeReference
}
def make_entry(kind, name, parent_id, file_id=None):
"""Create an inventory entry.
:param kind: the type of inventory entry to create.
:param name: the basename of the entry.
:param parent_id: the parent_id of the entry.
:param file_id: the file_id to use. if None, one will be created.
"""
if file_id is None:
file_id = generate_ids.gen_file_id(name)
else:
file_id = osutils.safe_file_id(file_id)
#------- This has been copied to bzrlib.dirstate.DirState.add, please
# keep them synchronised.
# we dont import normalized_filename directly because we want to be
# able to change the implementation at runtime for tests.
norm_name, can_access = osutils.normalized_filename(name)
if norm_name != name:
if can_access:
name = norm_name
else:
# TODO: jam 20060701 This would probably be more useful
# if the error was raised with the full path
raise errors.InvalidNormalization(name)
try:
factory = entry_factory[kind]
except KeyError:
raise BzrError("unknown kind %r" % kind)
return factory(file_id, name, parent_id)
_NAME_RE = None
def is_valid_name(name):
global _NAME_RE
if _NAME_RE is None:
_NAME_RE = re.compile(r'^[^/\\]+$')
return bool(_NAME_RE.match(name))
|