20
20
from bzrlib.trace import mutter
22
Represent and apply a changeset
22
# XXX: mbp: I'm not totally convinced that we should handle conflicts
23
# as part of changeset application, rather than only in the merge
26
"""Represent and apply a changeset
28
Conflicts in applying a changeset are represented as exceptions.
24
31
__docformat__ = "restructuredtext"
321
328
class Diff3Merge(object):
322
def __init__(self, base_file, other_file):
323
self.base_file = base_file
324
self.other_file = other_file
329
def __init__(self, file_id, base, other):
330
self.file_id = file_id
326
334
def __eq__(self, other):
327
335
if not isinstance(other, Diff3Merge):
329
return (self.base_file == other.base_file and
330
self.other_file == other.other_file)
337
return (self.base == other.base and
338
self.other == other.other and self.file_id == other.file_id)
332
340
def __ne__(self, other):
333
341
return not (self == other)
335
343
def apply(self, filename, conflict_handler, reverse=False):
336
new_file = filename+".new"
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)
338
base = self.base_file
339
other = self.other_file
341
base = self.other_file
342
other = self.base_file
343
353
status = patch.diff3(new_file, filename, base, other)
345
355
os.chmod(new_file, os.stat(filename).st_mode)
349
359
assert(status == 1)
350
conflict_handler.merge_conflict(new_file, filename, base, other)
360
def get_lines(filename):
361
my_file = file(base, "rb")
362
lines = my_file.readlines()
364
base_lines = get_lines(base)
365
other_lines = get_lines(other)
366
conflict_handler.merge_conflict(new_file, filename, base_lines,
999
1022
def rename_conflict(self, id, this_name, base_name, other_name):
1000
1023
raise RenameConflict(id, this_name, base_name, other_name)
1002
def move_conflict(self, id, inventory):
1003
this_dir = inventory.this.get_dir(id)
1004
base_dir = inventory.base.get_dir(id)
1005
other_dir = inventory.other.get_dir(id)
1025
def move_conflict(self, id, this_dir, base_dir, other_dir):
1006
1026
raise MoveConflict(id, this_dir, base_dir, other_dir)
1008
def merge_conflict(self, new_file, this_path, base_path, other_path):
1028
def merge_conflict(self, new_file, this_path, base_lines, other_lines):
1009
1029
os.unlink(new_file)
1010
1030
raise MergeConflict(this_path)
1039
1059
def missing_for_rename(self, filename):
1040
1060
raise MissingForRename(filename)
1042
def missing_for_merge(self, file_id, inventory):
1043
raise MissingForMerge(inventory.other.get_path(file_id))
1062
def missing_for_merge(self, file_id, other_path):
1063
raise MissingForMerge(other_path)
1045
1065
def new_contents_conflict(self, filename, other_contents):
1046
1066
raise NewContentsConflict(filename)
1051
1071
def apply_changeset(changeset, inventory, dir, conflict_handler=None,
1267
1287
self.full_path = full_path
1268
1288
self.stat_result = stat_result
1270
def generate_changeset(tree_a, tree_b, inventory_a=None, inventory_b=None):
1271
return ChangesetGenerator(tree_a, tree_b, inventory_a, inventory_b)()
1290
def generate_changeset(tree_a, tree_b, interesting_ids=None):
1291
return ChangesetGenerator(tree_a, tree_b, interesting_ids)()
1273
1293
class ChangesetGenerator(object):
1274
def __init__(self, tree_a, tree_b, inventory_a=None, inventory_b=None):
1294
def __init__(self, tree_a, tree_b, interesting_ids=None):
1275
1295
object.__init__(self)
1276
1296
self.tree_a = tree_a
1277
1297
self.tree_b = tree_b
1278
if inventory_a is not None:
1279
self.inventory_a = inventory_a
1281
self.inventory_a = tree_a.inventory()
1282
if inventory_b is not None:
1283
self.inventory_b = inventory_b
1285
self.inventory_b = tree_b.inventory()
1286
self.r_inventory_a = self.reverse_inventory(self.inventory_a)
1287
self.r_inventory_b = self.reverse_inventory(self.inventory_b)
1298
self._interesting_ids = interesting_ids
1289
def reverse_inventory(self, inventory):
1291
for entry in inventory.itervalues():
1292
if entry.id is None:
1294
r_inventory[entry.id] = entry
1300
def iter_both_tree_ids(self):
1301
for file_id in self.tree_a:
1303
for file_id in self.tree_b:
1304
if file_id not in self.tree_a:
1297
1307
def __call__(self):
1298
1308
cset = Changeset()
1299
for entry in self.inventory_a.itervalues():
1300
if entry.id is None:
1302
cs_entry = self.make_entry(entry.id)
1309
for file_id in self.iter_both_tree_ids():
1310
cs_entry = self.make_entry(file_id)
1303
1311
if cs_entry is not None and not cs_entry.is_boring():
1304
1312
cset.add_entry(cs_entry)
1306
for entry in self.inventory_b.itervalues():
1307
if entry.id is None:
1309
if not self.r_inventory_a.has_key(entry.id):
1310
cs_entry = self.make_entry(entry.id)
1311
if cs_entry is not None and not cs_entry.is_boring():
1312
cset.add_entry(cs_entry)
1313
1314
for entry in list(cset.entries.itervalues()):
1314
1315
if entry.parent != entry.new_parent:
1315
1316
if not cset.entries.has_key(entry.parent) and\
1323
1324
cset.add_entry(parent_entry)
1326
def get_entry_parent(self, entry, inventory):
1329
if entry.path == "./.":
1331
dirname = os.path.dirname(entry.path)
1334
parent = inventory[dirname]
1337
def get_path(self, entry, tree):
1340
if entry.path == ".":
1344
def make_basic_entry(self, id, only_interesting):
1345
entry_a = self.r_inventory_a.get(id)
1346
entry_b = self.r_inventory_b.get(id)
1327
def iter_inventory(self, tree):
1328
for file_id in tree:
1329
yield self.get_entry(file_id, tree)
1331
def get_entry(self, file_id, tree):
1332
if not tree.has_or_had_id(file_id):
1334
return tree.tree.inventory[file_id]
1336
def get_entry_parent(self, entry):
1339
return entry.parent_id
1341
def get_path(self, file_id, tree):
1342
if not tree.has_or_had_id(file_id):
1344
path = tree.id2path(file_id)
1350
def make_basic_entry(self, file_id, only_interesting):
1351
entry_a = self.get_entry(file_id, self.tree_a)
1352
entry_b = self.get_entry(file_id, self.tree_b)
1347
1353
if only_interesting and not self.is_interesting(entry_a, entry_b):
1349
parent = self.get_entry_parent(entry_a, self.inventory_a)
1350
path = self.get_path(entry_a, self.tree_a)
1351
cs_entry = ChangesetEntry(id, parent, path)
1352
new_parent = self.get_entry_parent(entry_b, self.inventory_b)
1355
new_path = self.get_path(entry_b, self.tree_b)
1355
parent = self.get_entry_parent(entry_a)
1356
path = self.get_path(file_id, self.tree_a)
1357
cs_entry = ChangesetEntry(file_id, parent, path)
1358
new_parent = self.get_entry_parent(entry_b)
1360
new_path = self.get_path(file_id, self.tree_b)
1357
1362
cs_entry.new_path = new_path
1358
1363
cs_entry.new_parent = new_parent
1359
1364
return cs_entry
1361
1366
def is_interesting(self, entry_a, entry_b):
1367
if self._interesting_ids is None:
1362
1369
if entry_a is not None:
1363
if entry_a.interesting:
1365
if entry_b is not None:
1366
if entry_b.interesting:
1370
file_id = entry_a.file_id
1371
elif entry_b is not None:
1372
file_id = entry_b.file_id
1375
return file_id in self._interesting_ids
1370
1377
def make_boring_entry(self, id):
1371
1378
cs_entry = self.make_basic_entry(id, only_interesting=False)
added
removed
bzrlib/changeset.py
