« back to all changes in this revision
Viewing changes to bzrlib/changeset.py
- browse files at revision 1185.14.7
- compare with another revision
- download diff
- download tarball
- view history from revision 1185.14.7
- Committer: Aaron Bentley
- Date: 2005-10-04 04:32:32 UTC
- mfrom: (1185.12.6)
- mto: (1185.12.13)
- mto: This revision was merged to the branch mainline in revision 1419.
- Revision ID: aaron.bentley@utoronto.ca-20051004043231-40302a149769263b
merged my own changes
- 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:
- .rsyncexclude
- 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
21
from bzrlib.osutils import rename
24
22
import bzrlib
25
from itertools import izip
26
23
27
24
# XXX: mbp: I'm not totally convinced that we should handle conflicts
28
25
# as part of changeset application, rather than only in the merge
48
45
return newdict
49
46
50
47
51
class ChangeExecFlag(object):
48
class ChangeUnixPermissions(object):
52
49
"""This is two-way change, suitable for file modification, creation,
53
50
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
51
def __init__(self, old_mode, new_mode):
52
self.old_mode = old_mode
53
self.new_mode = new_mode
57
54
58
55
def apply(self, filename, conflict_handler, reverse=False):
59
56
if not reverse:
60
from_exec_flag = self.old_exec_flag
61
to_exec_flag = self.new_exec_flag
57
from_mode = self.old_mode
58
to_mode = self.new_mode
62
59
else:
63
from_exec_flag = self.new_exec_flag
64
to_exec_flag = self.old_exec_flag
60
from_mode = self.new_mode
61
to_mode = self.old_mode
65
62
try:
66
current_exec_flag = bool(os.stat(filename).st_mode & 0111)
63
current_mode = os.stat(filename).st_mode &0777
67
64
except OSError, e:
68
65
if e.errno == errno.ENOENT:
69
if conflict_handler.missing_for_exec_flag(filename) == "skip":
66
if conflict_handler.missing_for_chmod(filename) == "skip":
70
67
return
71
68
else:
72
current_exec_flag = from_exec_flag
69
current_mode = from_mode
73
70
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":
71
if from_mode is not None and current_mode != from_mode:
72
if conflict_handler.wrong_old_perms(filename, from_mode,
73
current_mode) != "continue":
77
74
return
78
75
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
76
if to_mode is not None:
92
77
try:
93
78
os.chmod(filename, to_mode)
94
79
except IOError, e:
95
80
if e.errno == errno.ENOENT:
96
conflict_handler.missing_for_exec_flag(filename)
81
conflict_handler.missing_for_chmod(filename)
97
82
98
83
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)
84
if not isinstance(other, ChangeUnixPermissions):
85
return False
86
elif self.old_mode != other.old_mode:
87
return False
88
elif self.new_mode != other.new_mode:
89
return False
90
else:
91
return True
102
92
103
93
def __ne__(self, other):
104
94
return not (self == other)
146
136
"""
147
137
self.target = contents
148
138
149
def __repr__(self):
150
return "SymlinkCreate(%s)" % self.target
151
152
139
def __call__(self, filename, conflict_handler, reverse):
153
140
"""Creates or destroys the symlink.
154
141
236
223
237
224
238
225
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
226
def reversed(sequence):
306
227
max = len(sequence) - 1
307
228
for i in range(len(sequence)):
374
295
if mode is not None:
375
296
os.chmod(filename, mode)
376
297
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
298
class ApplySequence(object):
384
299
def __init__(self, changes=None):
385
300
self.changes = []
411
326
412
327
413
328
class Diff3Merge(object):
414
history_based = False
415
329
def __init__(self, file_id, base, other):
416
330
self.file_id = file_id
417
331
self.base = base
418
332
self.other = other
419
333
420
def is_creation(self):
421
return False
422
423
def is_deletion(self):
424
return False
425
426
334
def __eq__(self, other):
427
335
if not isinstance(other, Diff3Merge):
428
336
return False
432
340
def __ne__(self, other):
433
341
return not (self == other)
434
342
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
343
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)
344
new_file = filename+".new"
345
base_file = self.base.readonly_path(self.file_id)
346
other_file = self.other.readonly_path(self.file_id)
347
if not reverse:
348
base = base_file
349
other = other_file
350
else:
351
base = other_file
352
other = base_file
353
status = patch.diff3(new_file, filename, base, other)
354
if status == 0:
355
os.chmod(new_file, os.stat(filename).st_mode)
356
rename(new_file, filename)
357
return
358
else:
359
assert(status == 1)
360
def get_lines(filename):
361
my_file = file(filename, "rb")
362
lines = my_file.readlines()
363
my_file.close()
364
return lines
365
base_lines = get_lines(base)
366
other_lines = get_lines(other)
367
conflict_handler.merge_conflict(new_file, filename, base_lines,
368
other_lines)
473
369
474
370
475
371
def CreateDir():
508
404
"""
509
405
return ReplaceContents(FileCreate(contents), None)
510
406
511
def ReplaceFileContents(old_tree, new_tree, file_id):
407
def ReplaceFileContents(old_contents, new_contents):
512
408
"""Convenience fucntion to replace the contents of a file.
513
409
514
410
:param old_contents: The contents of the file to replace
518
414
:return: A ReplaceContents that will replace the contents of a file a file
519
415
:rtype: `ReplaceContents`
520
416
"""
521
return ReplaceContents(TreeFileCreate(old_tree, file_id),
522
TreeFileCreate(new_tree, file_id))
417
return ReplaceContents(FileCreate(old_contents), FileCreate(new_contents))
523
418
524
419
def CreateSymlink(target):
525
420
"""Convenience fucntion to create a symlink.
688
583
:param reverse: if true, the changeset is being applied in reverse
689
584
:rtype: bool
690
585
"""
691
return self.is_creation(not reverse)
586
return ((self.new_parent is None and not reverse) or
587
(self.parent is None and reverse))
692
588
693
589
def is_creation(self, reverse):
694
590
"""Return true if applying the entry would create a file/directory.
696
592
:param reverse: if true, the changeset is being applied in reverse
697
593
:rtype: bool
698
594
"""
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()
595
return ((self.parent is None and not reverse) or
596
(self.new_parent is None and reverse))
705
597
706
598
def is_creation_or_deletion(self):
707
599
"""Return true if applying the entry would create or delete a
709
601
710
602
:rtype: bool
711
603
"""
712
return self.is_creation(False) or self.is_deletion(False)
604
return self.parent is None or self.new_parent is None
713
605
714
606
def get_cset_path(self, mod=False):
715
607
"""Determine the path of the entry according to the changeset.
887
779
:rtype: (List, List)
888
780
"""
889
781
source_entries = [x for x in changeset.entries.itervalues()
890
if x.needs_rename() or x.is_creation_or_deletion()]
782
if x.needs_rename()]
891
783
# these are done from longest path to shortest, to avoid deleting a
892
784
# parent before its children are deleted/renamed
893
785
def longest_to_shortest(entry):
934
826
entry.apply(path, conflict_handler, reverse)
935
827
temp_name[entry.id] = None
936
828
937
elif entry.needs_rename():
829
else:
938
830
to_name = os.path.join(temp_dir, str(i))
939
831
src_path = inventory.get(entry.id)
940
832
if src_path is not None:
945
837
except OSError, e:
946
838
if e.errno != errno.ENOENT:
947
839
raise
948
if conflict_handler.missing_for_rename(src_path, to_name) \
949
== "skip":
840
if conflict_handler.missing_for_rename(src_path) == "skip":
950
841
continue
951
842
952
843
return temp_name
980
871
if entry.is_creation(reverse):
981
872
entry.apply(new_path, conflict_handler, reverse)
982
873
changed_inventory[entry.id] = new_tree_path
983
elif entry.needs_rename():
874
else:
984
875
if old_path is None:
985
876
continue
986
877
try:
1025
916
Exception.__init__(self, "Conflict applying changes to %s" % this_path)
1026
917
self.this_path = this_path
1027
918
919
class MergePermissionConflict(Exception):
920
def __init__(self, this_path, base_path, other_path):
921
this_perms = os.stat(this_path).st_mode & 0755
922
base_perms = os.stat(base_path).st_mode & 0755
923
other_perms = os.stat(other_path).st_mode & 0755
924
msg = """Conflicting permission for %s
925
this: %o
926
base: %o
927
other: %o
928
""" % (this_path, this_perms, base_perms, other_perms)
929
self.this_path = this_path
930
self.base_path = base_path
931
self.other_path = other_path
932
Exception.__init__(self, msg)
933
1028
934
class WrongOldContents(Exception):
1029
935
def __init__(self, filename):
1030
936
msg = "Contents mismatch deleting %s" % filename
1031
937
self.filename = filename
1032
938
Exception.__init__(self, msg)
1033
939
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)
940
class WrongOldPermissions(Exception):
941
def __init__(self, filename, old_perms, new_perms):
942
msg = "Permission missmatch on %s:\n" \
943
"Expected 0%o, got 0%o." % (filename, old_perms, new_perms)
1038
944
self.filename = filename
1039
945
Exception.__init__(self, msg)
1040
946
1058
964
Exception.__init__(self, msg)
1059
965
self.filename = filename
1060
966
1061
class MissingForSetExec(Exception):
967
class MissingPermsFile(Exception):
1062
968
def __init__(self, filename):
1063
969
msg = "Attempt to change permissions on %s, which does not exist" %\
1064
970
filename
1073
979
1074
980
1075
981
class MissingForRename(Exception):
1076
def __init__(self, filename, to_path):
1077
msg = "Attempt to move missing path %s to %s" % (filename, to_path)
982
def __init__(self, filename):
983
msg = "Attempt to move missing path %s" % (filename)
1078
984
Exception.__init__(self, msg)
1079
985
self.filename = filename
1080
986
1083
989
msg = "Conflicting contents for new file %s" % (filename)
1084
990
Exception.__init__(self, msg)
1085
991
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
992
1097
993
class MissingForMerge(Exception):
1098
994
def __init__(self, filename):
1131
1027
os.unlink(new_file)
1132
1028
raise MergeConflict(this_path)
1133
1029
1030
def permission_conflict(self, this_path, base_path, other_path):
1031
raise MergePermissionConflict(this_path, base_path, other_path)
1032
1134
1033
def wrong_old_contents(self, filename, expected_contents):
1135
1034
raise WrongOldContents(filename)
1136
1035
1137
1036
def rem_contents_conflict(self, filename, this_contents, base_contents):
1138
1037
raise RemoveContentsConflict(filename)
1139
1038
1140
def wrong_old_exec_flag(self, filename, old_exec_flag, new_exec_flag):
1141
raise WrongOldExecFlag(filename, old_exec_flag, new_exec_flag)
1039
def wrong_old_perms(self, filename, old_perms, new_perms):
1040
raise WrongOldPermissions(filename, old_perms, new_perms)
1142
1041
1143
1042
def rmdir_non_empty(self, filename):
1144
1043
raise DeletingNonEmptyDirectory(filename)
1149
1048
def patch_target_missing(self, filename, contents):
1150
1049
raise PatchTargetMissing(filename)
1151
1050
1152
def missing_for_exec_flag(self, filename):
1153
raise MissingForExecFlag(filename)
1051
def missing_for_chmod(self, filename):
1052
raise MissingPermsFile(filename)
1154
1053
1155
1054
def missing_for_rm(self, filename, change):
1156
1055
raise MissingForRm(filename)
1157
1056
1158
def missing_for_rename(self, filename, to_path):
1159
raise MissingForRename(filename, to_path)
1057
def missing_for_rename(self, filename):
1058
raise MissingForRename(filename)
1160
1059
1161
1060
def missing_for_merge(self, file_id, other_path):
1162
1061
raise MissingForMerge(other_path)
1164
1063
def new_contents_conflict(self, filename, other_contents):
1165
1064
raise NewContentsConflict(filename)
1166
1065
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
1066
def finalize(self):
1175
1067
pass
1176
1068
1207
1099
1208
1100
#apply changes that don't affect filenames
1209
1101
for entry in changeset.entries.itervalues():
1210
if not entry.is_creation_or_deletion() and not entry.is_boring():
1102
if not entry.is_creation_or_deletion():
1211
1103
path = os.path.join(dir, inventory[entry.id])
1212
1104
entry.apply(path, conflict_handler, reverse)
1213
1105
1232
1124
r_inventory = {}
1233
1125
for entry in tree.source_inventory().itervalues():
1234
1126
inventory[entry.id] = entry.path
1235
new_inventory = apply_changeset(cset, r_inventory, tree.basedir,
1127
new_inventory = apply_changeset(cset, r_inventory, tree.root,
1236
1128
reverse=reverse)
1237
1129
new_entries, remove_entries = \
1238
1130
get_inventory_change(inventory, new_inventory, cset, reverse)
1373
1265
return new_meta
1374
1266
elif new_meta is None:
1375
1267
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)
1268
elif isinstance(old_meta, ChangeUnixPermissions) and \
1269
isinstance(new_meta, ChangeUnixPermissions):
1270
return ChangeUnixPermissions(old_meta.old_mode, new_meta.new_mode)
1379
1271
else:
1380
1272
return ApplySequence(old_meta, new_meta)
1381
1273
1386
1278
return False
1387
1279
return True
1388
1280
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)
1281
class UnsuppportedFiletype(Exception):
1282
def __init__(self, full_path, stat_result):
1283
msg = "The file \"%s\" is not a supported filetype." % full_path
1393
1284
Exception.__init__(self, msg)
1394
1285
self.full_path = full_path
1395
self.kind = kind
1286
self.stat_result = stat_result
1396
1287
1397
1288
def generate_changeset(tree_a, tree_b, interesting_ids=None):
1398
1289
return ChangesetGenerator(tree_a, tree_b, interesting_ids)()
1399
1290
1400
1401
1291
class ChangesetGenerator(object):
1402
1292
def __init__(self, tree_a, tree_b, interesting_ids=None):
1403
1293
object.__init__(self)
1439
1329
def get_entry(self, file_id, tree):
1440
1330
if not tree.has_or_had_id(file_id):
1441
1331
return None
1442
return tree.inventory[file_id]
1332
return tree.tree.inventory[file_id]
1443
1333
1444
1334
def get_entry_parent(self, entry):
1445
1335
if entry is None:
1496
1386
if cs_entry is None:
1497
1387
return None
1498
1388
1499
cs_entry.metadata_change = self.make_exec_flag_change(id)
1389
full_path_a = self.tree_a.readonly_path(id)
1390
full_path_b = self.tree_b.readonly_path(id)
1391
stat_a = self.lstat(full_path_a)
1392
stat_b = self.lstat(full_path_b)
1393
1394
cs_entry.metadata_change = self.make_mode_change(stat_a, stat_b)
1500
1395
1501
1396
if id in self.tree_a and id in self.tree_b:
1502
1397
a_sha1 = self.tree_a.get_file_sha1(id)
1504
1399
if None not in (a_sha1, b_sha1) and a_sha1 == b_sha1:
1505
1400
return cs_entry
1506
1401
1507
cs_entry.contents_change = self.make_contents_change(id)
1402
cs_entry.contents_change = self.make_contents_change(full_path_a,
1403
stat_a,
1404
full_path_b,
1405
stat_b)
1508
1406
return cs_entry
1509
1407
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)
1408
def make_mode_change(self, stat_a, stat_b):
1409
mode_a = None
1410
if stat_a is not None and not stat.S_ISLNK(stat_a.st_mode):
1411
mode_a = stat_a.st_mode & 0777
1412
mode_b = None
1413
if stat_b is not None and not stat.S_ISLNK(stat_b.st_mode):
1414
mode_b = stat_b.st_mode & 0777
1415
if mode_a == mode_b:
1416
return None
1417
return ChangeUnixPermissions(mode_a, mode_b)
1418
1419
def make_contents_change(self, full_path_a, stat_a, full_path_b, stat_b):
1420
if stat_a is None and stat_b is None:
1421
return None
1422
if None not in (stat_a, stat_b) and stat.S_ISDIR(stat_a.st_mode) and\
1423
stat.S_ISDIR(stat_b.st_mode):
1424
return None
1425
if None not in (stat_a, stat_b) and stat.S_ISREG(stat_a.st_mode) and\
1426
stat.S_ISREG(stat_b.st_mode):
1427
if stat_a.st_ino == stat_b.st_ino and \
1428
stat_a.st_dev == stat_b.st_dev:
1429
return None
1430
1431
a_contents = self.get_contents(stat_a, full_path_a)
1432
b_contents = self.get_contents(stat_b, full_path_b)
1525
1433
if a_contents == b_contents:
1526
1434
return None
1527
1435
return ReplaceContents(a_contents, b_contents)
1528
1436
1437
def get_contents(self, stat_result, full_path):
1438
if stat_result is None:
1439
return None
1440
elif stat.S_ISREG(stat_result.st_mode):
1441
return FileCreate(file(full_path, "rb").read())
1442
elif stat.S_ISDIR(stat_result.st_mode):
1443
return dir_create
1444
elif stat.S_ISLNK(stat_result.st_mode):
1445
return SymlinkCreate(os.readlink(full_path))
1446
else:
1447
raise UnsupportedFiletype(full_path, stat_result)
1529
1448
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))
1449
def lstat(self, full_path):
1450
stat_result = None
1451
if full_path is not None:
1452
try:
1453
stat_result = os.lstat(full_path)
1454
except OSError, e:
1455
if e.errno != errno.ENOENT:
1456
raise
1457
return stat_result
1543
1458
1544
1459
1545
1460
def full_path(entry, tree):
1546
return os.path.join(tree.basedir, entry.path)
1461
return os.path.join(tree.root, entry.path)
1547
1462
1548
1463
def new_delete_entry(entry, tree, inventory, delete):
1549
1464
if entry.path == "":
Loggerhead is a web-based interface for Breezy
Version: 2.0.1