44
34
newdict[value] = key
48
class ChangeExecFlag(object):
38
class PatchApply(object):
39
"""Patch application as a kind of content change"""
40
def __init__(self, contents):
43
:param contents: The text of the patch to apply
44
:type contents: str"""
45
self.contents = contents
47
def __eq__(self, other):
48
if not isinstance(other, PatchApply):
50
elif self.contents != other.contents:
55
def __ne__(self, other):
56
return not (self == other)
58
def apply(self, filename, conflict_handler, reverse=False):
59
"""Applies the patch to the specified file.
61
:param filename: the file to apply the patch to
63
:param reverse: If true, apply the patch in reverse
66
input_name = filename+".orig"
68
os.rename(filename, input_name)
70
if e.errno != errno.ENOENT:
72
if conflict_handler.patch_target_missing(filename, self.contents)\
75
os.rename(filename, input_name)
78
status = patch.patch(self.contents, input_name, filename,
80
os.chmod(filename, os.stat(input_name).st_mode)
84
conflict_handler.failed_hunks(filename)
87
class ChangeUnixPermissions(object):
49
88
"""This is two-way change, suitable for file modification, creation,
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
90
def __init__(self, old_mode, new_mode):
91
self.old_mode = old_mode
92
self.new_mode = new_mode
55
94
def apply(self, filename, conflict_handler, reverse=False):
57
from_exec_flag = self.old_exec_flag
58
to_exec_flag = self.new_exec_flag
96
from_mode = self.old_mode
97
to_mode = self.new_mode
60
from_exec_flag = self.new_exec_flag
61
to_exec_flag = self.old_exec_flag
99
from_mode = self.new_mode
100
to_mode = self.old_mode
63
current_exec_flag = bool(os.stat(filename).st_mode & 0111)
102
current_mode = os.stat(filename).st_mode &0777
64
103
except OSError, e:
65
104
if e.errno == errno.ENOENT:
66
if conflict_handler.missing_for_exec_flag(filename) == "skip":
105
if conflict_handler.missing_for_chmod(filename) == "skip":
69
current_exec_flag = from_exec_flag
108
current_mode = from_mode
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":
110
if from_mode is not None and current_mode != from_mode:
111
if conflict_handler.wrong_old_perms(filename, from_mode,
112
current_mode) != "continue":
76
if to_exec_flag is not None:
77
current_mode = os.stat(filename).st_mode
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
88
to_mode = current_mode & ~0111
115
if to_mode is not None:
90
117
os.chmod(filename, to_mode)
91
118
except IOError, e:
92
119
if e.errno == errno.ENOENT:
93
conflict_handler.missing_for_exec_flag(filename)
120
conflict_handler.missing_for_chmod(filename)
95
122
def __eq__(self, other):
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)
123
if not isinstance(other, ChangeUnixPermissions):
125
elif self.old_mode != other.old_mode:
127
elif self.new_mode != other.new_mode:
100
132
def __ne__(self, other):
101
133
return not (self == other)
104
135
def dir_create(filename, conflict_handler, reverse):
105
136
"""Creates the directory, or deletes it if reverse is true. Intended to be
106
137
used with ReplaceContents.
335
368
class Diff3Merge(object):
336
def __init__(self, file_id, base, other):
337
self.file_id = file_id
369
def __init__(self, base_file, other_file):
370
self.base_file = base_file
371
self.other_file = other_file
341
373
def __eq__(self, other):
342
374
if not isinstance(other, Diff3Merge):
344
return (self.base == other.base and
345
self.other == other.other and self.file_id == other.file_id)
376
return (self.base_file == other.base_file and
377
self.other_file == other.other_file)
347
379
def __ne__(self, other):
348
380
return not (self == other)
350
382
def apply(self, filename, conflict_handler, reverse=False):
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)
383
new_file = filename+".new"
385
base = self.base_file
386
other = self.other_file
388
base = self.other_file
389
other = self.base_file
360
390
status = patch.diff3(new_file, filename, base, other)
362
392
os.chmod(new_file, os.stat(filename).st_mode)
363
rename(new_file, filename)
393
os.rename(new_file, filename)
366
396
assert(status == 1)
367
def get_lines(filename):
368
my_file = file(filename, "rb")
369
lines = my_file.readlines()
372
base_lines = get_lines(base)
373
other_lines = get_lines(other)
374
conflict_handler.merge_conflict(new_file, filename, base_lines,
397
conflict_handler.merge_conflict(new_file, filename, base, other)
923
943
Exception.__init__(self, "Conflict applying changes to %s" % this_path)
924
944
self.this_path = this_path
946
class MergePermissionConflict(Exception):
947
def __init__(self, this_path, base_path, other_path):
948
this_perms = os.stat(this_path).st_mode & 0755
949
base_perms = os.stat(base_path).st_mode & 0755
950
other_perms = os.stat(other_path).st_mode & 0755
951
msg = """Conflicting permission for %s
955
""" % (this_path, this_perms, base_perms, other_perms)
956
self.this_path = this_path
957
self.base_path = base_path
958
self.other_path = other_path
959
Exception.__init__(self, msg)
926
961
class WrongOldContents(Exception):
927
962
def __init__(self, filename):
928
963
msg = "Contents mismatch deleting %s" % filename
929
964
self.filename = filename
930
965
Exception.__init__(self, msg)
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)
967
class WrongOldPermissions(Exception):
968
def __init__(self, filename, old_perms, new_perms):
969
msg = "Permission missmatch on %s:\n" \
970
"Expected 0%o, got 0%o." % (filename, old_perms, new_perms)
936
971
self.filename = filename
937
972
Exception.__init__(self, msg)
1012
1044
def rename_conflict(self, id, this_name, base_name, other_name):
1013
1045
raise RenameConflict(id, this_name, base_name, other_name)
1015
def move_conflict(self, id, this_dir, base_dir, other_dir):
1047
def move_conflict(self, id, inventory):
1048
this_dir = inventory.this.get_dir(id)
1049
base_dir = inventory.base.get_dir(id)
1050
other_dir = inventory.other.get_dir(id)
1016
1051
raise MoveConflict(id, this_dir, base_dir, other_dir)
1018
def merge_conflict(self, new_file, this_path, base_lines, other_lines):
1053
def merge_conflict(self, new_file, this_path, base_path, other_path):
1019
1054
os.unlink(new_file)
1020
1055
raise MergeConflict(this_path)
1057
def permission_conflict(self, this_path, base_path, other_path):
1058
raise MergePermissionConflict(this_path, base_path, other_path)
1022
1060
def wrong_old_contents(self, filename, expected_contents):
1023
1061
raise WrongOldContents(filename)
1025
1063
def rem_contents_conflict(self, filename, this_contents, base_contents):
1026
1064
raise RemoveContentsConflict(filename)
1028
def wrong_old_exec_flag(self, filename, old_exec_flag, new_exec_flag):
1029
raise WrongOldExecFlag(filename, old_exec_flag, new_exec_flag)
1066
def wrong_old_perms(self, filename, old_perms, new_perms):
1067
raise WrongOldPermissions(filename, old_perms, new_perms)
1031
1069
def rmdir_non_empty(self, filename):
1032
1070
raise DeletingNonEmptyDirectory(filename)
1046
1084
def missing_for_rename(self, filename):
1047
1085
raise MissingForRename(filename)
1049
def missing_for_merge(self, file_id, other_path):
1050
raise MissingForMerge(other_path)
1087
def missing_for_merge(self, file_id, inventory):
1088
raise MissingForMerge(inventory.other.get_path(file_id))
1052
1090
def new_contents_conflict(self, filename, other_contents):
1053
1091
raise NewContentsConflict(filename)
1058
1096
def apply_changeset(changeset, inventory, dir, conflict_handler=None,
1274
1312
self.full_path = full_path
1275
1313
self.stat_result = stat_result
1277
def generate_changeset(tree_a, tree_b, interesting_ids=None):
1278
return ChangesetGenerator(tree_a, tree_b, interesting_ids)()
1315
def generate_changeset(tree_a, tree_b, inventory_a=None, inventory_b=None):
1316
return ChangesetGenerator(tree_a, tree_b, inventory_a, inventory_b)()
1281
1318
class ChangesetGenerator(object):
1282
def __init__(self, tree_a, tree_b, interesting_ids=None):
1319
def __init__(self, tree_a, tree_b, inventory_a=None, inventory_b=None):
1283
1320
object.__init__(self)
1284
1321
self.tree_a = tree_a
1285
1322
self.tree_b = tree_b
1286
self._interesting_ids = interesting_ids
1323
if inventory_a is not None:
1324
self.inventory_a = inventory_a
1326
self.inventory_a = tree_a.inventory()
1327
if inventory_b is not None:
1328
self.inventory_b = inventory_b
1330
self.inventory_b = tree_b.inventory()
1331
self.r_inventory_a = self.reverse_inventory(self.inventory_a)
1332
self.r_inventory_b = self.reverse_inventory(self.inventory_b)
1288
def iter_both_tree_ids(self):
1289
for file_id in self.tree_a:
1291
for file_id in self.tree_b:
1292
if file_id not in self.tree_a:
1334
def reverse_inventory(self, inventory):
1336
for entry in inventory.itervalues():
1337
if entry.id is None:
1339
r_inventory[entry.id] = entry
1295
1342
def __call__(self):
1296
1343
cset = Changeset()
1297
for file_id in self.iter_both_tree_ids():
1298
cs_entry = self.make_entry(file_id)
1344
for entry in self.inventory_a.itervalues():
1345
if entry.id is None:
1347
cs_entry = self.make_entry(entry.id)
1299
1348
if cs_entry is not None and not cs_entry.is_boring():
1300
1349
cset.add_entry(cs_entry)
1351
for entry in self.inventory_b.itervalues():
1352
if entry.id is None:
1354
if not self.r_inventory_a.has_key(entry.id):
1355
cs_entry = self.make_entry(entry.id)
1356
if cs_entry is not None and not cs_entry.is_boring():
1357
cset.add_entry(cs_entry)
1302
1358
for entry in list(cset.entries.itervalues()):
1303
1359
if entry.parent != entry.new_parent:
1304
1360
if not cset.entries.has_key(entry.parent) and\
1312
1368
cset.add_entry(parent_entry)
1315
def iter_inventory(self, tree):
1316
for file_id in tree:
1317
yield self.get_entry(file_id, tree)
1319
def get_entry(self, file_id, tree):
1320
if not tree.has_or_had_id(file_id):
1322
return tree.tree.inventory[file_id]
1324
def get_entry_parent(self, entry):
1327
return entry.parent_id
1329
def get_path(self, file_id, tree):
1330
if not tree.has_or_had_id(file_id):
1332
path = tree.id2path(file_id)
1338
def make_basic_entry(self, file_id, only_interesting):
1339
entry_a = self.get_entry(file_id, self.tree_a)
1340
entry_b = self.get_entry(file_id, self.tree_b)
1371
def get_entry_parent(self, entry, inventory):
1374
if entry.path == "./.":
1376
dirname = os.path.dirname(entry.path)
1379
parent = inventory[dirname]
1382
def get_paths(self, entry, tree):
1385
full_path = tree.readonly_path(entry.id)
1386
if entry.path == ".":
1387
return ("", full_path)
1388
return (entry.path, full_path)
1390
def make_basic_entry(self, id, only_interesting):
1391
entry_a = self.r_inventory_a.get(id)
1392
entry_b = self.r_inventory_b.get(id)
1341
1393
if only_interesting and not self.is_interesting(entry_a, entry_b):
1343
parent = self.get_entry_parent(entry_a)
1344
path = self.get_path(file_id, self.tree_a)
1345
cs_entry = ChangesetEntry(file_id, parent, path)
1346
new_parent = self.get_entry_parent(entry_b)
1348
new_path = self.get_path(file_id, self.tree_b)
1394
return (None, None, None)
1395
parent = self.get_entry_parent(entry_a, self.inventory_a)
1396
(path, full_path_a) = self.get_paths(entry_a, self.tree_a)
1397
cs_entry = ChangesetEntry(id, parent, path)
1398
new_parent = self.get_entry_parent(entry_b, self.inventory_b)
1401
(new_path, full_path_b) = self.get_paths(entry_b, self.tree_b)
1350
1403
cs_entry.new_path = new_path
1351
1404
cs_entry.new_parent = new_parent
1405
return (cs_entry, full_path_a, full_path_b)
1354
1407
def is_interesting(self, entry_a, entry_b):
1355
if self._interesting_ids is None:
1357
1408
if entry_a is not None:
1358
file_id = entry_a.file_id
1359
elif entry_b is not None:
1360
file_id = entry_b.file_id
1363
return file_id in self._interesting_ids
1409
if entry_a.interesting:
1411
if entry_b is not None:
1412
if entry_b.interesting:
1365
1416
def make_boring_entry(self, id):
1366
cs_entry = self.make_basic_entry(id, only_interesting=False)
1417
(cs_entry, full_path_a, full_path_b) = \
1418
self.make_basic_entry(id, only_interesting=False)
1367
1419
if cs_entry.is_creation_or_deletion():
1368
1420
return self.make_entry(id, only_interesting=False)
1373
1425
def make_entry(self, id, only_interesting=True):
1374
cs_entry = self.make_basic_entry(id, only_interesting)
1426
(cs_entry, full_path_a, full_path_b) = \
1427
self.make_basic_entry(id, only_interesting)
1376
1429
if cs_entry is None:
1379
full_path_a = self.tree_a.readonly_path(id)
1380
full_path_b = self.tree_b.readonly_path(id)
1381
1432
stat_a = self.lstat(full_path_a)
1382
1433
stat_b = self.lstat(full_path_b)
1384
cs_entry.metadata_change = self.make_exec_flag_change(stat_a, stat_b)
1386
if id in self.tree_a and id in self.tree_b:
1387
a_sha1 = self.tree_a.get_file_sha1(id)
1388
b_sha1 = self.tree_b.get_file_sha1(id)
1389
if None not in (a_sha1, b_sha1) and a_sha1 == b_sha1:
1435
cs_entry.new_parent = None
1436
cs_entry.new_path = None
1438
cs_entry.metadata_change = self.make_mode_change(stat_a, stat_b)
1392
1439
cs_entry.contents_change = self.make_contents_change(full_path_a,
1396
1443
return cs_entry
1398
def make_exec_flag_change(self, stat_a, stat_b):
1399
exec_flag_a = exec_flag_b = None
1445
def make_mode_change(self, stat_a, stat_b):
1400
1447
if stat_a is not None and not stat.S_ISLNK(stat_a.st_mode):
1401
exec_flag_a = bool(stat_a.st_mode & 0111)
1448
mode_a = stat_a.st_mode & 0777
1402
1450
if stat_b is not None and not stat.S_ISLNK(stat_b.st_mode):
1403
exec_flag_b = bool(stat_b.st_mode & 0111)
1404
if exec_flag_a == exec_flag_b:
1451
mode_b = stat_b.st_mode & 0777
1452
if mode_a == mode_b:
1406
return ChangeExecFlag(exec_flag_a, exec_flag_b)
1454
return ChangeUnixPermissions(mode_a, mode_b)
1408
1456
def make_contents_change(self, full_path_a, stat_a, full_path_b, stat_b):
1409
1457
if stat_a is None and stat_b is None:
1416
1464
if stat_a.st_ino == stat_b.st_ino and \
1417
1465
stat_a.st_dev == stat_b.st_dev:
1467
if file(full_path_a, "rb").read() == \
1468
file(full_path_b, "rb").read():
1471
patch_contents = patch.diff(full_path_a,
1472
file(full_path_b, "rb").read())
1473
if patch_contents is None:
1475
return PatchApply(patch_contents)
1420
1477
a_contents = self.get_contents(stat_a, full_path_a)
1421
1478
b_contents = self.get_contents(stat_b, full_path_b)