/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

  • Committer: John Arbash Meinel
  • Date: 2008-06-16 17:11:49 UTC
  • mfrom: (3496 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3497.
  • Revision ID: john@arbash-meinel.com-20080616171149-q4cryeayazevsjlk
merge dev, resolve

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
25
25
    bzrdir,
26
26
    delta,
27
27
    errors,
28
 
    inventory
 
28
    inventory,
 
29
    revision as _mod_revision,
29
30
    )
30
31
""")
31
32
from bzrlib.errors import (DuplicateKey, MalformedTransform, NoSuchFile,
38
39
from bzrlib.progress import DummyProgress, ProgressPhase
39
40
from bzrlib.symbol_versioning import (
40
41
        deprecated_function,
41
 
        zero_fifteen,
42
 
        zero_ninety,
43
42
        )
44
43
from bzrlib.trace import mutter, warning
45
44
from bzrlib import tree
440
439
 
441
440
    def version_file(self, file_id, trans_id):
442
441
        """Schedule a file to become versioned."""
443
 
        assert file_id is not None
 
442
        if file_id is None:
 
443
            raise ValueError()
444
444
        unique_add(self._new_id, trans_id, file_id)
445
445
        unique_add(self._r_new_id, file_id, trans_id)
446
446
 
450
450
        del self._new_id[trans_id]
451
451
        del self._r_new_id[file_id]
452
452
 
453
 
    def new_paths(self):
454
 
        """Determine the paths of all new and changed files"""
 
453
    def new_paths(self, filesystem_only=False):
 
454
        """Determine the paths of all new and changed files.
 
455
 
 
456
        :param filesystem_only: if True, only calculate values for files
 
457
            that require renames or execute bit changes.
 
458
        """
455
459
        new_ids = set()
456
 
        fp = FinalPaths(self)
457
 
        for id_set in (self._new_name, self._new_parent, self._new_contents,
458
 
                       self._new_id, self._new_executability):
 
460
        if filesystem_only:
 
461
            id_sets = (self._needs_rename, self._new_executability)
 
462
        else:
 
463
            id_sets = (self._new_name, self._new_parent, self._new_contents,
 
464
                       self._new_id, self._new_executability)
 
465
        for id_set in id_sets:
459
466
            new_ids.update(id_set)
460
 
        new_paths = [(fp.get_path(t), t) for t in new_ids]
461
 
        new_paths.sort()
462
 
        return new_paths
 
467
        return sorted(FinalPaths(self).get_paths(new_ids))
463
468
 
464
469
    def tree_kind(self, trans_id):
465
470
        """Determine the file kind in the working tree.
510
515
        applied.
511
516
        """
512
517
        try:
513
 
            # there is a new id for this file
514
 
            assert self._new_id[trans_id] is not None
515
518
            return self._new_id[trans_id]
516
519
        except KeyError:
517
520
            if trans_id in self._removed_id:
858
861
    def _set_executability(self, path, entry, trans_id):
859
862
        """Set the executability of versioned files """
860
863
        new_executability = self._new_executability[trans_id]
861
 
        entry.executable = new_executability
 
864
        if entry is not None:
 
865
            entry.executable = new_executability
862
866
        if supports_executable():
863
867
            abspath = self._tree.abspath(path)
864
868
            current_mode = os.stat(abspath).st_mode
1147
1151
        tree.lock_tree_write()
1148
1152
 
1149
1153
        try:
1150
 
            control_files = tree._control_files
1151
1154
            limbodir = urlutils.local_path_from_url(
1152
 
                control_files.controlfilename('limbo'))
 
1155
                tree._transport.abspath('limbo'))
1153
1156
            try:
1154
1157
                os.mkdir(limbodir)
1155
1158
            except OSError, e:
1156
1159
                if e.errno == errno.EEXIST:
1157
1160
                    raise ExistingLimbo(limbodir)
1158
1161
            deletiondir = urlutils.local_path_from_url(
1159
 
                control_files.controlfilename('pending-deletion'))
 
1162
                tree._transport.abspath('pending-deletion'))
1160
1163
            try:
1161
1164
                os.mkdir(deletiondir)
1162
1165
            except OSError, e:
1170
1173
                                   tree.case_sensitive)
1171
1174
        self._deletiondir = deletiondir
1172
1175
 
1173
 
    def apply(self, no_conflicts=False, _mover=None):
 
1176
    def apply(self, no_conflicts=False, precomputed_delta=None, _mover=None):
1174
1177
        """Apply all changes to the inventory and filesystem.
1175
1178
 
1176
1179
        If filesystem or inventory conflicts are present, MalformedTransform
1180
1183
 
1181
1184
        :param no_conflicts: if True, the caller guarantees there are no
1182
1185
            conflicts, so no check is made.
 
1186
        :param precomputed_delta: An inventory delta to use instead of
 
1187
            calculating one.
1183
1188
        :param _mover: Supply an alternate FileMover, for testing
1184
1189
        """
1185
1190
        if not no_conflicts:
1186
1191
            conflicts = self.find_conflicts()
1187
1192
            if len(conflicts) != 0:
1188
1193
                raise MalformedTransform(conflicts=conflicts)
1189
 
        inventory_delta = []
 
1194
        if precomputed_delta is None:
 
1195
            new_inventory_delta = []
 
1196
            inventory_delta = new_inventory_delta
 
1197
        else:
 
1198
            new_inventory_delta = None
 
1199
            inventory_delta = precomputed_delta
1190
1200
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1191
1201
        try:
1192
1202
            if _mover is None:
1195
1205
                mover = _mover
1196
1206
            try:
1197
1207
                child_pb.update('Apply phase', 0, 2)
1198
 
                self._apply_removals(inventory_delta, mover)
 
1208
                self._apply_removals(new_inventory_delta, mover)
1199
1209
                child_pb.update('Apply phase', 1, 2)
1200
 
                modified_paths = self._apply_insertions(inventory_delta, mover)
 
1210
                modified_paths = self._apply_insertions(new_inventory_delta,
 
1211
                                                        mover)
1201
1212
            except:
1202
1213
                mover.rollback()
1203
1214
                raise
1216
1227
        That is, delete files that are to be deleted, and put any files that
1217
1228
        need renaming into limbo.  This must be done in strict child-to-parent
1218
1229
        order.
 
1230
 
 
1231
        If inventory_delta is None, no inventory delta generation is performed.
1219
1232
        """
1220
1233
        tree_paths = list(self._tree_path_ids.iteritems())
1221
1234
        tree_paths.sort(reverse=True)
1237
1250
                            raise
1238
1251
                    else:
1239
1252
                        self.rename_count += 1
1240
 
                if trans_id in self._removed_id:
 
1253
                if (trans_id in self._removed_id
 
1254
                    and inventory_delta is not None):
1241
1255
                    if trans_id == self._new_root:
1242
1256
                        file_id = self._tree.get_root_id()
1243
1257
                    else:
1244
1258
                        file_id = self.tree_file_id(trans_id)
1245
 
                    assert file_id is not None
1246
1259
                    # File-id isn't really being deleted, just moved
1247
1260
                    if file_id in self._r_new_id:
1248
1261
                        continue
1256
1269
        That is, create any files that need to be created, and restore from
1257
1270
        limbo any files that needed renaming.  This must be done in strict
1258
1271
        parent-to-child order.
 
1272
 
 
1273
        If inventory_delta is None, no inventory delta is calculated, and
 
1274
        no list of modified paths is returned.
1259
1275
        """
1260
 
        new_paths = self.new_paths()
 
1276
        new_paths = self.new_paths(filesystem_only=(inventory_delta is None))
1261
1277
        modified_paths = []
1262
 
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1263
1278
        completed_new = []
 
1279
        new_path_file_ids = dict((t, self.final_file_id(t)) for p, t in
 
1280
                                 new_paths)
 
1281
        if inventory_delta is not None:
 
1282
            entries = self._tree.iter_entries_by_dir(
 
1283
                new_path_file_ids.values())
 
1284
            old_paths = dict((e.file_id, p) for p, e in entries)
 
1285
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1264
1286
        try:
1265
1287
            for num, (path, trans_id) in enumerate(new_paths):
1266
1288
                new_entry = None
1267
 
                child_pb.update('adding file', num, len(new_paths))
1268
 
                if trans_id in self._new_contents or \
1269
 
                    self.path_changed(trans_id):
1270
 
                    full_path = self._tree.abspath(path)
1271
 
                    if trans_id in self._needs_rename:
 
1289
                if (num % 10) == 0:
 
1290
                    child_pb.update('adding file', num, len(new_paths))
 
1291
                full_path = self._tree.abspath(path)
 
1292
                if trans_id in self._needs_rename:
 
1293
                    try:
 
1294
                        mover.rename(self._limbo_name(trans_id), full_path)
 
1295
                    except OSError, e:
 
1296
                        # We may be renaming a dangling inventory id
 
1297
                        if e.errno != errno.ENOENT:
 
1298
                            raise
 
1299
                    else:
 
1300
                        self.rename_count += 1
 
1301
                if inventory_delta is not None:
 
1302
                    if (trans_id in self._new_contents or
 
1303
                        self.path_changed(trans_id)):
 
1304
                        if trans_id in self._new_contents:
 
1305
                            modified_paths.append(full_path)
 
1306
                            completed_new.append(trans_id)
 
1307
                    file_id = new_path_file_ids[trans_id]
 
1308
                    if file_id is not None and (trans_id in self._new_id or
 
1309
                        trans_id in self._new_name or
 
1310
                        trans_id in self._new_parent
 
1311
                        or trans_id in self._new_executability):
1272
1312
                        try:
1273
 
                            mover.rename(self._limbo_name(trans_id), full_path)
1274
 
                        except OSError, e:
1275
 
                            # We may be renaming a dangling inventory id
1276
 
                            if e.errno != errno.ENOENT:
1277
 
                                raise
 
1313
                            kind = self.final_kind(trans_id)
 
1314
                        except NoSuchFile:
 
1315
                            kind = self._tree.stored_kind(file_id)
 
1316
                        parent_trans_id = self.final_parent(trans_id)
 
1317
                        parent_file_id = new_path_file_ids.get(parent_trans_id)
 
1318
                        if parent_file_id is None:
 
1319
                            parent_file_id = self.final_file_id(
 
1320
                                parent_trans_id)
 
1321
                        if trans_id in self._new_reference_revision:
 
1322
                            new_entry = inventory.TreeReference(
 
1323
                                file_id,
 
1324
                                self._new_name[trans_id],
 
1325
                                self.final_file_id(self._new_parent[trans_id]),
 
1326
                                None, self._new_reference_revision[trans_id])
1278
1327
                        else:
1279
 
                            self.rename_count += 1
1280
 
                    if trans_id in self._new_contents:
1281
 
                        modified_paths.append(full_path)
1282
 
                        completed_new.append(trans_id)
1283
 
                file_id = self.final_file_id(trans_id)
1284
 
                if file_id is not None and (trans_id in self._new_id or
1285
 
                    trans_id in self._new_name or trans_id in self._new_parent
1286
 
                    or trans_id in self._new_executability):
1287
 
                    try:
1288
 
                        kind = self.final_kind(trans_id)
1289
 
                    except NoSuchFile:
1290
 
                        kind = self._tree.stored_kind(file_id)
1291
 
                    if trans_id in self._new_reference_revision:
1292
 
                        new_entry = inventory.TreeReference(
1293
 
                            self.final_file_id(trans_id),
1294
 
                            self._new_name[trans_id],
1295
 
                            self.final_file_id(self._new_parent[trans_id]),
1296
 
                            None, self._new_reference_revision[trans_id])
1297
 
                    else:
1298
 
                        new_entry = inventory.make_entry(kind,
1299
 
                            self.final_name(trans_id),
1300
 
                            self.final_file_id(self.final_parent(trans_id)),
1301
 
                            self.final_file_id(trans_id))
1302
 
                    try:
1303
 
                        old_path = self._tree.id2path(new_entry.file_id)
1304
 
                    except errors.NoSuchId:
1305
 
                        old_path = None
1306
 
                    inventory_delta.append((old_path, path, new_entry.file_id,
1307
 
                                            new_entry))
 
1328
                            new_entry = inventory.make_entry(kind,
 
1329
                                self.final_name(trans_id),
 
1330
                                parent_file_id, file_id)
 
1331
                        old_path = old_paths.get(new_entry.file_id)
 
1332
                        inventory_delta.append(
 
1333
                            (old_path, path, new_entry.file_id, new_entry))
1308
1334
 
1309
1335
                if trans_id in self._new_executability:
1310
1336
                    self._set_executability(path, new_entry, trans_id)
1311
1337
        finally:
1312
1338
            child_pb.finished()
1313
 
        for trans_id in completed_new:
1314
 
            del self._new_contents[trans_id]
 
1339
        if inventory_delta is None:
 
1340
            self._new_contents.clear()
 
1341
        else:
 
1342
            for trans_id in completed_new:
 
1343
                del self._new_contents[trans_id]
1315
1344
        return modified_paths
1316
1345
 
1317
1346
 
1359
1388
            yield self.trans_id_tree_path(childpath)
1360
1389
 
1361
1390
 
1362
 
class _PreviewTree(object):
 
1391
class _PreviewTree(tree.Tree):
1363
1392
    """Partial implementation of Tree to support show_diff_trees"""
1364
1393
 
1365
1394
    def __init__(self, transform):
1366
1395
        self._transform = transform
 
1396
        self._final_paths = FinalPaths(transform)
 
1397
 
 
1398
    def _changes(self, file_id):
 
1399
        for changes in self._transform.iter_changes():
 
1400
            if changes[0] == file_id:
 
1401
                return changes
 
1402
 
 
1403
    def _content_change(self, file_id):
 
1404
        """Return True if the content of this file changed"""
 
1405
        changes = self._changes(file_id)
 
1406
        # changes[2] is true if the file content changed.  See
 
1407
        # InterTree.iter_changes.
 
1408
        return (changes is not None and changes[2])
 
1409
 
 
1410
    def _get_file_revision(self, file_id, vf, tree_revision):
 
1411
        return self._transform._tree._get_file_revision(file_id, vf,
 
1412
                                                        tree_revision)
 
1413
 
 
1414
    def _stat_limbo_file(self, file_id):
 
1415
        trans_id = self._transform.trans_id_file_id(file_id)
 
1416
        name = self._transform._limbo_name(trans_id)
 
1417
        return os.lstat(name)
1367
1418
 
1368
1419
    def lock_read(self):
1369
1420
        # Perhaps in theory, this should lock the TreeTransform?
1372
1423
    def unlock(self):
1373
1424
        pass
1374
1425
 
 
1426
    @property
 
1427
    def inventory(self):
 
1428
        """This Tree does not use inventory as its backing data."""
 
1429
        raise NotImplementedError(_PreviewTree.inventory)
 
1430
 
 
1431
    def get_root_id(self):
 
1432
        return self._transform.final_file_id(self._transform.root)
 
1433
 
 
1434
    def all_file_ids(self):
 
1435
        return self._transform._tree.all_file_ids()
 
1436
 
 
1437
    def __iter__(self):
 
1438
        return iter(self.all_file_ids())
 
1439
 
 
1440
    def paths2ids(self, specific_files, trees=None, require_versioned=False):
 
1441
        """See Tree.paths2ids"""
 
1442
        to_find = set(specific_files)
 
1443
        result = set()
 
1444
        for (file_id, paths, changed, versioned, parent, name, kind,
 
1445
             executable) in self._transform.iter_changes():
 
1446
            if paths[1] in to_find:
 
1447
                result.append(file_id)
 
1448
                to_find.remove(paths[1])
 
1449
        result.update(self._transform._tree.paths2ids(to_find,
 
1450
                      trees=[], require_versioned=require_versioned))
 
1451
        return result
 
1452
 
 
1453
    def path2id(self, path):
 
1454
        return self._transform._tree.path2id(path)
 
1455
 
 
1456
    def id2path(self, file_id):
 
1457
        trans_id = self._transform.trans_id_file_id(file_id)
 
1458
        try:
 
1459
            return self._final_paths._determine_path(trans_id)
 
1460
        except NoFinalPath:
 
1461
            raise errors.NoSuchId(self, file_id)
 
1462
 
 
1463
    def iter_entries_by_dir(self, specific_file_ids=None):
 
1464
        return self._transform._tree.iter_entries_by_dir(specific_file_ids)
 
1465
 
 
1466
    def kind(self, file_id):
 
1467
        trans_id = self._transform.trans_id_file_id(file_id)
 
1468
        return self._transform.final_kind(trans_id)
 
1469
 
 
1470
    def stored_kind(self, file_id):
 
1471
        return self._transform._tree.stored_kind(file_id)
 
1472
 
 
1473
    def get_file_mtime(self, file_id, path=None):
 
1474
        """See Tree.get_file_mtime"""
 
1475
        if not self._content_change(file_id):
 
1476
            return self._transform._tree.get_file_mtime(file_id, path)
 
1477
        return self._stat_limbo_file(file_id).st_mtime
 
1478
 
 
1479
    def get_file_size(self, file_id):
 
1480
        """See Tree.get_file_size"""
 
1481
        if self.kind(file_id) == 'file':
 
1482
            return self._transform._tree.get_file_size(file_id)
 
1483
        else:
 
1484
            return None
 
1485
 
 
1486
    def get_file_sha1(self, file_id, path=None, stat_value=None):
 
1487
        return self._transform._tree.get_file_sha1(file_id)
 
1488
 
 
1489
    def is_executable(self, file_id, path=None):
 
1490
        return self._transform._tree.is_executable(file_id, path)
 
1491
 
 
1492
    def path_content_summary(self, path):
 
1493
        return self._transform._tree.path_content_summary(path)
 
1494
 
1375
1495
    def iter_changes(self, from_tree, include_unchanged=False,
1376
1496
                      specific_files=None, pb=None, extra_trees=None,
1377
1497
                      require_versioned=True, want_unversioned=False):
1391
1511
            raise ValueError('want_unversioned is not supported')
1392
1512
        return self._transform.iter_changes()
1393
1513
 
1394
 
    def kind(self, file_id):
1395
 
        trans_id = self._transform.trans_id_file_id(file_id)
1396
 
        return self._transform.final_kind(trans_id)
1397
 
 
1398
 
    def get_file_mtime(self, file_id, path=None):
1399
 
        """See Tree.get_file_mtime"""
1400
 
        trans_id = self._transform.trans_id_file_id(file_id)
1401
 
        name = self._transform._limbo_name(trans_id)
1402
 
        return os.stat(name).st_mtime
1403
 
 
1404
 
    def get_file(self, file_id):
 
1514
    def get_file(self, file_id, path=None):
1405
1515
        """See Tree.get_file"""
 
1516
        if not self._content_change(file_id):
 
1517
            return self._transform._tree.get_file(file_id, path)
1406
1518
        trans_id = self._transform.trans_id_file_id(file_id)
1407
1519
        name = self._transform._limbo_name(trans_id)
1408
1520
        return open(name, 'rb')
1409
1521
 
 
1522
    def get_file_text(self, file_id):
 
1523
        text_file = self.get_file(file_id)
 
1524
        try:
 
1525
            return text_file.read()
 
1526
        finally:
 
1527
            text_file.close()
 
1528
 
 
1529
    def annotate_iter(self, file_id,
 
1530
                      default_revision=_mod_revision.CURRENT_REVISION):
 
1531
        return self._transform._tree.annotate_iter(file_id,
 
1532
            default_revision=default_revision)
 
1533
 
1410
1534
    def get_symlink_target(self, file_id):
1411
1535
        """See Tree.get_symlink_target"""
 
1536
        if not self._content_change(file_id):
 
1537
            return self._transform._tree.get_symlink_target(file_id)
1412
1538
        trans_id = self._transform.trans_id_file_id(file_id)
1413
1539
        name = self._transform._limbo_name(trans_id)
1414
1540
        return os.readlink(name)
1415
1541
 
1416
 
    def paths2ids(self, specific_files, trees=None, require_versioned=False):
1417
 
        """See Tree.paths2ids"""
1418
 
        return 'not_empty'
 
1542
    def list_files(self, include_root=False):
 
1543
        return self._transform._tree.list_files(include_root)
 
1544
 
 
1545
    def walkdirs(self, prefix=""):
 
1546
        return self._transform._tree.walkdirs(prefix)
 
1547
 
 
1548
    def get_parent_ids(self):
 
1549
        return self._transform._tree.get_parent_ids()
 
1550
 
 
1551
    def get_revision_tree(self, revision_id):
 
1552
        return self._transform._tree.get_revision_tree(revision_id)
1419
1553
 
1420
1554
 
1421
1555
def joinpath(parent, child):
1453
1587
            self._known_paths[trans_id] = self._determine_path(trans_id)
1454
1588
        return self._known_paths[trans_id]
1455
1589
 
 
1590
    def get_paths(self, trans_ids):
 
1591
        return [(self.get_path(t), t) for t in trans_ids]
 
1592
 
 
1593
 
1456
1594
 
1457
1595
def topology_sorted_ids(tree):
1458
1596
    """Determine the topological order of the ids in a tree"""
1461
1599
    return file_ids
1462
1600
 
1463
1601
 
1464
 
def build_tree(tree, wt, accelerator_tree=None, hardlink=False):
 
1602
def build_tree(tree, wt, accelerator_tree=None, hardlink=False,
 
1603
               delta_from_tree=False):
1465
1604
    """Create working tree for a branch, using a TreeTransform.
1466
1605
    
1467
1606
    This function should be used on empty trees, having a tree root at most.
1483
1622
    :param hardlink: If true, hard-link files to accelerator_tree, where
1484
1623
        possible.  accelerator_tree must implement abspath, i.e. be a
1485
1624
        working tree.
 
1625
    :param delta_from_tree: If true, build_tree may use the input Tree to
 
1626
        generate the inventory delta.
1486
1627
    """
1487
1628
    wt.lock_tree_write()
1488
1629
    try:
1491
1632
            if accelerator_tree is not None:
1492
1633
                accelerator_tree.lock_read()
1493
1634
            try:
1494
 
                return _build_tree(tree, wt, accelerator_tree, hardlink)
 
1635
                return _build_tree(tree, wt, accelerator_tree, hardlink,
 
1636
                                   delta_from_tree)
1495
1637
            finally:
1496
1638
                if accelerator_tree is not None:
1497
1639
                    accelerator_tree.unlock()
1501
1643
        wt.unlock()
1502
1644
 
1503
1645
 
1504
 
def _build_tree(tree, wt, accelerator_tree, hardlink):
 
1646
def _build_tree(tree, wt, accelerator_tree, hardlink, delta_from_tree):
1505
1647
    """See build_tree."""
1506
1648
    for num, _unused in enumerate(wt.all_file_ids()):
1507
1649
        if num > 0:  # more than just a root
1508
1650
            raise errors.WorkingTreeAlreadyPopulated(base=wt.basedir)
 
1651
    existing_files = set()
 
1652
    for dir, files in wt.walkdirs():
 
1653
        existing_files.update(f[0] for f in files)
1509
1654
    file_trans_id = {}
1510
1655
    top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1511
1656
    pp = ProgressPhase("Build phase", 2, top_pb)
1530
1675
        try:
1531
1676
            deferred_contents = []
1532
1677
            num = 0
 
1678
            total = len(tree.inventory)
 
1679
            if delta_from_tree:
 
1680
                precomputed_delta = []
 
1681
            else:
 
1682
                precomputed_delta = None
1533
1683
            for num, (tree_path, entry) in \
1534
1684
                enumerate(tree.inventory.iter_entries_by_dir()):
1535
 
                pb.update("Building tree", num - len(deferred_contents),
1536
 
                          len(tree.inventory))
 
1685
                pb.update("Building tree", num - len(deferred_contents), total)
1537
1686
                if entry.parent_id is None:
1538
1687
                    continue
1539
1688
                reparent = False
1540
1689
                file_id = entry.file_id
1541
 
                target_path = wt.abspath(tree_path)
1542
 
                try:
 
1690
                if delta_from_tree:
 
1691
                    precomputed_delta.append((None, tree_path, file_id, entry))
 
1692
                if tree_path in existing_files:
 
1693
                    target_path = wt.abspath(tree_path)
1543
1694
                    kind = file_kind(target_path)
1544
 
                except NoSuchFile:
1545
 
                    pass
1546
 
                else:
1547
1695
                    if kind == "directory":
1548
1696
                        try:
1549
1697
                            bzrdir.BzrDir.open(target_path)
1557
1705
                        tt.delete_contents(tt.trans_id_tree_path(tree_path))
1558
1706
                        if kind == 'directory':
1559
1707
                            reparent = True
1560
 
                if entry.parent_id not in file_trans_id:
1561
 
                    raise AssertionError(
1562
 
                        'entry %s parent id %r is not in file_trans_id %r'
1563
 
                        % (entry, entry.parent_id, file_trans_id))
1564
1708
                parent_id = file_trans_id[entry.parent_id]
1565
1709
                if entry.kind == 'file':
1566
1710
                    # We *almost* replicate new_by_entry, so that we can defer
1567
1711
                    # getting the file text, and get them all at once.
1568
1712
                    trans_id = tt.create_path(entry.name, parent_id)
1569
1713
                    file_trans_id[file_id] = trans_id
1570
 
                    tt.version_file(entry.file_id, trans_id)
1571
 
                    executable = tree.is_executable(entry.file_id, tree_path)
1572
 
                    if executable is not None:
 
1714
                    tt.version_file(file_id, trans_id)
 
1715
                    executable = tree.is_executable(file_id, tree_path)
 
1716
                    if executable:
1573
1717
                        tt.set_executability(executable, trans_id)
1574
 
                    deferred_contents.append((entry.file_id, trans_id))
 
1718
                    deferred_contents.append((file_id, trans_id))
1575
1719
                else:
1576
1720
                    file_trans_id[file_id] = new_by_entry(tt, entry, parent_id,
1577
1721
                                                          tree)
1588
1732
        divert_trans = set(file_trans_id[f] for f in divert)
1589
1733
        resolver = lambda t, c: resolve_checkout(t, c, divert_trans)
1590
1734
        raw_conflicts = resolve_conflicts(tt, pass_func=resolver)
 
1735
        if len(raw_conflicts) > 0:
 
1736
            precomputed_delta = None
1591
1737
        conflicts = cook_conflicts(raw_conflicts, tt)
1592
1738
        for conflict in conflicts:
1593
1739
            warning(conflict)
1595
1741
            wt.add_conflicts(conflicts)
1596
1742
        except errors.UnsupportedOperation:
1597
1743
            pass
1598
 
        result = tt.apply(no_conflicts=True)
 
1744
        result = tt.apply(no_conflicts=True,
 
1745
                          precomputed_delta=precomputed_delta)
1599
1746
    finally:
1600
1747
        tt.finalize()
1601
1748
        top_pb.finished()
1644
1791
    by_parent = tt.by_parent()
1645
1792
    for child in by_parent[old_parent]:
1646
1793
        tt.adjust_path(tt.final_name(child), new_parent, child)
 
1794
    return by_parent[old_parent]
1647
1795
 
1648
1796
def _content_match(tree, entry, file_id, kind, target_path):
1649
1797
    if entry.kind != kind:
1663
1811
    new_conflicts = set()
1664
1812
    for c_type, conflict in ((c[0], c) for c in conflicts):
1665
1813
        # Anything but a 'duplicate' would indicate programmer error
1666
 
        assert c_type == 'duplicate', c_type
 
1814
        if c_type != 'duplicate':
 
1815
            raise AssertionError(c_type)
1667
1816
        # Now figure out which is new and which is old
1668
1817
        if tt.new_contents(conflict[1]):
1669
1818
            new_file = conflict[1]
1727
1876
        tt.set_executability(entry.executable, trans_id)
1728
1877
 
1729
1878
 
1730
 
@deprecated_function(zero_fifteen)
1731
 
def find_interesting(working_tree, target_tree, filenames):
1732
 
    """Find the ids corresponding to specified filenames.
1733
 
    
1734
 
    Deprecated: Please use tree1.paths2ids(filenames, [tree2]).
1735
 
    """
1736
 
    working_tree.lock_read()
1737
 
    try:
1738
 
        target_tree.lock_read()
1739
 
        try:
1740
 
            return working_tree.paths2ids(filenames, [target_tree])
1741
 
        finally:
1742
 
            target_tree.unlock()
1743
 
    finally:
1744
 
        working_tree.unlock()
1745
 
 
1746
 
 
1747
 
@deprecated_function(zero_ninety)
1748
 
def change_entry(tt, file_id, working_tree, target_tree, 
1749
 
                 trans_id_file_id, backups, trans_id, by_parent):
1750
 
    """Replace a file_id's contents with those from a target tree."""
1751
 
    if file_id is None and target_tree is None:
1752
 
        # skip the logic altogether in the deprecation test
1753
 
        return
1754
 
    e_trans_id = trans_id_file_id(file_id)
1755
 
    entry = target_tree.inventory[file_id]
1756
 
    has_contents, contents_mod, meta_mod, = _entry_changes(file_id, entry, 
1757
 
                                                           working_tree)
1758
 
    if contents_mod:
1759
 
        mode_id = e_trans_id
1760
 
        if has_contents:
1761
 
            if not backups:
1762
 
                tt.delete_contents(e_trans_id)
1763
 
            else:
1764
 
                parent_trans_id = trans_id_file_id(entry.parent_id)
1765
 
                backup_name = get_backup_name(entry, by_parent,
1766
 
                                              parent_trans_id, tt)
1767
 
                tt.adjust_path(backup_name, parent_trans_id, e_trans_id)
1768
 
                tt.unversion_file(e_trans_id)
1769
 
                e_trans_id = tt.create_path(entry.name, parent_trans_id)
1770
 
                tt.version_file(file_id, e_trans_id)
1771
 
                trans_id[file_id] = e_trans_id
1772
 
        create_by_entry(tt, entry, target_tree, e_trans_id, mode_id=mode_id)
1773
 
        create_entry_executability(tt, entry, e_trans_id)
1774
 
 
1775
 
    elif meta_mod:
1776
 
        tt.set_executability(entry.executable, e_trans_id)
1777
 
    if tt.final_name(e_trans_id) != entry.name:
1778
 
        adjust_path  = True
1779
 
    else:
1780
 
        parent_id = tt.final_parent(e_trans_id)
1781
 
        parent_file_id = tt.final_file_id(parent_id)
1782
 
        if parent_file_id != entry.parent_id:
1783
 
            adjust_path = True
1784
 
        else:
1785
 
            adjust_path = False
1786
 
    if adjust_path:
1787
 
        parent_trans_id = trans_id_file_id(entry.parent_id)
1788
 
        tt.adjust_path(entry.name, parent_trans_id, e_trans_id)
1789
 
 
1790
 
 
1791
1879
def get_backup_name(entry, by_parent, parent_trans_id, tt):
1792
1880
    return _get_backup_name(entry.name, by_parent, parent_trans_id, tt)
1793
1881
 
1941
2029
                    # preserve the execute bit when backing up
1942
2030
                    if keep_content and executable[0] == executable[1]:
1943
2031
                        tt.set_executability(executable[1], trans_id)
1944
 
                else:
1945
 
                    assert kind[1] is None
 
2032
                elif kind[1] is not None:
 
2033
                    raise AssertionError(kind[1])
1946
2034
            if versioned == (False, True):
1947
2035
                tt.version_file(file_id, trans_id)
1948
2036
            if versioned == (True, False):
2019
2107
                new_conflicts.add(('deleting parent', 'Not deleting', 
2020
2108
                                   trans_id))
2021
2109
            except KeyError:
2022
 
                tt.create_directory(trans_id)
2023
 
                new_conflicts.add((c_type, 'Created directory', trans_id))
 
2110
                create = True
2024
2111
                try:
2025
2112
                    tt.final_name(trans_id)
2026
2113
                except NoFinalPath:
2027
2114
                    if path_tree is not None:
2028
2115
                        file_id = tt.final_file_id(trans_id)
 
2116
                        if file_id is None:
 
2117
                            file_id = tt.inactive_file_id(trans_id)
2029
2118
                        entry = path_tree.inventory[file_id]
2030
 
                        parent_trans_id = tt.trans_id_file_id(entry.parent_id)
2031
 
                        tt.adjust_path(entry.name, parent_trans_id, trans_id)
 
2119
                        # special-case the other tree root (move its
 
2120
                        # children to current root)
 
2121
                        if entry.parent_id is None:
 
2122
                            create=False
 
2123
                            moved = _reparent_transform_children(
 
2124
                                tt, trans_id, tt.root)
 
2125
                            for child in moved:
 
2126
                                new_conflicts.add((c_type, 'Moved to root',
 
2127
                                                   child))
 
2128
                        else:
 
2129
                            parent_trans_id = tt.trans_id_file_id(
 
2130
                                entry.parent_id)
 
2131
                            tt.adjust_path(entry.name, parent_trans_id,
 
2132
                                           trans_id)
 
2133
                if create:
 
2134
                    tt.create_directory(trans_id)
 
2135
                    new_conflicts.add((c_type, 'Created directory', trans_id))
2032
2136
        elif c_type == 'unversioned parent':
2033
 
            tt.version_file(tt.inactive_file_id(conflict[1]), conflict[1])
 
2137
            file_id = tt.inactive_file_id(conflict[1])
 
2138
            # special-case the other tree root (move its children instead)
 
2139
            if path_tree and file_id in path_tree:
 
2140
                if path_tree.inventory[file_id].parent_id is None:
 
2141
                    continue
 
2142
            tt.version_file(file_id, conflict[1])
2034
2143
            new_conflicts.add((c_type, 'Versioned directory', conflict[1]))
2035
2144
        elif c_type == 'non-directory parent':
2036
2145
            parent_id = conflict[1]