« back to all changes in this revision
Viewing changes to bzrlib/changeset.py
- browse files at revision 1185.14.6
- compare with another revision
- download diff
- download tarball
- view history from revision 1185.14.6
- Committer: Aaron Bentley
- Date: 2005-10-01 06:48:01 UTC
- mto: (1185.12.13)
- mto: This revision was merged to the branch mainline in revision 1419.
- Revision ID: aaron.bentley@utoronto.ca-20051001064801-7400c2ed0fe26080
Made iter_conflicts a WorkingTree method
- files added:
- bzrlib/meta_store.py
- files removed:
- INSTALL
- bzrlib/util/configobj
- bzrlib/util/configobj/docs
- files renamed:
- bzrlib/conflicts.py => bzrlib/plugins/conflicts.py
- bzrlib/selftest/testplugins.py => bzrlib/selftest/plugins.py
- files modified:
- .bzrignore
- bzr *
- setup.py *
added
removed
bzrlib/changeset.py
17
17
import errno
18
18
import patch
19
19
import stat
20
from tempfile import mkdtemp
21
from shutil import rmtree
22
20
from bzrlib.trace import mutter
23
from bzrlib.osutils import rename, sha_file
24
import bzrlib
25
from itertools import izip
21
from bzrlib.osutils import rename
26
22
27
23
# XXX: mbp: I'm not totally convinced that we should handle conflicts
28
24
# as part of changeset application, rather than only in the merge
48
44
return newdict
49
45
50
46
51
class ChangeExecFlag(object):
47
class ChangeUnixPermissions(object):
52
48
"""This is two-way change, suitable for file modification, creation,
53
49
deletion"""
54
def __init__(self, old_exec_flag, new_exec_flag):
55
self.old_exec_flag = old_exec_flag
56
self.new_exec_flag = new_exec_flag
50
def __init__(self, old_mode, new_mode):
51
self.old_mode = old_mode
52
self.new_mode = new_mode
57
53
58
54
def apply(self, filename, conflict_handler, reverse=False):
59
55
if not reverse:
60
from_exec_flag = self.old_exec_flag
61
to_exec_flag = self.new_exec_flag
56
from_mode = self.old_mode
57
to_mode = self.new_mode
62
58
else:
63
from_exec_flag = self.new_exec_flag
64
to_exec_flag = self.old_exec_flag
59
from_mode = self.new_mode
60
to_mode = self.old_mode
65
61
try:
66
current_exec_flag = bool(os.stat(filename).st_mode & 0111)
62
current_mode = os.stat(filename).st_mode &0777
67
63
except OSError, e:
68
64
if e.errno == errno.ENOENT:
69
if conflict_handler.missing_for_exec_flag(filename) == "skip":
65
if conflict_handler.missing_for_chmod(filename) == "skip":
70
66
return
71
67
else:
72
current_exec_flag = from_exec_flag
68
current_mode = from_mode
73
69
74
if from_exec_flag is not None and current_exec_flag != from_exec_flag:
75
if conflict_handler.wrong_old_exec_flag(filename,
76
from_exec_flag, current_exec_flag) != "continue":
70
if from_mode is not None and current_mode != from_mode:
71
if conflict_handler.wrong_old_perms(filename, from_mode,
72
current_mode) != "continue":
77
73
return
78
74
79
if to_exec_flag is not None:
80
current_mode = os.stat(filename).st_mode
81
if to_exec_flag:
82
umask = os.umask(0)
83
os.umask(umask)
84
to_mode = current_mode | (0100 & ~umask)
85
# Enable x-bit for others only if they can read it.
86
if current_mode & 0004:
87
to_mode |= 0001 & ~umask
88
if current_mode & 0040:
89
to_mode |= 0010 & ~umask
90
else:
91
to_mode = current_mode & ~0111
75
if to_mode is not None:
92
76
try:
93
77
os.chmod(filename, to_mode)
94
78
except IOError, e:
95
79
if e.errno == errno.ENOENT:
96
conflict_handler.missing_for_exec_flag(filename)
80
conflict_handler.missing_for_chmod(filename)
97
81
98
82
def __eq__(self, other):
99
return (isinstance(other, ChangeExecFlag) and
100
self.old_exec_flag == other.old_exec_flag and
101
self.new_exec_flag == other.new_exec_flag)
83
if not isinstance(other, ChangeUnixPermissions):
84
return False
85
elif self.old_mode != other.old_mode:
86
return False
87
elif self.new_mode != other.new_mode:
88
return False
89
else:
90
return True
102
91
103
92
def __ne__(self, other):
104
93
return not (self == other)
146
135
"""
147
136
self.target = contents
148
137
149
def __repr__(self):
150
return "SymlinkCreate(%s)" % self.target
151
152
138
def __call__(self, filename, conflict_handler, reverse):
153
139
"""Creates or destroys the symlink.
154
140
236
222
237
223
238
224
239
class TreeFileCreate(object):
240
"""Create or delete a file (for use with ReplaceContents)"""
241
def __init__(self, tree, file_id):
242
"""Constructor
243
244
:param contents: The contents of the file to write
245
:type contents: str
246
"""
247
self.tree = tree
248
self.file_id = file_id
249
250
def __repr__(self):
251
return "TreeFileCreate(%s)" % self.file_id
252
253
def __eq__(self, other):
254
if not isinstance(other, TreeFileCreate):
255
return False
256
return self.tree.get_file_sha1(self.file_id) == \
257
other.tree.get_file_sha1(other.file_id)
258
259
def __ne__(self, other):
260
return not (self == other)
261
262
def write_file(self, filename):
263
outfile = file(filename, "wb")
264
for line in self.tree.get_file(self.file_id):
265
outfile.write(line)
266
267
def same_text(self, filename):
268
in_file = file(filename, "rb")
269
return sha_file(in_file) == self.tree.get_file_sha1(self.file_id)
270
271
def __call__(self, filename, conflict_handler, reverse):
272
"""Create or delete a file
273
274
:param filename: The name of the file to create
275
:type filename: str
276
:param reverse: Delete the file instead of creating it
277
:type reverse: bool
278
"""
279
if not reverse:
280
try:
281
self.write_file(filename)
282
except IOError, e:
283
if e.errno == errno.ENOENT:
284
if conflict_handler.missing_parent(filename)=="continue":
285
self.write_file(filename)
286
else:
287
raise
288
289
else:
290
try:
291
if not self.same_text(filename):
292
direction = conflict_handler.wrong_old_contents(filename,
293
self.tree.get_file(self.file_id).read())
294
if direction != "continue":
295
return
296
os.unlink(filename)
297
except IOError, e:
298
if e.errno != errno.ENOENT:
299
raise
300
if conflict_handler.missing_for_rm(filename, undo) == "skip":
301
return
302
303
304
305
225
def reversed(sequence):
306
226
max = len(sequence) - 1
307
227
for i in range(len(sequence)):
374
294
if mode is not None:
375
295
os.chmod(filename, mode)
376
296
377
def is_creation(self):
378
return self.new_contents is not None and self.old_contents is None
379
380
def is_deletion(self):
381
return self.old_contents is not None and self.new_contents is None
382
383
297
class ApplySequence(object):
384
298
def __init__(self, changes=None):
385
299
self.changes = []
411
325
412
326
413
327
class Diff3Merge(object):
414
history_based = False
415
328
def __init__(self, file_id, base, other):
416
329
self.file_id = file_id
417
330
self.base = base
418
331
self.other = other
419
332
420
def is_creation(self):
421
return False
422
423
def is_deletion(self):
424
return False
425
426
333
def __eq__(self, other):
427
334
if not isinstance(other, Diff3Merge):
428
335
return False
432
339
def __ne__(self, other):
433
340
return not (self == other)
434
341
435
def dump_file(self, temp_dir, name, tree):
436
out_path = os.path.join(temp_dir, name)
437
out_file = file(out_path, "wb")
438
in_file = tree.get_file(self.file_id)
439
for line in in_file:
440
out_file.write(line)
441
return out_path
442
443
342
def apply(self, filename, conflict_handler, reverse=False):
444
temp_dir = mkdtemp(prefix="bzr-")
445
try:
446
new_file = filename+".new"
447
base_file = self.dump_file(temp_dir, "base", self.base)
448
other_file = self.dump_file(temp_dir, "other", self.other)
449
if not reverse:
450
base = base_file
451
other = other_file
452
else:
453
base = other_file
454
other = base_file
455
status = patch.diff3(new_file, filename, base, other)
456
if status == 0:
457
os.chmod(new_file, os.stat(filename).st_mode)
458
rename(new_file, filename)
459
return
460
else:
461
assert(status == 1)
462
def get_lines(filename):
463
my_file = file(filename, "rb")
464
lines = my_file.readlines()
465
my_file.close()
466
return lines
467
base_lines = get_lines(base)
468
other_lines = get_lines(other)
469
conflict_handler.merge_conflict(new_file, filename, base_lines,
470
other_lines)
471
finally:
472
rmtree(temp_dir)
343
new_file = filename+".new"
344
base_file = self.base.readonly_path(self.file_id)
345
other_file = self.other.readonly_path(self.file_id)
346
if not reverse:
347
base = base_file
348
other = other_file
349
else:
350
base = other_file
351
other = base_file
352
status = patch.diff3(new_file, filename, base, other)
353
if status == 0:
354
os.chmod(new_file, os.stat(filename).st_mode)
355
rename(new_file, filename)
356
return
357
else:
358
assert(status == 1)
359
def get_lines(filename):
360
my_file = file(base, "rb")
361
lines = my_file.readlines()
362
my_file.close()
363
base_lines = get_lines(base)
364
other_lines = get_lines(other)
365
conflict_handler.merge_conflict(new_file, filename, base_lines,
366
other_lines)
473
367
474
368
475
369
def CreateDir():
508
402
"""
509
403
return ReplaceContents(FileCreate(contents), None)
510
404
511
def ReplaceFileContents(old_tree, new_tree, file_id):
405
def ReplaceFileContents(old_contents, new_contents):
512
406
"""Convenience fucntion to replace the contents of a file.
513
407
514
408
:param old_contents: The contents of the file to replace
518
412
:return: A ReplaceContents that will replace the contents of a file a file
519
413
:rtype: `ReplaceContents`
520
414
"""
521
return ReplaceContents(TreeFileCreate(old_tree, file_id),
522
TreeFileCreate(new_tree, file_id))
415
return ReplaceContents(FileCreate(old_contents), FileCreate(new_contents))
523
416
524
417
def CreateSymlink(target):
525
418
"""Convenience fucntion to create a symlink.
688
581
:param reverse: if true, the changeset is being applied in reverse
689
582
:rtype: bool
690
583
"""
691
return self.is_creation(not reverse)
584
return ((self.new_parent is None and not reverse) or
585
(self.parent is None and reverse))
692
586
693
587
def is_creation(self, reverse):
694
588
"""Return true if applying the entry would create a file/directory.
696
590
:param reverse: if true, the changeset is being applied in reverse
697
591
:rtype: bool
698
592
"""
699
if self.contents_change is None:
700
return False
701
if reverse:
702
return self.contents_change.is_deletion()
703
else:
704
return self.contents_change.is_creation()
593
return ((self.parent is None and not reverse) or
594
(self.new_parent is None and reverse))
705
595
706
596
def is_creation_or_deletion(self):
707
597
"""Return true if applying the entry would create or delete a
709
599
710
600
:rtype: bool
711
601
"""
712
return self.is_creation(False) or self.is_deletion(False)
602
return self.parent is None or self.new_parent is None
713
603
714
604
def get_cset_path(self, mod=False):
715
605
"""Determine the path of the entry according to the changeset.
887
777
:rtype: (List, List)
888
778
"""
889
779
source_entries = [x for x in changeset.entries.itervalues()
890
if x.needs_rename() or x.is_creation_or_deletion()]
780
if x.needs_rename()]
891
781
# these are done from longest path to shortest, to avoid deleting a
892
782
# parent before its children are deleted/renamed
893
783
def longest_to_shortest(entry):
934
824
entry.apply(path, conflict_handler, reverse)
935
825
temp_name[entry.id] = None
936
826
937
elif entry.needs_rename():
827
else:
938
828
to_name = os.path.join(temp_dir, str(i))
939
829
src_path = inventory.get(entry.id)
940
830
if src_path is not None:
945
835
except OSError, e:
946
836
if e.errno != errno.ENOENT:
947
837
raise
948
if conflict_handler.missing_for_rename(src_path, to_name) \
949
== "skip":
838
if conflict_handler.missing_for_rename(src_path) == "skip":
950
839
continue
951
840
952
841
return temp_name
973
862
continue
974
863
new_path = os.path.join(dir, new_tree_path)
975
864
old_path = changed_inventory.get(entry.id)
976
if bzrlib.osutils.lexists(new_path):
865
if os.path.exists(new_path):
977
866
if conflict_handler.target_exists(entry, new_path, old_path) == \
978
867
"skip":
979
868
continue
980
869
if entry.is_creation(reverse):
981
870
entry.apply(new_path, conflict_handler, reverse)
982
871
changed_inventory[entry.id] = new_tree_path
983
elif entry.needs_rename():
872
else:
984
873
if old_path is None:
985
874
continue
986
875
try:
1025
914
Exception.__init__(self, "Conflict applying changes to %s" % this_path)
1026
915
self.this_path = this_path
1027
916
917
class MergePermissionConflict(Exception):
918
def __init__(self, this_path, base_path, other_path):
919
this_perms = os.stat(this_path).st_mode & 0755
920
base_perms = os.stat(base_path).st_mode & 0755
921
other_perms = os.stat(other_path).st_mode & 0755
922
msg = """Conflicting permission for %s
923
this: %o
924
base: %o
925
other: %o
926
""" % (this_path, this_perms, base_perms, other_perms)
927
self.this_path = this_path
928
self.base_path = base_path
929
self.other_path = other_path
930
Exception.__init__(self, msg)
931
1028
932
class WrongOldContents(Exception):
1029
933
def __init__(self, filename):
1030
934
msg = "Contents mismatch deleting %s" % filename
1031
935
self.filename = filename
1032
936
Exception.__init__(self, msg)
1033
937
1034
class WrongOldExecFlag(Exception):
1035
def __init__(self, filename, old_exec_flag, new_exec_flag):
1036
msg = "Executable flag missmatch on %s:\n" \
1037
"Expected %s, got %s." % (filename, old_exec_flag, new_exec_flag)
938
class WrongOldPermissions(Exception):
939
def __init__(self, filename, old_perms, new_perms):
940
msg = "Permission missmatch on %s:\n" \
941
"Expected 0%o, got 0%o." % (filename, old_perms, new_perms)
1038
942
self.filename = filename
1039
943
Exception.__init__(self, msg)
1040
944
1058
962
Exception.__init__(self, msg)
1059
963
self.filename = filename
1060
964
1061
class MissingForSetExec(Exception):
965
class MissingPermsFile(Exception):
1062
966
def __init__(self, filename):
1063
967
msg = "Attempt to change permissions on %s, which does not exist" %\
1064
968
filename
1073
977
1074
978
1075
979
class MissingForRename(Exception):
1076
def __init__(self, filename, to_path):
1077
msg = "Attempt to move missing path %s to %s" % (filename, to_path)
980
def __init__(self, filename):
981
msg = "Attempt to move missing path %s" % (filename)
1078
982
Exception.__init__(self, msg)
1079
983
self.filename = filename
1080
984
1083
987
msg = "Conflicting contents for new file %s" % (filename)
1084
988
Exception.__init__(self, msg)
1085
989
1086
class WeaveMergeConflict(Exception):
1087
def __init__(self, filename):
1088
msg = "Conflicting contents for file %s" % (filename)
1089
Exception.__init__(self, msg)
1090
1091
class ThreewayContentsConflict(Exception):
1092
def __init__(self, filename):
1093
msg = "Conflicting contents for file %s" % (filename)
1094
Exception.__init__(self, msg)
1095
1096
990
1097
991
class MissingForMerge(Exception):
1098
992
def __init__(self, filename):
1131
1025
os.unlink(new_file)
1132
1026
raise MergeConflict(this_path)
1133
1027
1028
def permission_conflict(self, this_path, base_path, other_path):
1029
raise MergePermissionConflict(this_path, base_path, other_path)
1030
1134
1031
def wrong_old_contents(self, filename, expected_contents):
1135
1032
raise WrongOldContents(filename)
1136
1033
1137
1034
def rem_contents_conflict(self, filename, this_contents, base_contents):
1138
1035
raise RemoveContentsConflict(filename)
1139
1036
1140
def wrong_old_exec_flag(self, filename, old_exec_flag, new_exec_flag):
1141
raise WrongOldExecFlag(filename, old_exec_flag, new_exec_flag)
1037
def wrong_old_perms(self, filename, old_perms, new_perms):
1038
raise WrongOldPermissions(filename, old_perms, new_perms)
1142
1039
1143
1040
def rmdir_non_empty(self, filename):
1144
1041
raise DeletingNonEmptyDirectory(filename)
1149
1046
def patch_target_missing(self, filename, contents):
1150
1047
raise PatchTargetMissing(filename)
1151
1048
1152
def missing_for_exec_flag(self, filename):
1153
raise MissingForExecFlag(filename)
1049
def missing_for_chmod(self, filename):
1050
raise MissingPermsFile(filename)
1154
1051
1155
1052
def missing_for_rm(self, filename, change):
1156
1053
raise MissingForRm(filename)
1157
1054
1158
def missing_for_rename(self, filename, to_path):
1159
raise MissingForRename(filename, to_path)
1055
def missing_for_rename(self, filename):
1056
raise MissingForRename(filename)
1160
1057
1161
1058
def missing_for_merge(self, file_id, other_path):
1162
1059
raise MissingForMerge(other_path)
1164
1061
def new_contents_conflict(self, filename, other_contents):
1165
1062
raise NewContentsConflict(filename)
1166
1063
1167
def weave_merge_conflict(self, filename, weave, other_i, out_file):
1168
raise WeaveMergeConflict(filename)
1169
1170
def threeway_contents_conflict(self, filename, this_contents,
1171
base_contents, other_contents):
1172
raise ThreewayContentsConflict(filename)
1173
1174
1064
def finalize(self):
1175
1065
pass
1176
1066
1207
1097
1208
1098
#apply changes that don't affect filenames
1209
1099
for entry in changeset.entries.itervalues():
1210
if not entry.is_creation_or_deletion() and not entry.is_boring():
1100
if not entry.is_creation_or_deletion():
1211
1101
path = os.path.join(dir, inventory[entry.id])
1212
1102
entry.apply(path, conflict_handler, reverse)
1213
1103
1232
1122
r_inventory = {}
1233
1123
for entry in tree.source_inventory().itervalues():
1234
1124
inventory[entry.id] = entry.path
1235
new_inventory = apply_changeset(cset, r_inventory, tree.basedir,
1125
new_inventory = apply_changeset(cset, r_inventory, tree.root,
1236
1126
reverse=reverse)
1237
1127
new_entries, remove_entries = \
1238
1128
get_inventory_change(inventory, new_inventory, cset, reverse)
1373
1263
return new_meta
1374
1264
elif new_meta is None:
1375
1265
return old_meta
1376
elif (isinstance(old_meta, ChangeExecFlag) and
1377
isinstance(new_meta, ChangeExecFlag)):
1378
return ChangeExecFlag(old_meta.old_exec_flag, new_meta.new_exec_flag)
1266
elif isinstance(old_meta, ChangeUnixPermissions) and \
1267
isinstance(new_meta, ChangeUnixPermissions):
1268
return ChangeUnixPermissions(old_meta.old_mode, new_meta.new_mode)
1379
1269
else:
1380
1270
return ApplySequence(old_meta, new_meta)
1381
1271
1386
1276
return False
1387
1277
return True
1388
1278
1389
class UnsupportedFiletype(Exception):
1390
def __init__(self, kind, full_path):
1391
msg = "The file \"%s\" is a %s, which is not a supported filetype." \
1392
% (full_path, kind)
1279
class UnsuppportedFiletype(Exception):
1280
def __init__(self, full_path, stat_result):
1281
msg = "The file \"%s\" is not a supported filetype." % full_path
1393
1282
Exception.__init__(self, msg)
1394
1283
self.full_path = full_path
1395
self.kind = kind
1284
self.stat_result = stat_result
1396
1285
1397
1286
def generate_changeset(tree_a, tree_b, interesting_ids=None):
1398
1287
return ChangesetGenerator(tree_a, tree_b, interesting_ids)()
1399
1288
1400
1401
1289
class ChangesetGenerator(object):
1402
1290
def __init__(self, tree_a, tree_b, interesting_ids=None):
1403
1291
object.__init__(self)
1439
1327
def get_entry(self, file_id, tree):
1440
1328
if not tree.has_or_had_id(file_id):
1441
1329
return None
1442
return tree.inventory[file_id]
1330
return tree.tree.inventory[file_id]
1443
1331
1444
1332
def get_entry_parent(self, entry):
1445
1333
if entry is None:
1495
1383
1496
1384
if cs_entry is None:
1497
1385
return None
1498
1499
cs_entry.metadata_change = self.make_exec_flag_change(id)
1500
1501
1386
if id in self.tree_a and id in self.tree_b:
1502
1387
a_sha1 = self.tree_a.get_file_sha1(id)
1503
1388
b_sha1 = self.tree_b.get_file_sha1(id)
1504
1389
if None not in (a_sha1, b_sha1) and a_sha1 == b_sha1:
1505
1390
return cs_entry
1506
1391
1507
cs_entry.contents_change = self.make_contents_change(id)
1392
full_path_a = self.tree_a.readonly_path(id)
1393
full_path_b = self.tree_b.readonly_path(id)
1394
stat_a = self.lstat(full_path_a)
1395
stat_b = self.lstat(full_path_b)
1396
1397
cs_entry.metadata_change = self.make_mode_change(stat_a, stat_b)
1398
cs_entry.contents_change = self.make_contents_change(full_path_a,
1399
stat_a,
1400
full_path_b,
1401
stat_b)
1508
1402
return cs_entry
1509
1403
1510
def make_exec_flag_change(self, file_id):
1511
exec_flag_a = exec_flag_b = None
1512
if file_id in self.tree_a and self.tree_a.kind(file_id) == "file":
1513
exec_flag_a = self.tree_a.is_executable(file_id)
1514
1515
if file_id in self.tree_b and self.tree_b.kind(file_id) == "file":
1516
exec_flag_b = self.tree_b.is_executable(file_id)
1517
1518
if exec_flag_a == exec_flag_b:
1519
return None
1520
return ChangeExecFlag(exec_flag_a, exec_flag_b)
1521
1522
def make_contents_change(self, file_id):
1523
a_contents = get_contents(self.tree_a, file_id)
1524
b_contents = get_contents(self.tree_b, file_id)
1404
def make_mode_change(self, stat_a, stat_b):
1405
mode_a = None
1406
if stat_a is not None and not stat.S_ISLNK(stat_a.st_mode):
1407
mode_a = stat_a.st_mode & 0777
1408
mode_b = None
1409
if stat_b is not None and not stat.S_ISLNK(stat_b.st_mode):
1410
mode_b = stat_b.st_mode & 0777
1411
if mode_a == mode_b:
1412
return None
1413
return ChangeUnixPermissions(mode_a, mode_b)
1414
1415
def make_contents_change(self, full_path_a, stat_a, full_path_b, stat_b):
1416
if stat_a is None and stat_b is None:
1417
return None
1418
if None not in (stat_a, stat_b) and stat.S_ISDIR(stat_a.st_mode) and\
1419
stat.S_ISDIR(stat_b.st_mode):
1420
return None
1421
if None not in (stat_a, stat_b) and stat.S_ISREG(stat_a.st_mode) and\
1422
stat.S_ISREG(stat_b.st_mode):
1423
if stat_a.st_ino == stat_b.st_ino and \
1424
stat_a.st_dev == stat_b.st_dev:
1425
return None
1426
1427
a_contents = self.get_contents(stat_a, full_path_a)
1428
b_contents = self.get_contents(stat_b, full_path_b)
1525
1429
if a_contents == b_contents:
1526
1430
return None
1527
1431
return ReplaceContents(a_contents, b_contents)
1528
1432
1433
def get_contents(self, stat_result, full_path):
1434
if stat_result is None:
1435
return None
1436
elif stat.S_ISREG(stat_result.st_mode):
1437
return FileCreate(file(full_path, "rb").read())
1438
elif stat.S_ISDIR(stat_result.st_mode):
1439
return dir_create
1440
elif stat.S_ISLNK(stat_result.st_mode):
1441
return SymlinkCreate(os.readlink(full_path))
1442
else:
1443
raise UnsupportedFiletype(full_path, stat_result)
1529
1444
1530
def get_contents(tree, file_id):
1531
"""Return the appropriate contents to create a copy of file_id from tree"""
1532
if file_id not in tree:
1533
return None
1534
kind = tree.kind(file_id)
1535
if kind == "file":
1536
return TreeFileCreate(tree, file_id)
1537
elif kind in ("directory", "root_directory"):
1538
return dir_create
1539
elif kind == "symlink":
1540
return SymlinkCreate(tree.get_symlink_target(file_id))
1541
else:
1542
raise UnsupportedFiletype(kind, tree.id2path(file_id))
1445
def lstat(self, full_path):
1446
stat_result = None
1447
if full_path is not None:
1448
try:
1449
stat_result = os.lstat(full_path)
1450
except OSError, e:
1451
if e.errno != errno.ENOENT:
1452
raise
1453
return stat_result
1543
1454
1544
1455
1545
1456
def full_path(entry, tree):
1546
return os.path.join(tree.basedir, entry.path)
1457
return os.path.join(tree.root, entry.path)
1547
1458
1548
1459
def new_delete_entry(entry, tree, inventory, delete):
1549
1460
if entry.path == "":
Loggerhead is a web-based interface for Breezy
Version: 2.0.1