« back to all changes in this revision
Viewing changes to bzrlib/changeset.py
- browse files at revision 1438
- compare with another revision
- download diff
- download tarball
- view history from revision 1438
- Committer: Robert Collins
- Date: 2005-10-11 02:52:47 UTC
- mfrom: (1417.1.13)
- Revision ID: robertc@robertcollins.net-20051011025247-4b95466bb6509385
merge in revision-history caching, and tuning of fetch to not retrieve more data than needed when nothing needs to be pulled
- files added:
- HACKING
- bzrlib/store
- bzrlib/transport
- bzrlib/util
- contrib/emacs
- files removed:
- bzrlib/meta_store.py
- plugins/changeset
- files renamed:
- plugins/ => bzrlib/plugins/
- tools/testweave.py => bzrlib/selftest/test_weave.py
- bzrlib/store.py => bzrlib/store/__init__.py
- effbot/ => bzrlib/util/effbot/
- elementtree/ => bzrlib/util/elementtree/
- urlgrabber/ => bzrlib/util/urlgrabber/
- bzrlib/newinventory.py => contrib/newinventory.py
- files modified:
- .bzrignore
- bzr *
- setup.py *
added
removed
bzrlib/changeset.py
18
18
import patch
19
19
import stat
20
20
from bzrlib.trace import mutter
21
"""
22
Represent and apply a changeset
23
"""
21
from bzrlib.osutils import rename
22
import bzrlib
23
24
# XXX: mbp: I'm not totally convinced that we should handle conflicts
25
# as part of changeset application, rather than only in the merge
26
# operation.
27
28
"""Represent and apply a changeset
29
30
Conflicts in applying a changeset are represented as exceptions.
31
"""
32
24
33
__docformat__ = "restructuredtext"
25
34
26
35
NULL_ID = "!NULL"
35
44
newdict[value] = key
36
45
return newdict
37
46
38
39
class PatchApply(object):
40
"""Patch application as a kind of content change"""
41
def __init__(self, contents):
42
"""Constructor.
43
44
:param contents: The text of the patch to apply
45
:type contents: str"""
46
self.contents = contents
47
48
def __eq__(self, other):
49
if not isinstance(other, PatchApply):
50
return False
51
elif self.contents != other.contents:
52
return False
53
else:
54
return True
55
56
def __ne__(self, other):
57
return not (self == other)
58
59
def apply(self, filename, conflict_handler, reverse=False):
60
"""Applies the patch to the specified file.
61
62
:param filename: the file to apply the patch to
63
:type filename: str
64
:param reverse: If true, apply the patch in reverse
65
:type reverse: bool
66
"""
67
input_name = filename+".orig"
68
try:
69
os.rename(filename, input_name)
70
except OSError, e:
71
if e.errno != errno.ENOENT:
72
raise
73
if conflict_handler.patch_target_missing(filename, self.contents)\
74
== "skip":
75
return
76
os.rename(filename, input_name)
77
78
79
status = patch.patch(self.contents, input_name, filename,
80
reverse)
81
os.chmod(filename, os.stat(input_name).st_mode)
82
if status == 0:
83
os.unlink(input_name)
84
elif status == 1:
85
conflict_handler.failed_hunks(filename)
86
87
88
class ChangeUnixPermissions(object):
47
48
class ChangeExecFlag(object):
89
49
"""This is two-way change, suitable for file modification, creation,
90
50
deletion"""
91
def __init__(self, old_mode, new_mode):
92
self.old_mode = old_mode
93
self.new_mode = new_mode
51
def __init__(self, old_exec_flag, new_exec_flag):
52
self.old_exec_flag = old_exec_flag
53
self.new_exec_flag = new_exec_flag
94
54
95
55
def apply(self, filename, conflict_handler, reverse=False):
96
56
if not reverse:
97
from_mode = self.old_mode
98
to_mode = self.new_mode
57
from_exec_flag = self.old_exec_flag
58
to_exec_flag = self.new_exec_flag
99
59
else:
100
from_mode = self.new_mode
101
to_mode = self.old_mode
60
from_exec_flag = self.new_exec_flag
61
to_exec_flag = self.old_exec_flag
102
62
try:
103
current_mode = os.stat(filename).st_mode &0777
63
current_exec_flag = bool(os.stat(filename).st_mode & 0111)
104
64
except OSError, e:
105
65
if e.errno == errno.ENOENT:
106
if conflict_handler.missing_for_chmod(filename) == "skip":
66
if conflict_handler.missing_for_exec_flag(filename) == "skip":
107
67
return
108
68
else:
109
current_mode = from_mode
69
current_exec_flag = from_exec_flag
110
70
111
if from_mode is not None and current_mode != from_mode:
112
if conflict_handler.wrong_old_perms(filename, from_mode,
113
current_mode) != "continue":
71
if from_exec_flag is not None and current_exec_flag != from_exec_flag:
72
if conflict_handler.wrong_old_exec_flag(filename,
73
from_exec_flag, current_exec_flag) != "continue":
114
74
return
115
75
116
if to_mode is not None:
76
if to_exec_flag is not None:
77
current_mode = os.stat(filename).st_mode
78
if to_exec_flag:
79
umask = os.umask(0)
80
os.umask(umask)
81
to_mode = current_mode | (0100 & ~umask)
82
# Enable x-bit for others only if they can read it.
83
if current_mode & 0004:
84
to_mode |= 0001 & ~umask
85
if current_mode & 0040:
86
to_mode |= 0010 & ~umask
87
else:
88
to_mode = current_mode & ~0111
117
89
try:
118
90
os.chmod(filename, to_mode)
119
91
except IOError, e:
120
92
if e.errno == errno.ENOENT:
121
conflict_handler.missing_for_chmod(filename)
93
conflict_handler.missing_for_exec_flag(filename)
122
94
123
95
def __eq__(self, other):
124
if not isinstance(other, ChangeUnixPermissions):
125
return False
126
elif self.old_mode != other.old_mode:
127
return False
128
elif self.new_mode != other.new_mode:
129
return False
130
else:
131
return True
96
return (isinstance(other, ChangeExecFlag) and
97
self.old_exec_flag == other.old_exec_flag and
98
self.new_exec_flag == other.new_exec_flag)
132
99
133
100
def __ne__(self, other):
134
101
return not (self == other)
135
102
103
136
104
def dir_create(filename, conflict_handler, reverse):
137
105
"""Creates the directory, or deletes it if reverse is true. Intended to be
138
106
used with ReplaceContents.
158
126
try:
159
127
os.rmdir(filename)
160
128
except OSError, e:
161
if e.errno != 39:
129
if e.errno != errno.ENOTEMPTY:
162
130
raise
163
131
if conflict_handler.rmdir_non_empty(filename) == "skip":
164
132
return
165
133
os.rmdir(filename)
166
134
167
168
169
135
170
136
class SymlinkCreate(object):
171
137
"""Creates or deletes a symlink (for use with ReplaceContents)"""
367
333
368
334
369
335
class Diff3Merge(object):
370
def __init__(self, base_file, other_file):
371
self.base_file = base_file
372
self.other_file = other_file
336
def __init__(self, file_id, base, other):
337
self.file_id = file_id
338
self.base = base
339
self.other = other
373
340
374
341
def __eq__(self, other):
375
342
if not isinstance(other, Diff3Merge):
376
343
return False
377
return (self.base_file == other.base_file and
378
self.other_file == other.other_file)
344
return (self.base == other.base and
345
self.other == other.other and self.file_id == other.file_id)
379
346
380
347
def __ne__(self, other):
381
348
return not (self == other)
382
349
383
350
def apply(self, filename, conflict_handler, reverse=False):
384
new_file = filename+".new"
351
new_file = filename+".new"
352
base_file = self.base.readonly_path(self.file_id)
353
other_file = self.other.readonly_path(self.file_id)
385
354
if not reverse:
386
base = self.base_file
387
other = self.other_file
355
base = base_file
356
other = other_file
388
357
else:
389
base = self.other_file
390
other = self.base_file
358
base = other_file
359
other = base_file
391
360
status = patch.diff3(new_file, filename, base, other)
392
361
if status == 0:
393
362
os.chmod(new_file, os.stat(filename).st_mode)
394
os.rename(new_file, filename)
363
rename(new_file, filename)
395
364
return
396
365
else:
397
366
assert(status == 1)
398
conflict_handler.merge_conflict(new_file, filename, base, other)
367
def get_lines(filename):
368
my_file = file(filename, "rb")
369
lines = my_file.readlines()
370
my_file.close()
371
return lines
372
base_lines = get_lines(base)
373
other_lines = get_lines(other)
374
conflict_handler.merge_conflict(new_file, filename, base_lines,
375
other_lines)
399
376
400
377
401
378
def CreateDir():
657
634
return None
658
635
return self.path
659
636
660
def summarize_name(self, changeset, reverse=False):
637
def summarize_name(self, reverse=False):
661
638
"""Produce a one-line summary of the filename. Indicates renames as
662
639
old => new, indicates creation as None => new, indicates deletion as
663
640
old => None.
694
671
:type reverse: bool
695
672
:rtype: str
696
673
"""
697
mutter("Finding new path for %s" % self.summarize_name(changeset))
674
mutter("Finding new path for %s" % self.summarize_name())
698
675
if reverse:
699
676
parent = self.parent
700
677
to_dir = self.dir
862
839
if src_path is not None:
863
840
src_path = os.path.join(dir, src_path)
864
841
try:
865
os.rename(src_path, to_name)
842
rename(src_path, to_name)
866
843
temp_name[entry.id] = to_name
867
844
except OSError, e:
868
845
if e.errno != errno.ENOENT:
894
871
continue
895
872
new_path = os.path.join(dir, new_tree_path)
896
873
old_path = changed_inventory.get(entry.id)
897
if os.path.exists(new_path):
874
if bzrlib.osutils.lexists(new_path):
898
875
if conflict_handler.target_exists(entry, new_path, old_path) == \
899
876
"skip":
900
877
continue
905
882
if old_path is None:
906
883
continue
907
884
try:
908
os.rename(old_path, new_path)
885
rename(old_path, new_path)
909
886
changed_inventory[entry.id] = new_tree_path
910
887
except OSError, e:
911
888
raise Exception ("%s is missing" % new_path)
946
923
Exception.__init__(self, "Conflict applying changes to %s" % this_path)
947
924
self.this_path = this_path
948
925
949
class MergePermissionConflict(Exception):
950
def __init__(self, this_path, base_path, other_path):
951
this_perms = os.stat(this_path).st_mode & 0755
952
base_perms = os.stat(base_path).st_mode & 0755
953
other_perms = os.stat(other_path).st_mode & 0755
954
msg = """Conflicting permission for %s
955
this: %o
956
base: %o
957
other: %o
958
""" % (this_path, this_perms, base_perms, other_perms)
959
self.this_path = this_path
960
self.base_path = base_path
961
self.other_path = other_path
962
Exception.__init__(self, msg)
963
964
926
class WrongOldContents(Exception):
965
927
def __init__(self, filename):
966
928
msg = "Contents mismatch deleting %s" % filename
967
929
self.filename = filename
968
930
Exception.__init__(self, msg)
969
931
970
class WrongOldPermissions(Exception):
971
def __init__(self, filename, old_perms, new_perms):
972
msg = "Permission missmatch on %s:\n" \
973
"Expected 0%o, got 0%o." % (filename, old_perms, new_perms)
932
class WrongOldExecFlag(Exception):
933
def __init__(self, filename, old_exec_flag, new_exec_flag):
934
msg = "Executable flag missmatch on %s:\n" \
935
"Expected %s, got %s." % (filename, old_exec_flag, new_exec_flag)
974
936
self.filename = filename
975
937
Exception.__init__(self, msg)
976
938
994
956
Exception.__init__(self, msg)
995
957
self.filename = filename
996
958
997
class MissingPermsFile(Exception):
959
class MissingForSetExec(Exception):
998
960
def __init__(self, filename):
999
961
msg = "Attempt to change permissions on %s, which does not exist" %\
1000
962
filename
1028
990
1029
991
1030
992
class ExceptionConflictHandler(object):
1031
def __init__(self, dir):
1032
self.dir = dir
1033
993
"""Default handler for merge exceptions.
994
995
This throws an error on any kind of conflict. Conflict handlers can
996
descend from this class if they have a better way to handle some or
997
all types of conflict.
998
"""
1034
999
def missing_parent(self, pathname):
1035
1000
parent = os.path.dirname(pathname)
1036
1001
raise Exception("Parent directory missing for %s" % pathname)
1047
1012
def rename_conflict(self, id, this_name, base_name, other_name):
1048
1013
raise RenameConflict(id, this_name, base_name, other_name)
1049
1014
1050
def move_conflict(self, id, inventory):
1051
this_dir = inventory.this.get_dir(id)
1052
base_dir = inventory.base.get_dir(id)
1053
other_dir = inventory.other.get_dir(id)
1015
def move_conflict(self, id, this_dir, base_dir, other_dir):
1054
1016
raise MoveConflict(id, this_dir, base_dir, other_dir)
1055
1017
1056
def merge_conflict(self, new_file, this_path, base_path, other_path):
1018
def merge_conflict(self, new_file, this_path, base_lines, other_lines):
1057
1019
os.unlink(new_file)
1058
1020
raise MergeConflict(this_path)
1059
1021
1060
def permission_conflict(self, this_path, base_path, other_path):
1061
raise MergePermissionConflict(this_path, base_path, other_path)
1062
1063
1022
def wrong_old_contents(self, filename, expected_contents):
1064
1023
raise WrongOldContents(filename)
1065
1024
1066
1025
def rem_contents_conflict(self, filename, this_contents, base_contents):
1067
1026
raise RemoveContentsConflict(filename)
1068
1027
1069
def wrong_old_perms(self, filename, old_perms, new_perms):
1070
raise WrongOldPermissions(filename, old_perms, new_perms)
1028
def wrong_old_exec_flag(self, filename, old_exec_flag, new_exec_flag):
1029
raise WrongOldExecFlag(filename, old_exec_flag, new_exec_flag)
1071
1030
1072
1031
def rmdir_non_empty(self, filename):
1073
1032
raise DeletingNonEmptyDirectory(filename)
1078
1037
def patch_target_missing(self, filename, contents):
1079
1038
raise PatchTargetMissing(filename)
1080
1039
1081
def missing_for_chmod(self, filename):
1082
raise MissingPermsFile(filename)
1040
def missing_for_exec_flag(self, filename):
1041
raise MissingForExecFlag(filename)
1083
1042
1084
1043
def missing_for_rm(self, filename, change):
1085
1044
raise MissingForRm(filename)
1087
1046
def missing_for_rename(self, filename):
1088
1047
raise MissingForRename(filename)
1089
1048
1090
def missing_for_merge(self, file_id, inventory):
1091
raise MissingForMerge(inventory.other.get_path(file_id))
1049
def missing_for_merge(self, file_id, other_path):
1050
raise MissingForMerge(other_path)
1092
1051
1093
1052
def new_contents_conflict(self, filename, other_contents):
1094
1053
raise NewContentsConflict(filename)
1095
1054
1096
def finalize():
1055
def finalize(self):
1097
1056
pass
1098
1057
1099
1058
def apply_changeset(changeset, inventory, dir, conflict_handler=None,
1112
1071
:rtype: Dictionary
1113
1072
"""
1114
1073
if conflict_handler is None:
1115
conflict_handler = ExceptionConflictHandler(dir)
1074
conflict_handler = ExceptionConflictHandler()
1116
1075
temp_dir = os.path.join(dir, "bzr-tree-change")
1117
1076
try:
1118
1077
os.mkdir(temp_dir)
1295
1254
return new_meta
1296
1255
elif new_meta is None:
1297
1256
return old_meta
1298
elif isinstance(old_meta, ChangeUnixPermissions) and \
1299
isinstance(new_meta, ChangeUnixPermissions):
1300
return ChangeUnixPermissions(old_meta.old_mode, new_meta.new_mode)
1257
elif (isinstance(old_meta, ChangeExecFlag) and
1258
isinstance(new_meta, ChangeExecFlag)):
1259
return ChangeExecFlag(old_meta.old_exec_flag, new_meta.new_exec_flag)
1301
1260
else:
1302
1261
return ApplySequence(old_meta, new_meta)
1303
1262
1315
1274
self.full_path = full_path
1316
1275
self.stat_result = stat_result
1317
1276
1318
def generate_changeset(tree_a, tree_b, inventory_a=None, inventory_b=None):
1319
return ChangesetGenerator(tree_a, tree_b, inventory_a, inventory_b)()
1277
def generate_changeset(tree_a, tree_b, interesting_ids=None):
1278
return ChangesetGenerator(tree_a, tree_b, interesting_ids)()
1320
1279
1321
1280
class ChangesetGenerator(object):
1322
def __init__(self, tree_a, tree_b, inventory_a=None, inventory_b=None):
1281
def __init__(self, tree_a, tree_b, interesting_ids=None):
1323
1282
object.__init__(self)
1324
1283
self.tree_a = tree_a
1325
1284
self.tree_b = tree_b
1326
if inventory_a is not None:
1327
self.inventory_a = inventory_a
1328
else:
1329
self.inventory_a = tree_a.inventory()
1330
if inventory_b is not None:
1331
self.inventory_b = inventory_b
1332
else:
1333
self.inventory_b = tree_b.inventory()
1334
self.r_inventory_a = self.reverse_inventory(self.inventory_a)
1335
self.r_inventory_b = self.reverse_inventory(self.inventory_b)
1285
self._interesting_ids = interesting_ids
1336
1286
1337
def reverse_inventory(self, inventory):
1338
r_inventory = {}
1339
for entry in inventory.itervalues():
1340
if entry.id is None:
1341
continue
1342
r_inventory[entry.id] = entry
1343
return r_inventory
1287
def iter_both_tree_ids(self):
1288
for file_id in self.tree_a:
1289
yield file_id
1290
for file_id in self.tree_b:
1291
if file_id not in self.tree_a:
1292
yield file_id
1344
1293
1345
1294
def __call__(self):
1346
1295
cset = Changeset()
1347
for entry in self.inventory_a.itervalues():
1348
if entry.id is None:
1349
continue
1350
cs_entry = self.make_entry(entry.id)
1296
for file_id in self.iter_both_tree_ids():
1297
cs_entry = self.make_entry(file_id)
1351
1298
if cs_entry is not None and not cs_entry.is_boring():
1352
1299
cset.add_entry(cs_entry)
1353
1300
1354
for entry in self.inventory_b.itervalues():
1355
if entry.id is None:
1356
continue
1357
if not self.r_inventory_a.has_key(entry.id):
1358
cs_entry = self.make_entry(entry.id)
1359
if cs_entry is not None and not cs_entry.is_boring():
1360
cset.add_entry(cs_entry)
1361
1301
for entry in list(cset.entries.itervalues()):
1362
1302
if entry.parent != entry.new_parent:
1363
1303
if not cset.entries.has_key(entry.parent) and\
1371
1311
cset.add_entry(parent_entry)
1372
1312
return cset
1373
1313
1374
def get_entry_parent(self, entry, inventory):
1375
if entry is None:
1376
return None
1377
if entry.path == "./.":
1378
return NULL_ID
1379
dirname = os.path.dirname(entry.path)
1380
if dirname == ".":
1381
dirname = "./."
1382
parent = inventory[dirname]
1383
return parent.id
1384
1385
def get_paths(self, entry, tree):
1386
if entry is None:
1387
return (None, None)
1388
full_path = tree.readonly_path(entry.id)
1389
if entry.path == ".":
1390
return ("", full_path)
1391
return (entry.path, full_path)
1392
1393
def make_basic_entry(self, id, only_interesting):
1394
entry_a = self.r_inventory_a.get(id)
1395
entry_b = self.r_inventory_b.get(id)
1314
def iter_inventory(self, tree):
1315
for file_id in tree:
1316
yield self.get_entry(file_id, tree)
1317
1318
def get_entry(self, file_id, tree):
1319
if not tree.has_or_had_id(file_id):
1320
return None
1321
return tree.tree.inventory[file_id]
1322
1323
def get_entry_parent(self, entry):
1324
if entry is None:
1325
return None
1326
return entry.parent_id
1327
1328
def get_path(self, file_id, tree):
1329
if not tree.has_or_had_id(file_id):
1330
return None
1331
path = tree.id2path(file_id)
1332
if path == '':
1333
return './.'
1334
else:
1335
return path
1336
1337
def make_basic_entry(self, file_id, only_interesting):
1338
entry_a = self.get_entry(file_id, self.tree_a)
1339
entry_b = self.get_entry(file_id, self.tree_b)
1396
1340
if only_interesting and not self.is_interesting(entry_a, entry_b):
1397
return (None, None, None)
1398
parent = self.get_entry_parent(entry_a, self.inventory_a)
1399
(path, full_path_a) = self.get_paths(entry_a, self.tree_a)
1400
cs_entry = ChangesetEntry(id, parent, path)
1401
new_parent = self.get_entry_parent(entry_b, self.inventory_b)
1402
1403
1404
(new_path, full_path_b) = self.get_paths(entry_b, self.tree_b)
1341
return None
1342
parent = self.get_entry_parent(entry_a)
1343
path = self.get_path(file_id, self.tree_a)
1344
cs_entry = ChangesetEntry(file_id, parent, path)
1345
new_parent = self.get_entry_parent(entry_b)
1346
1347
new_path = self.get_path(file_id, self.tree_b)
1405
1348
1406
1349
cs_entry.new_path = new_path
1407
1350
cs_entry.new_parent = new_parent
1408
return (cs_entry, full_path_a, full_path_b)
1351
return cs_entry
1409
1352
1410
1353
def is_interesting(self, entry_a, entry_b):
1354
if self._interesting_ids is None:
1355
return True
1411
1356
if entry_a is not None:
1412
if entry_a.interesting:
1413
return True
1414
if entry_b is not None:
1415
if entry_b.interesting:
1416
return True
1417
return False
1357
file_id = entry_a.file_id
1358
elif entry_b is not None:
1359
file_id = entry_b.file_id
1360
else:
1361
return False
1362
return file_id in self._interesting_ids
1418
1363
1419
1364
def make_boring_entry(self, id):
1420
(cs_entry, full_path_a, full_path_b) = \
1421
self.make_basic_entry(id, only_interesting=False)
1365
cs_entry = self.make_basic_entry(id, only_interesting=False)
1422
1366
if cs_entry.is_creation_or_deletion():
1423
1367
return self.make_entry(id, only_interesting=False)
1424
1368
else:
1426
1370
1427
1371
1428
1372
def make_entry(self, id, only_interesting=True):
1429
(cs_entry, full_path_a, full_path_b) = \
1430
self.make_basic_entry(id, only_interesting)
1373
cs_entry = self.make_basic_entry(id, only_interesting)
1431
1374
1432
1375
if cs_entry is None:
1433
1376
return None
1434
1377
1378
full_path_a = self.tree_a.readonly_path(id)
1379
full_path_b = self.tree_b.readonly_path(id)
1435
1380
stat_a = self.lstat(full_path_a)
1436
1381
stat_b = self.lstat(full_path_b)
1437
if stat_b is None:
1438
cs_entry.new_parent = None
1439
cs_entry.new_path = None
1440
1441
cs_entry.metadata_change = self.make_mode_change(stat_a, stat_b)
1382
1383
cs_entry.metadata_change = self.make_exec_flag_change(stat_a, stat_b)
1384
1385
if id in self.tree_a and id in self.tree_b:
1386
a_sha1 = self.tree_a.get_file_sha1(id)
1387
b_sha1 = self.tree_b.get_file_sha1(id)
1388
if None not in (a_sha1, b_sha1) and a_sha1 == b_sha1:
1389
return cs_entry
1390
1442
1391
cs_entry.contents_change = self.make_contents_change(full_path_a,
1443
1392
stat_a,
1444
1393
full_path_b,
1445
1394
stat_b)
1446
1395
return cs_entry
1447
1396
1448
def make_mode_change(self, stat_a, stat_b):
1449
mode_a = None
1397
def make_exec_flag_change(self, stat_a, stat_b):
1398
exec_flag_a = exec_flag_b = None
1450
1399
if stat_a is not None and not stat.S_ISLNK(stat_a.st_mode):
1451
mode_a = stat_a.st_mode & 0777
1452
mode_b = None
1400
exec_flag_a = bool(stat_a.st_mode & 0111)
1453
1401
if stat_b is not None and not stat.S_ISLNK(stat_b.st_mode):
1454
mode_b = stat_b.st_mode & 0777
1455
if mode_a == mode_b:
1402
exec_flag_b = bool(stat_b.st_mode & 0111)
1403
if exec_flag_a == exec_flag_b:
1456
1404
return None
1457
return ChangeUnixPermissions(mode_a, mode_b)
1405
return ChangeExecFlag(exec_flag_a, exec_flag_b)
1458
1406
1459
1407
def make_contents_change(self, full_path_a, stat_a, full_path_b, stat_b):
1460
1408
if stat_a is None and stat_b is None:
1467
1415
if stat_a.st_ino == stat_b.st_ino and \
1468
1416
stat_a.st_dev == stat_b.st_dev:
1469
1417
return None
1470
if file(full_path_a, "rb").read() == \
1471
file(full_path_b, "rb").read():
1472
return None
1473
1474
patch_contents = patch.diff(full_path_a,
1475
file(full_path_b, "rb").read())
1476
if patch_contents is None:
1477
return None
1478
return PatchApply(patch_contents)
1479
1418
1480
1419
a_contents = self.get_contents(stat_a, full_path_a)
1481
1420
b_contents = self.get_contents(stat_b, full_path_b)
Loggerhead is a web-based interface for Breezy
Version: 2.0.1