← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/changeset.py

  • Committer: aaron.bentley at utoronto
  • Date: 2005-08-21 00:08:08 UTC
  • mto: (1092.1.41) (1185.3.4)
  • mto: This revision was merged to the branch mainline in revision 1110.
  • Revision ID: aaron.bentley@utoronto.ca-20050821000808-2a0e6ef95b1bca59
Changed copy_multi to permit failure and return a tuple, tested missing required revisions

Show diffs side-by-side

added added

removed removed

Lines of Context:
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
 
 
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
 
24
31
__docformat__ = "restructuredtext"
25
32
 
26
33
NULL_ID = "!NULL"
36
43
    return newdict
37
44
 
38
45
 
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
 
        
 
46
       
88
47
class ChangeUnixPermissions(object):
89
48
    """This is two-way change, suitable for file modification, creation,
90
49
    deletion"""
367
326
 
368
327
 
369
328
class Diff3Merge(object):
370
 
    def __init__(self, base_file, other_file):
371
 
        self.base_file = base_file
372
 
        self.other_file = other_file
 
329
    def __init__(self, file_id, base, other):
 
330
        self.file_id = file_id
 
331
        self.base = base
 
332
        self.other = other
373
333
 
374
334
    def __eq__(self, other):
375
335
        if not isinstance(other, Diff3Merge):
376
336
            return False
377
 
        return (self.base_file == other.base_file and 
378
 
                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)
379
339
 
380
340
    def __ne__(self, other):
381
341
        return not (self == other)
382
342
 
383
343
    def apply(self, filename, conflict_handler, reverse=False):
384
 
        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)
385
347
        if not reverse:
386
 
            base = self.base_file
387
 
            other = self.other_file
 
348
            base = base_file
 
349
            other = other_file
388
350
        else:
389
 
            base = self.other_file
390
 
            other = self.base_file
 
351
            base = other_file
 
352
            other = base_file
391
353
        status = patch.diff3(new_file, filename, base, other)
392
354
        if status == 0:
393
355
            os.chmod(new_file, os.stat(filename).st_mode)
395
357
            return
396
358
        else:
397
359
            assert(status == 1)
398
 
            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()
 
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)
399
368
 
400
369
 
401
370
def CreateDir():
1028
997
 
1029
998
 
1030
999
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
    """
1031
1006
    def __init__(self, dir):
1032
1007
        self.dir = dir
1033
1008
    
1047
1022
    def rename_conflict(self, id, this_name, base_name, other_name):
1048
1023
        raise RenameConflict(id, this_name, base_name, other_name)
1049
1024
 
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)
 
1025
    def move_conflict(self, id, this_dir, base_dir, other_dir):
1054
1026
        raise MoveConflict(id, this_dir, base_dir, other_dir)
1055
1027
 
1056
 
    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):
1057
1029
        os.unlink(new_file)
1058
1030
        raise MergeConflict(this_path)
1059
1031
 
1087
1059
    def missing_for_rename(self, filename):
1088
1060
        raise MissingForRename(filename)
1089
1061
 
1090
 
    def missing_for_merge(self, file_id, inventory):
1091
 
        raise MissingForMerge(inventory.other.get_path(file_id))
 
1062
    def missing_for_merge(self, file_id, other_path):
 
1063
        raise MissingForMerge(other_path)
1092
1064
 
1093
1065
    def new_contents_conflict(self, filename, other_contents):
1094
1066
        raise NewContentsConflict(filename)
1315
1287
        self.full_path = full_path
1316
1288
        self.stat_result = stat_result
1317
1289
 
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)()
 
1290
def generate_changeset(tree_a, tree_b, interesting_ids=None):
 
1291
    return ChangesetGenerator(tree_a, tree_b, interesting_ids)()
1320
1292
 
1321
1293
class ChangesetGenerator(object):
1322
 
    def __init__(self, tree_a, tree_b, inventory_a=None, inventory_b=None):
 
1294
    def __init__(self, tree_a, tree_b, interesting_ids=None):
1323
1295
        object.__init__(self)
1324
1296
        self.tree_a = tree_a
1325
1297
        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)
 
1298
        self._interesting_ids = interesting_ids
1336
1299
 
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
 
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
1344
1306
 
1345
1307
    def __call__(self):
1346
1308
        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)
 
1309
        for file_id in self.iter_both_tree_ids():
 
1310
            cs_entry = self.make_entry(file_id)
1351
1311
            if cs_entry is not None and not cs_entry.is_boring():
1352
1312
                cset.add_entry(cs_entry)
1353
1313
 
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
1314
        for entry in list(cset.entries.itervalues()):
1362
1315
            if entry.parent != entry.new_parent:
1363
1316
                if not cset.entries.has_key(entry.parent) and\
1371
1324
                    cset.add_entry(parent_entry)
1372
1325
        return cset
1373
1326
 
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)
 
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)
1396
1353
        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)
 
1354
            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)
1405
1361
 
1406
1362
        cs_entry.new_path = new_path
1407
1363
        cs_entry.new_parent = new_parent
1408
 
        return (cs_entry, full_path_a, full_path_b)
 
1364
        return cs_entry
1409
1365
 
1410
1366
    def is_interesting(self, entry_a, entry_b):
 
1367
        if self._interesting_ids is None:
 
1368
            return True
1411
1369
        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
 
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
1418
1376
 
1419
1377
    def make_boring_entry(self, id):
1420
 
        (cs_entry, full_path_a, full_path_b) = \
1421
 
            self.make_basic_entry(id, only_interesting=False)
 
1378
        cs_entry = self.make_basic_entry(id, only_interesting=False)
1422
1379
        if cs_entry.is_creation_or_deletion():
1423
1380
            return self.make_entry(id, only_interesting=False)
1424
1381
        else:
1426
1383
        
1427
1384
 
1428
1385
    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)
 
1386
        cs_entry = self.make_basic_entry(id, only_interesting)
1431
1387
 
1432
1388
        if cs_entry is None:
1433
1389
            return None
1434
 
       
 
1390
        if id in self.tree_a and id in self.tree_b:
 
1391
            a_sha1 = self.tree_a.get_file_sha1(id)
 
1392
            b_sha1 = self.tree_b.get_file_sha1(id)
 
1393
            if None not in (a_sha1, b_sha1) and a_sha1 == b_sha1:
 
1394
                return cs_entry
 
1395
 
 
1396
        full_path_a = self.tree_a.readonly_path(id)
 
1397
        full_path_b = self.tree_b.readonly_path(id)
1435
1398
        stat_a = self.lstat(full_path_a)
1436
1399
        stat_b = self.lstat(full_path_b)
1437
1400
        if stat_b is None:
1467
1430
            if stat_a.st_ino == stat_b.st_ino and \
1468
1431
                stat_a.st_dev == stat_b.st_dev:
1469
1432
                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
1433
 
1480
1434
        a_contents = self.get_contents(stat_a, full_path_a)
1481
1435
        b_contents = self.get_contents(stat_b, full_path_b)