« back to all changes in this revision
Viewing changes to bzrlib/changeset.py
- browse files at revision 974.1.12
- compare with another revision
- download diff
- download tarball
- view history from revision 974.1.12
- Committer: aaron.bentley at utoronto
- Date: 2005-08-05 02:53:57 UTC
- mto: (1092.1.41) (1185.3.4) (974.1.47)
- mto: This revision was merged to the branch mainline in revision 1110.
- Revision ID: aaron.bentley@utoronto.ca-20050805025357-9d90b2e4c066eb4b
Switched from text-id to hashcache for merge optimization
- files added:
- plugins/changeset
- files removed:
- HACKING
- bzrlib/util
- contrib/emacs
- files renamed:
- bzrlib/util/effbot/ => effbot/
- bzrlib/util/elementtree/ => elementtree/
- bzrlib/plugins/ => plugins/
- bzrlib/util/urlgrabber/ => urlgrabber/
- files modified:
- .bzrignore
added
removed
bzrlib/changeset.py
18
18
import patch
19
19
import stat
20
20
from bzrlib.trace import mutter
21
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
24
# operation.
25
26
"""Represent and apply a changeset
27
28
Conflicts in applying a changeset are represented as exceptions.
29
"""
30
21
"""
22
Represent and apply a changeset
23
"""
31
24
__docformat__ = "restructuredtext"
32
25
33
26
NULL_ID = "!NULL"
43
36
return newdict
44
37
45
38
46
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
47
88
class ChangeUnixPermissions(object):
48
89
"""This is two-way change, suitable for file modification, creation,
49
90
deletion"""
326
367
327
368
328
369
class Diff3Merge(object):
329
def __init__(self, file_id, base, other):
330
self.file_id = file_id
331
self.base = base
332
self.other = other
370
def __init__(self, base_file, other_file):
371
self.base_file = base_file
372
self.other_file = other_file
333
373
334
374
def __eq__(self, other):
335
375
if not isinstance(other, Diff3Merge):
336
376
return False
337
return (self.base == other.base and
338
self.other == other.other and self.file_id == other.file_id)
377
return (self.base_file == other.base_file and
378
self.other_file == other.other_file)
339
379
340
380
def __ne__(self, other):
341
381
return not (self == other)
342
382
343
383
def apply(self, filename, conflict_handler, reverse=False):
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)
384
new_file = filename+".new"
347
385
if not reverse:
348
base = base_file
349
other = other_file
386
base = self.base_file
387
other = self.other_file
350
388
else:
351
base = other_file
352
other = base_file
389
base = self.other_file
390
other = self.base_file
353
391
status = patch.diff3(new_file, filename, base, other)
354
392
if status == 0:
355
393
os.chmod(new_file, os.stat(filename).st_mode)
357
395
return
358
396
else:
359
397
assert(status == 1)
360
def get_lines(filename):
361
my_file = file(base, "rb")
362
lines = my_file.readlines()
363
my_file.close()
364
base_lines = get_lines(base)
365
other_lines = get_lines(other)
366
conflict_handler.merge_conflict(new_file, filename, base_lines,
367
other_lines)
398
conflict_handler.merge_conflict(new_file, filename, base, other)
368
399
369
400
370
401
def CreateDir():
997
1028
998
1029
999
1030
class ExceptionConflictHandler(object):
1000
"""Default handler for merge exceptions.
1001
1002
This throws an error on any kind of conflict. Conflict handlers can
1003
descend from this class if they have a better way to handle some or
1004
all types of conflict.
1005
"""
1006
1031
def __init__(self, dir):
1007
1032
self.dir = dir
1008
1033
1022
1047
def rename_conflict(self, id, this_name, base_name, other_name):
1023
1048
raise RenameConflict(id, this_name, base_name, other_name)
1024
1049
1025
def move_conflict(self, id, this_dir, base_dir, other_dir):
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)
1026
1054
raise MoveConflict(id, this_dir, base_dir, other_dir)
1027
1055
1028
def merge_conflict(self, new_file, this_path, base_lines, other_lines):
1056
def merge_conflict(self, new_file, this_path, base_path, other_path):
1029
1057
os.unlink(new_file)
1030
1058
raise MergeConflict(this_path)
1031
1059
1059
1087
def missing_for_rename(self, filename):
1060
1088
raise MissingForRename(filename)
1061
1089
1062
def missing_for_merge(self, file_id, other_path):
1063
raise MissingForMerge(other_path)
1090
def missing_for_merge(self, file_id, inventory):
1091
raise MissingForMerge(inventory.other.get_path(file_id))
1064
1092
1065
1093
def new_contents_conflict(self, filename, other_contents):
1066
1094
raise NewContentsConflict(filename)
1287
1315
self.full_path = full_path
1288
1316
self.stat_result = stat_result
1289
1317
1290
def generate_changeset(tree_a, tree_b, interesting_ids=None):
1291
return ChangesetGenerator(tree_a, tree_b, interesting_ids)()
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)()
1292
1320
1293
1321
class ChangesetGenerator(object):
1294
def __init__(self, tree_a, tree_b, interesting_ids=None):
1322
def __init__(self, tree_a, tree_b, inventory_a=None, inventory_b=None):
1295
1323
object.__init__(self)
1296
1324
self.tree_a = tree_a
1297
1325
self.tree_b = tree_b
1298
self._interesting_ids = interesting_ids
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)
1299
1336
1300
def iter_both_tree_ids(self):
1301
for file_id in self.tree_a:
1302
yield file_id
1303
for file_id in self.tree_b:
1304
if file_id not in self.tree_a:
1305
yield file_id
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
1306
1344
1307
1345
def __call__(self):
1308
1346
cset = Changeset()
1309
for file_id in self.iter_both_tree_ids():
1310
cs_entry = self.make_entry(file_id)
1347
for entry in self.inventory_a.itervalues():
1348
if entry.id is None:
1349
continue
1350
cs_entry = self.make_entry(entry.id)
1311
1351
if cs_entry is not None and not cs_entry.is_boring():
1312
1352
cset.add_entry(cs_entry)
1313
1353
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)
1314
1361
for entry in list(cset.entries.itervalues()):
1315
1362
if entry.parent != entry.new_parent:
1316
1363
if not cset.entries.has_key(entry.parent) and\
1324
1371
cset.add_entry(parent_entry)
1325
1372
return cset
1326
1373
1327
def iter_inventory(self, tree):
1328
for file_id in tree:
1329
yield self.get_entry(file_id, tree)
1330
1331
def get_entry(self, file_id, tree):
1332
if file_id not in tree:
1333
return None
1334
return tree.tree.inventory[file_id]
1335
1336
def get_entry_parent(self, entry):
1337
if entry is None:
1338
return None
1339
return entry.parent_id
1340
1341
def get_path(self, file_id, tree):
1342
if not tree.has_id(file_id):
1343
return None
1344
path = tree.id2path(file_id)
1345
if path == '':
1346
return './.'
1347
else:
1348
return path
1349
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)
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_path(self, entry, tree):
1386
if entry is None:
1387
return (None, None)
1388
if entry.path == ".":
1389
return ""
1390
return entry.path
1391
1392
def make_basic_entry(self, id, only_interesting):
1393
entry_a = self.r_inventory_a.get(id)
1394
entry_b = self.r_inventory_b.get(id)
1353
1395
if only_interesting and not self.is_interesting(entry_a, entry_b):
1354
1396
return None
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)
1359
1360
new_path = self.get_path(file_id, self.tree_b)
1397
parent = self.get_entry_parent(entry_a, self.inventory_a)
1398
path = self.get_path(entry_a, self.tree_a)
1399
cs_entry = ChangesetEntry(id, parent, path)
1400
new_parent = self.get_entry_parent(entry_b, self.inventory_b)
1401
1402
1403
new_path = self.get_path(entry_b, self.tree_b)
1361
1404
1362
1405
cs_entry.new_path = new_path
1363
1406
cs_entry.new_parent = new_parent
1364
1407
return cs_entry
1365
1408
1366
1409
def is_interesting(self, entry_a, entry_b):
1367
if self._interesting_ids is None:
1368
return True
1369
1410
if entry_a is not None:
1370
file_id = entry_a.file_id
1371
elif entry_b is not None:
1372
file_id = entry_b.file_id
1373
else:
1374
return False
1375
return file_id in self._interesting_ids
1411
if entry_a.interesting:
1412
return True
1413
if entry_b is not None:
1414
if entry_b.interesting:
1415
return True
1416
return False
1376
1417
1377
1418
def make_boring_entry(self, id):
1378
1419
cs_entry = self.make_basic_entry(id, only_interesting=False)
1430
1471
if stat_a.st_ino == stat_b.st_ino and \
1431
1472
stat_a.st_dev == stat_b.st_dev:
1432
1473
return None
1474
if file(full_path_a, "rb").read() == \
1475
file(full_path_b, "rb").read():
1476
return None
1477
1478
patch_contents = patch.diff(full_path_a,
1479
file(full_path_b, "rb").read())
1480
if patch_contents is None:
1481
return None
1482
return PatchApply(patch_contents)
1433
1483
1434
1484
a_contents = self.get_contents(stat_a, full_path_a)
1435
1485
b_contents = self.get_contents(stat_b, full_path_b)
Loggerhead is a web-based interface for Breezy
Version: 2.0.1