/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: Andrew Bennetts
  • Date: 2008-09-08 12:59:00 UTC
  • mfrom: (3695 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3756.
  • Revision ID: andrew.bennetts@canonical.com-20080908125900-8ywtsr7jqyyatjz0
Merge from bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
16
16
 
17
17
import os
18
18
import errno
19
 
from stat import S_ISREG
20
 
import tempfile
 
19
from stat import S_ISREG, S_IEXEC
21
20
 
22
21
from bzrlib.lazy_import import lazy_import
23
22
lazy_import(globals(), """
24
23
from bzrlib import (
 
24
    annotate,
25
25
    bzrdir,
26
26
    delta,
27
27
    errors,
28
 
    inventory
 
28
    inventory,
 
29
    osutils,
 
30
    revision as _mod_revision,
29
31
    )
30
32
""")
31
33
from bzrlib.errors import (DuplicateKey, MalformedTransform, NoSuchFile,
33
35
                           ExistingLimbo, ImmortalLimbo, NoFinalPath,
34
36
                           UnableCreateSymlink)
35
37
from bzrlib.inventory import InventoryEntry
36
 
from bzrlib.osutils import (file_kind, supports_executable, pathjoin, lexists,
37
 
                            delete_any, has_symlinks)
 
38
from bzrlib.osutils import (
 
39
    delete_any,
 
40
    file_kind,
 
41
    has_symlinks,
 
42
    lexists,
 
43
    pathjoin,
 
44
    splitpath,
 
45
    supports_executable,
 
46
)
38
47
from bzrlib.progress import DummyProgress, ProgressPhase
39
48
from bzrlib.symbol_versioning import (
40
49
        deprecated_function,
41
 
        zero_fifteen,
42
 
        zero_ninety,
43
50
        )
44
51
from bzrlib.trace import mutter, warning
45
52
from bzrlib import tree
121
128
        # Cache of relpath results, to speed up canonical_path
122
129
        self._relpaths = {}
123
130
        # The trans_id that will be used as the tree root
124
 
        self._new_root = self.trans_id_tree_file_id(tree.get_root_id())
 
131
        root_id = tree.get_root_id()
 
132
        if root_id is not None:
 
133
            self._new_root = self.trans_id_tree_file_id(root_id)
 
134
        else:
 
135
            self._new_root = None
125
136
        # Indictor of whether the transform has been applied
126
137
        self._done = False
127
138
        # A progress bar
188
199
        previous_name = self._new_name.get(trans_id)
189
200
        self._new_name[trans_id] = name
190
201
        self._new_parent[trans_id] = parent
 
202
        if parent == ROOT_PARENT:
 
203
            if self._new_root is not None:
 
204
                raise ValueError("Cannot have multiple roots.")
 
205
            self._new_root = trans_id
191
206
        if (trans_id in self._limbo_files and
192
207
            trans_id not in self._needs_rename):
193
208
            self._rename_in_limbo([trans_id])
250
265
        This reflects only files that already exist, not ones that will be
251
266
        added by transactions.
252
267
        """
 
268
        if inventory_id is None:
 
269
            raise ValueError('None is not a valid file id')
253
270
        path = self._tree.id2path(inventory_id)
254
271
        return self.trans_id_tree_path(path)
255
272
 
259
276
        a transaction has been unversioned, it is deliberately still returned.
260
277
        (this will likely lead to an unversioned parent conflict.)
261
278
        """
 
279
        if file_id is None:
 
280
            raise ValueError('None is not a valid file id')
262
281
        if file_id in self._r_new_id and self._r_new_id[file_id] is not None:
263
282
            return self._r_new_id[file_id]
264
283
        elif file_id in self._tree.inventory:
347
366
        try:
348
367
            mode = os.stat(self._tree.abspath(old_path)).st_mode
349
368
        except OSError, e:
350
 
            if e.errno == errno.ENOENT:
 
369
            if e.errno in (errno.ENOENT, errno.ENOTDIR):
 
370
                # Either old_path doesn't exist, or the parent of the
 
371
                # target is not a directory (but will be one eventually)
 
372
                # Either way, we know it doesn't exist *right now*
 
373
                # See also bug #248448
351
374
                return
352
375
            else:
353
376
                raise
440
463
 
441
464
    def version_file(self, file_id, trans_id):
442
465
        """Schedule a file to become versioned."""
443
 
        assert file_id is not None
 
466
        if file_id is None:
 
467
            raise ValueError()
444
468
        unique_add(self._new_id, trans_id, file_id)
445
469
        unique_add(self._r_new_id, file_id, trans_id)
446
470
 
450
474
        del self._new_id[trans_id]
451
475
        del self._r_new_id[file_id]
452
476
 
453
 
    def new_paths(self):
454
 
        """Determine the paths of all new and changed files"""
455
 
        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):
459
 
            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
 
477
    def new_paths(self, filesystem_only=False):
 
478
        """Determine the paths of all new and changed files.
 
479
 
 
480
        :param filesystem_only: if True, only calculate values for files
 
481
            that require renames or execute bit changes.
 
482
        """
 
483
        new_ids = set()
 
484
        if filesystem_only:
 
485
            stale_ids = self._needs_rename.difference(self._new_name)
 
486
            stale_ids.difference_update(self._new_parent)
 
487
            stale_ids.difference_update(self._new_contents)
 
488
            stale_ids.difference_update(self._new_id)
 
489
            needs_rename = self._needs_rename.difference(stale_ids)
 
490
            id_sets = (needs_rename, self._new_executability)
 
491
        else:
 
492
            id_sets = (self._new_name, self._new_parent, self._new_contents,
 
493
                       self._new_id, self._new_executability)
 
494
        for id_set in id_sets:
 
495
            new_ids.update(id_set)
 
496
        return sorted(FinalPaths(self).get_paths(new_ids))
 
497
 
 
498
    def _inventory_altered(self):
 
499
        """Get the trans_ids and paths of files needing new inv entries."""
 
500
        new_ids = set()
 
501
        for id_set in [self._new_name, self._new_parent, self._new_id,
 
502
                       self._new_executability]:
 
503
            new_ids.update(id_set)
 
504
        changed_kind = set(self._removed_contents)
 
505
        changed_kind.intersection_update(self._new_contents)
 
506
        changed_kind.difference_update(new_ids)
 
507
        changed_kind = (t for t in changed_kind if self.tree_kind(t) !=
 
508
                        self.final_kind(t))
 
509
        new_ids.update(changed_kind)
 
510
        return sorted(FinalPaths(self).get_paths(new_ids))
463
511
 
464
512
    def tree_kind(self, trans_id):
465
513
        """Determine the file kind in the working tree.
510
558
        applied.
511
559
        """
512
560
        try:
513
 
            # there is a new id for this file
514
 
            assert self._new_id[trans_id] is not None
515
561
            return self._new_id[trans_id]
516
562
        except KeyError:
517
563
            if trans_id in self._removed_id:
621
667
        try:
622
668
            children = os.listdir(self._tree.abspath(path))
623
669
        except OSError, e:
624
 
            if e.errno not in (errno.ENOENT, errno.ESRCH, errno.ENOTDIR):
 
670
            if not (osutils._is_error_enotdir(e)
 
671
                    or e.errno in (errno.ENOENT, errno.ESRCH)):
625
672
                raise
626
673
            return
627
 
            
 
674
 
628
675
        for child in children:
629
676
            childpath = joinpath(path, child)
630
677
            if self._tree.is_control_filename(childpath):
855
902
        self._limbo_files[trans_id] = limbo_name
856
903
        return limbo_name
857
904
 
858
 
    def _set_executability(self, path, entry, trans_id):
 
905
    def _set_executability(self, path, trans_id):
859
906
        """Set the executability of versioned files """
860
 
        new_executability = self._new_executability[trans_id]
861
 
        entry.executable = new_executability
862
907
        if supports_executable():
 
908
            new_executability = self._new_executability[trans_id]
863
909
            abspath = self._tree.abspath(path)
864
910
            current_mode = os.stat(abspath).st_mode
865
911
            if new_executability:
1147
1193
        tree.lock_tree_write()
1148
1194
 
1149
1195
        try:
1150
 
            control_files = tree._control_files
1151
1196
            limbodir = urlutils.local_path_from_url(
1152
 
                control_files.controlfilename('limbo'))
 
1197
                tree._transport.abspath('limbo'))
1153
1198
            try:
1154
1199
                os.mkdir(limbodir)
1155
1200
            except OSError, e:
1156
1201
                if e.errno == errno.EEXIST:
1157
1202
                    raise ExistingLimbo(limbodir)
1158
1203
            deletiondir = urlutils.local_path_from_url(
1159
 
                control_files.controlfilename('pending-deletion'))
 
1204
                tree._transport.abspath('pending-deletion'))
1160
1205
            try:
1161
1206
                os.mkdir(deletiondir)
1162
1207
            except OSError, e:
1170
1215
                                   tree.case_sensitive)
1171
1216
        self._deletiondir = deletiondir
1172
1217
 
1173
 
    def apply(self, no_conflicts=False, _mover=None):
 
1218
    def apply(self, no_conflicts=False, precomputed_delta=None, _mover=None):
1174
1219
        """Apply all changes to the inventory and filesystem.
1175
1220
 
1176
1221
        If filesystem or inventory conflicts are present, MalformedTransform
1180
1225
 
1181
1226
        :param no_conflicts: if True, the caller guarantees there are no
1182
1227
            conflicts, so no check is made.
 
1228
        :param precomputed_delta: An inventory delta to use instead of
 
1229
            calculating one.
1183
1230
        :param _mover: Supply an alternate FileMover, for testing
1184
1231
        """
1185
1232
        if not no_conflicts:
1186
1233
            conflicts = self.find_conflicts()
1187
1234
            if len(conflicts) != 0:
1188
1235
                raise MalformedTransform(conflicts=conflicts)
1189
 
        inventory_delta = []
1190
1236
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1191
1237
        try:
 
1238
            if precomputed_delta is None:
 
1239
                child_pb.update('Apply phase', 0, 2)
 
1240
                inventory_delta = self._generate_inventory_delta()
 
1241
                offset = 1
 
1242
            else:
 
1243
                inventory_delta = precomputed_delta
 
1244
                offset = 0
1192
1245
            if _mover is None:
1193
1246
                mover = _FileMover()
1194
1247
            else:
1195
1248
                mover = _mover
1196
1249
            try:
1197
 
                child_pb.update('Apply phase', 0, 2)
1198
 
                self._apply_removals(inventory_delta, mover)
1199
 
                child_pb.update('Apply phase', 1, 2)
1200
 
                modified_paths = self._apply_insertions(inventory_delta, mover)
 
1250
                child_pb.update('Apply phase', 0 + offset, 2 + offset)
 
1251
                self._apply_removals(mover)
 
1252
                child_pb.update('Apply phase', 1 + offset, 2 + offset)
 
1253
                modified_paths = self._apply_insertions(mover)
1201
1254
            except:
1202
1255
                mover.rollback()
1203
1256
                raise
1210
1263
        self.finalize()
1211
1264
        return _TransformResults(modified_paths, self.rename_count)
1212
1265
 
1213
 
    def _apply_removals(self, inventory_delta, mover):
 
1266
    def _generate_inventory_delta(self):
 
1267
        """Generate an inventory delta for the current transform."""
 
1268
        inventory_delta = []
 
1269
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
1270
        new_paths = self._inventory_altered()
 
1271
        total_entries = len(new_paths) + len(self._removed_id)
 
1272
        try:
 
1273
            for num, trans_id in enumerate(self._removed_id):
 
1274
                if (num % 10) == 0:
 
1275
                    child_pb.update('removing file', num, total_entries)
 
1276
                if trans_id == self._new_root:
 
1277
                    file_id = self._tree.get_root_id()
 
1278
                else:
 
1279
                    file_id = self.tree_file_id(trans_id)
 
1280
                # File-id isn't really being deleted, just moved
 
1281
                if file_id in self._r_new_id:
 
1282
                    continue
 
1283
                path = self._tree_id_paths[trans_id]
 
1284
                inventory_delta.append((path, None, file_id, None))
 
1285
            new_path_file_ids = dict((t, self.final_file_id(t)) for p, t in
 
1286
                                     new_paths)
 
1287
            entries = self._tree.iter_entries_by_dir(
 
1288
                new_path_file_ids.values())
 
1289
            old_paths = dict((e.file_id, p) for p, e in entries)
 
1290
            final_kinds = {}
 
1291
            for num, (path, trans_id) in enumerate(new_paths):
 
1292
                if (num % 10) == 0:
 
1293
                    child_pb.update('adding file',
 
1294
                                    num + len(self._removed_id), total_entries)
 
1295
                file_id = new_path_file_ids[trans_id]
 
1296
                if file_id is None:
 
1297
                    continue
 
1298
                needs_entry = False
 
1299
                try:
 
1300
                    kind = self.final_kind(trans_id)
 
1301
                except NoSuchFile:
 
1302
                    kind = self._tree.stored_kind(file_id)
 
1303
                parent_trans_id = self.final_parent(trans_id)
 
1304
                parent_file_id = new_path_file_ids.get(parent_trans_id)
 
1305
                if parent_file_id is None:
 
1306
                    parent_file_id = self.final_file_id(parent_trans_id)
 
1307
                if trans_id in self._new_reference_revision:
 
1308
                    new_entry = inventory.TreeReference(
 
1309
                        file_id,
 
1310
                        self._new_name[trans_id],
 
1311
                        self.final_file_id(self._new_parent[trans_id]),
 
1312
                        None, self._new_reference_revision[trans_id])
 
1313
                else:
 
1314
                    new_entry = inventory.make_entry(kind,
 
1315
                        self.final_name(trans_id),
 
1316
                        parent_file_id, file_id)
 
1317
                old_path = old_paths.get(new_entry.file_id)
 
1318
                new_executability = self._new_executability.get(trans_id)
 
1319
                if new_executability is not None:
 
1320
                    new_entry.executable = new_executability
 
1321
                inventory_delta.append(
 
1322
                    (old_path, path, new_entry.file_id, new_entry))
 
1323
        finally:
 
1324
            child_pb.finished()
 
1325
        return inventory_delta
 
1326
 
 
1327
    def _apply_removals(self, mover):
1214
1328
        """Perform tree operations that remove directory/inventory names.
1215
1329
 
1216
1330
        That is, delete files that are to be deleted, and put any files that
1217
1331
        need renaming into limbo.  This must be done in strict child-to-parent
1218
1332
        order.
 
1333
 
 
1334
        If inventory_delta is None, no inventory delta generation is performed.
1219
1335
        """
1220
1336
        tree_paths = list(self._tree_path_ids.iteritems())
1221
1337
        tree_paths.sort(reverse=True)
1237
1353
                            raise
1238
1354
                    else:
1239
1355
                        self.rename_count += 1
1240
 
                if trans_id in self._removed_id:
1241
 
                    if trans_id == self._new_root:
1242
 
                        file_id = self._tree.get_root_id()
1243
 
                    else:
1244
 
                        file_id = self.tree_file_id(trans_id)
1245
 
                    assert file_id is not None
1246
 
                    # File-id isn't really being deleted, just moved
1247
 
                    if file_id in self._r_new_id:
1248
 
                        continue
1249
 
                    inventory_delta.append((path, None, file_id, None))
1250
1356
        finally:
1251
1357
            child_pb.finished()
1252
1358
 
1253
 
    def _apply_insertions(self, inventory_delta, mover):
 
1359
    def _apply_insertions(self, mover):
1254
1360
        """Perform tree operations that insert directory/inventory names.
1255
1361
 
1256
1362
        That is, create any files that need to be created, and restore from
1257
1363
        limbo any files that needed renaming.  This must be done in strict
1258
1364
        parent-to-child order.
 
1365
 
 
1366
        If inventory_delta is None, no inventory delta is calculated, and
 
1367
        no list of modified paths is returned.
1259
1368
        """
1260
 
        new_paths = self.new_paths()
 
1369
        new_paths = self.new_paths(filesystem_only=True)
1261
1370
        modified_paths = []
 
1371
        new_path_file_ids = dict((t, self.final_file_id(t)) for p, t in
 
1372
                                 new_paths)
1262
1373
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1263
 
        completed_new = []
1264
1374
        try:
1265
1375
            for num, (path, trans_id) in enumerate(new_paths):
1266
 
                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:
1272
 
                        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
1278
 
                        else:
1279
 
                            self.rename_count += 1
 
1376
                if (num % 10) == 0:
 
1377
                    child_pb.update('adding file', num, len(new_paths))
 
1378
                full_path = self._tree.abspath(path)
 
1379
                if trans_id in self._needs_rename:
 
1380
                    try:
 
1381
                        mover.rename(self._limbo_name(trans_id), full_path)
 
1382
                    except OSError, e:
 
1383
                        # We may be renaming a dangling inventory id
 
1384
                        if e.errno != errno.ENOENT:
 
1385
                            raise
 
1386
                    else:
 
1387
                        self.rename_count += 1
 
1388
                if (trans_id in self._new_contents or
 
1389
                    self.path_changed(trans_id)):
1280
1390
                    if trans_id in self._new_contents:
1281
1391
                        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))
1308
 
 
1309
1392
                if trans_id in self._new_executability:
1310
 
                    self._set_executability(path, new_entry, trans_id)
 
1393
                    self._set_executability(path, trans_id)
1311
1394
        finally:
1312
1395
            child_pb.finished()
1313
 
        for trans_id in completed_new:
1314
 
            del self._new_contents[trans_id]
 
1396
        self._new_contents.clear()
1315
1397
        return modified_paths
1316
1398
 
1317
1399
 
1325
1407
 
1326
1408
    def __init__(self, tree, pb=DummyProgress(), case_sensitive=True):
1327
1409
        tree.lock_read()
1328
 
        limbodir = tempfile.mkdtemp(prefix='bzr-limbo-')
 
1410
        limbodir = osutils.mkdtemp(prefix='bzr-limbo-')
1329
1411
        TreeTransformBase.__init__(self, tree, limbodir, pb, case_sensitive)
1330
1412
 
1331
1413
    def canonical_path(self, path):
1354
1436
        except KeyError:
1355
1437
            return
1356
1438
        file_id = self.tree_file_id(parent_id)
1357
 
        for child in self._tree.inventory[file_id].children.iterkeys():
 
1439
        if file_id is None:
 
1440
            return
 
1441
        children = getattr(self._tree.inventory[file_id], 'children', {})
 
1442
        for child in children:
1358
1443
            childpath = joinpath(path, child)
1359
1444
            yield self.trans_id_tree_path(childpath)
1360
1445
 
1361
1446
 
1362
 
class _PreviewTree(object):
 
1447
class _PreviewTree(tree.Tree):
1363
1448
    """Partial implementation of Tree to support show_diff_trees"""
1364
1449
 
1365
1450
    def __init__(self, transform):
1366
1451
        self._transform = transform
 
1452
        self._final_paths = FinalPaths(transform)
 
1453
        self.__by_parent = None
 
1454
        self._parent_ids = []
 
1455
 
 
1456
    def _changes(self, file_id):
 
1457
        for changes in self._transform.iter_changes():
 
1458
            if changes[0] == file_id:
 
1459
                return changes
 
1460
 
 
1461
    def _content_change(self, file_id):
 
1462
        """Return True if the content of this file changed"""
 
1463
        changes = self._changes(file_id)
 
1464
        # changes[2] is true if the file content changed.  See
 
1465
        # InterTree.iter_changes.
 
1466
        return (changes is not None and changes[2])
 
1467
 
 
1468
    def _get_repository(self):
 
1469
        repo = getattr(self._transform._tree, '_repository', None)
 
1470
        if repo is None:
 
1471
            repo = self._transform._tree.branch.repository
 
1472
        return repo
 
1473
 
 
1474
    def _iter_parent_trees(self):
 
1475
        for revision_id in self.get_parent_ids():
 
1476
            try:
 
1477
                yield self.revision_tree(revision_id)
 
1478
            except errors.NoSuchRevisionInTree:
 
1479
                yield self._get_repository().revision_tree(revision_id)
 
1480
 
 
1481
    def _get_file_revision(self, file_id, vf, tree_revision):
 
1482
        parent_keys = [(file_id, self._file_revision(t, file_id)) for t in
 
1483
                       self._iter_parent_trees()]
 
1484
        vf.add_lines((file_id, tree_revision), parent_keys,
 
1485
                     self.get_file(file_id).readlines())
 
1486
        repo = self._get_repository()
 
1487
        base_vf = repo.texts
 
1488
        if base_vf not in vf.fallback_versionedfiles:
 
1489
            vf.fallback_versionedfiles.append(base_vf)
 
1490
        return tree_revision
 
1491
 
 
1492
    def _stat_limbo_file(self, file_id):
 
1493
        trans_id = self._transform.trans_id_file_id(file_id)
 
1494
        name = self._transform._limbo_name(trans_id)
 
1495
        return os.lstat(name)
 
1496
 
 
1497
    @property
 
1498
    def _by_parent(self):
 
1499
        if self.__by_parent is None:
 
1500
            self.__by_parent = self._transform.by_parent()
 
1501
        return self.__by_parent
1367
1502
 
1368
1503
    def lock_read(self):
1369
1504
        # Perhaps in theory, this should lock the TreeTransform?
1372
1507
    def unlock(self):
1373
1508
        pass
1374
1509
 
 
1510
    @property
 
1511
    def inventory(self):
 
1512
        """This Tree does not use inventory as its backing data."""
 
1513
        raise NotImplementedError(_PreviewTree.inventory)
 
1514
 
 
1515
    def get_root_id(self):
 
1516
        return self._transform.final_file_id(self._transform.root)
 
1517
 
 
1518
    def all_file_ids(self):
 
1519
        tree_ids = set(self._transform._tree.all_file_ids())
 
1520
        tree_ids.difference_update(self._transform.tree_file_id(t)
 
1521
                                   for t in self._transform._removed_id)
 
1522
        tree_ids.update(self._transform._new_id.values())
 
1523
        return tree_ids
 
1524
 
 
1525
    def __iter__(self):
 
1526
        return iter(self.all_file_ids())
 
1527
 
 
1528
    def paths2ids(self, specific_files, trees=None, require_versioned=False):
 
1529
        """See Tree.paths2ids"""
 
1530
        to_find = set(specific_files)
 
1531
        result = set()
 
1532
        for (file_id, paths, changed, versioned, parent, name, kind,
 
1533
             executable) in self._transform.iter_changes():
 
1534
            if paths[1] in to_find:
 
1535
                result.add(file_id)
 
1536
                to_find.remove(paths[1])
 
1537
        result.update(self._transform._tree.paths2ids(to_find,
 
1538
                      trees=[], require_versioned=require_versioned))
 
1539
        return result
 
1540
 
 
1541
    def _path2trans_id(self, path):
 
1542
        segments = splitpath(path)
 
1543
        cur_parent = self._transform.root
 
1544
        for cur_segment in segments:
 
1545
            for child in self._all_children(cur_parent):
 
1546
                if self._transform.final_name(child) == cur_segment:
 
1547
                    cur_parent = child
 
1548
                    break
 
1549
            else:
 
1550
                return None
 
1551
        return cur_parent
 
1552
 
 
1553
    def path2id(self, path):
 
1554
        return self._transform.final_file_id(self._path2trans_id(path))
 
1555
 
 
1556
    def id2path(self, file_id):
 
1557
        trans_id = self._transform.trans_id_file_id(file_id)
 
1558
        try:
 
1559
            return self._final_paths._determine_path(trans_id)
 
1560
        except NoFinalPath:
 
1561
            raise errors.NoSuchId(self, file_id)
 
1562
 
 
1563
    def _all_children(self, trans_id):
 
1564
        children = set(self._transform.iter_tree_children(trans_id))
 
1565
        # children in the _new_parent set are provided by _by_parent.
 
1566
        children.difference_update(self._transform._new_parent.keys())
 
1567
        children.update(self._by_parent.get(trans_id, []))
 
1568
        return children
 
1569
 
 
1570
    def _make_inv_entries(self, ordered_entries, specific_file_ids):
 
1571
        for trans_id, parent_file_id in ordered_entries:
 
1572
            file_id = self._transform.final_file_id(trans_id)
 
1573
            if file_id is None:
 
1574
                continue
 
1575
            if (specific_file_ids is not None
 
1576
                and file_id not in specific_file_ids):
 
1577
                continue
 
1578
            try:
 
1579
                kind = self._transform.final_kind(trans_id)
 
1580
            except NoSuchFile:
 
1581
                kind = self._transform._tree.stored_kind(file_id)
 
1582
            new_entry = inventory.make_entry(
 
1583
                kind,
 
1584
                self._transform.final_name(trans_id),
 
1585
                parent_file_id, file_id)
 
1586
            yield new_entry, trans_id
 
1587
 
 
1588
    def _list_files_by_dir(self):
 
1589
        todo = [ROOT_PARENT]
 
1590
        ordered_ids = []
 
1591
        while len(todo) > 0:
 
1592
            parent = todo.pop()
 
1593
            parent_file_id = self._transform.final_file_id(parent)
 
1594
            children = list(self._all_children(parent))
 
1595
            paths = dict(zip(children, self._final_paths.get_paths(children)))
 
1596
            children.sort(key=paths.get)
 
1597
            todo.extend(reversed(children))
 
1598
            for trans_id in children:
 
1599
                ordered_ids.append((trans_id, parent_file_id))
 
1600
        return ordered_ids
 
1601
 
 
1602
    def iter_entries_by_dir(self, specific_file_ids=None):
 
1603
        # This may not be a maximally efficient implementation, but it is
 
1604
        # reasonably straightforward.  An implementation that grafts the
 
1605
        # TreeTransform changes onto the tree's iter_entries_by_dir results
 
1606
        # might be more efficient, but requires tricky inferences about stack
 
1607
        # position.
 
1608
        ordered_ids = self._list_files_by_dir()
 
1609
        for entry, trans_id in self._make_inv_entries(ordered_ids,
 
1610
                                                      specific_file_ids):
 
1611
            yield unicode(self._final_paths.get_path(trans_id)), entry
 
1612
 
 
1613
    def list_files(self, include_root=False):
 
1614
        """See Tree.list_files."""
 
1615
        # XXX This should behave like WorkingTree.list_files, but is really
 
1616
        # more like RevisionTree.list_files.
 
1617
        for path, entry in self.iter_entries_by_dir():
 
1618
            if entry.name == '' and not include_root:
 
1619
                continue
 
1620
            yield path, 'V', entry.kind, entry.file_id, entry
 
1621
 
 
1622
    def kind(self, file_id):
 
1623
        trans_id = self._transform.trans_id_file_id(file_id)
 
1624
        return self._transform.final_kind(trans_id)
 
1625
 
 
1626
    def stored_kind(self, file_id):
 
1627
        trans_id = self._transform.trans_id_file_id(file_id)
 
1628
        try:
 
1629
            return self._transform._new_contents[trans_id]
 
1630
        except KeyError:
 
1631
            return self._transform._tree.stored_kind(file_id)
 
1632
 
 
1633
    def get_file_mtime(self, file_id, path=None):
 
1634
        """See Tree.get_file_mtime"""
 
1635
        if not self._content_change(file_id):
 
1636
            return self._transform._tree.get_file_mtime(file_id, path)
 
1637
        return self._stat_limbo_file(file_id).st_mtime
 
1638
 
 
1639
    def get_file_size(self, file_id):
 
1640
        """See Tree.get_file_size"""
 
1641
        if self.kind(file_id) == 'file':
 
1642
            return self._transform._tree.get_file_size(file_id)
 
1643
        else:
 
1644
            return None
 
1645
 
 
1646
    def get_file_sha1(self, file_id, path=None, stat_value=None):
 
1647
        return self._transform._tree.get_file_sha1(file_id)
 
1648
 
 
1649
    def is_executable(self, file_id, path=None):
 
1650
        trans_id = self._transform.trans_id_file_id(file_id)
 
1651
        try:
 
1652
            return self._transform._new_executability[trans_id]
 
1653
        except KeyError:
 
1654
            return self._transform._tree.is_executable(file_id, path)
 
1655
 
 
1656
    def path_content_summary(self, path):
 
1657
        trans_id = self._path2trans_id(path)
 
1658
        tt = self._transform
 
1659
        tree_path = tt._tree_id_paths.get(trans_id)
 
1660
        kind = tt._new_contents.get(trans_id)
 
1661
        if kind is None:
 
1662
            if tree_path is None or trans_id in tt._removed_contents:
 
1663
                return 'missing', None, None, None
 
1664
            summary = tt._tree.path_content_summary(tree_path)
 
1665
            kind, size, executable, link_or_sha1 = summary
 
1666
        else:
 
1667
            link_or_sha1 = None
 
1668
            limbo_name = tt._limbo_name(trans_id)
 
1669
            if trans_id in tt._new_reference_revision:
 
1670
                kind = 'tree-reference'
 
1671
            if kind == 'file':
 
1672
                statval = os.lstat(limbo_name)
 
1673
                size = statval.st_size
 
1674
                if not supports_executable():
 
1675
                    executable = None
 
1676
                else:
 
1677
                    executable = statval.st_mode & S_IEXEC
 
1678
            else:
 
1679
                size = None
 
1680
                executable = None
 
1681
            if kind == 'symlink':
 
1682
                link_or_sha1 = os.readlink(limbo_name)
 
1683
        if supports_executable():
 
1684
            executable = tt._new_executability.get(trans_id, executable)
 
1685
        return kind, size, executable, link_or_sha1
 
1686
 
1375
1687
    def iter_changes(self, from_tree, include_unchanged=False,
1376
1688
                      specific_files=None, pb=None, extra_trees=None,
1377
1689
                      require_versioned=True, want_unversioned=False):
1391
1703
            raise ValueError('want_unversioned is not supported')
1392
1704
        return self._transform.iter_changes()
1393
1705
 
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):
 
1706
    def get_file(self, file_id, path=None):
1405
1707
        """See Tree.get_file"""
 
1708
        if not self._content_change(file_id):
 
1709
            return self._transform._tree.get_file(file_id, path)
1406
1710
        trans_id = self._transform.trans_id_file_id(file_id)
1407
1711
        name = self._transform._limbo_name(trans_id)
1408
1712
        return open(name, 'rb')
1409
1713
 
 
1714
    def get_file_text(self, file_id):
 
1715
        text_file = self.get_file(file_id)
 
1716
        try:
 
1717
            return text_file.read()
 
1718
        finally:
 
1719
            text_file.close()
 
1720
 
 
1721
    def annotate_iter(self, file_id,
 
1722
                      default_revision=_mod_revision.CURRENT_REVISION):
 
1723
        changes = self._changes(file_id)
 
1724
        if changes is None:
 
1725
            get_old = True
 
1726
        else:
 
1727
            changed_content, versioned, kind = (changes[2], changes[3],
 
1728
                                                changes[6])
 
1729
            if kind[1] is None:
 
1730
                return None
 
1731
            get_old = (kind[0] == 'file' and versioned[0])
 
1732
        if get_old:
 
1733
            old_annotation = self._transform._tree.annotate_iter(file_id,
 
1734
                default_revision=default_revision)
 
1735
        else:
 
1736
            old_annotation = []
 
1737
        if changes is None:
 
1738
            return old_annotation
 
1739
        if not changed_content:
 
1740
            return old_annotation
 
1741
        return annotate.reannotate([old_annotation],
 
1742
                                   self.get_file(file_id).readlines(),
 
1743
                                   default_revision)
 
1744
 
1410
1745
    def get_symlink_target(self, file_id):
1411
1746
        """See Tree.get_symlink_target"""
 
1747
        if not self._content_change(file_id):
 
1748
            return self._transform._tree.get_symlink_target(file_id)
1412
1749
        trans_id = self._transform.trans_id_file_id(file_id)
1413
1750
        name = self._transform._limbo_name(trans_id)
1414
1751
        return os.readlink(name)
1415
1752
 
1416
 
    def paths2ids(self, specific_files, trees=None, require_versioned=False):
1417
 
        """See Tree.paths2ids"""
1418
 
        return 'not_empty'
 
1753
    def walkdirs(self, prefix=''):
 
1754
        pending = [self._transform.root]
 
1755
        while len(pending) > 0:
 
1756
            parent_id = pending.pop()
 
1757
            children = []
 
1758
            subdirs = []
 
1759
            prefix = prefix.rstrip('/')
 
1760
            parent_path = self._final_paths.get_path(parent_id)
 
1761
            parent_file_id = self._transform.final_file_id(parent_id)
 
1762
            for child_id in self._all_children(parent_id):
 
1763
                path_from_root = self._final_paths.get_path(child_id)
 
1764
                basename = self._transform.final_name(child_id)
 
1765
                file_id = self._transform.final_file_id(child_id)
 
1766
                try:
 
1767
                    kind = self._transform.final_kind(child_id)
 
1768
                    versioned_kind = kind
 
1769
                except NoSuchFile:
 
1770
                    kind = 'unknown'
 
1771
                    versioned_kind = self._transform._tree.stored_kind(file_id)
 
1772
                if versioned_kind == 'directory':
 
1773
                    subdirs.append(child_id)
 
1774
                children.append((path_from_root, basename, kind, None,
 
1775
                                 file_id, versioned_kind))
 
1776
            children.sort()
 
1777
            if parent_path.startswith(prefix):
 
1778
                yield (parent_path, parent_file_id), children
 
1779
            pending.extend(sorted(subdirs, key=self._final_paths.get_path,
 
1780
                                  reverse=True))
 
1781
 
 
1782
    def get_parent_ids(self):
 
1783
        return self._parent_ids
 
1784
 
 
1785
    def set_parent_ids(self, parent_ids):
 
1786
        self._parent_ids = parent_ids
 
1787
 
 
1788
    def get_revision_tree(self, revision_id):
 
1789
        return self._transform._tree.get_revision_tree(revision_id)
1419
1790
 
1420
1791
 
1421
1792
def joinpath(parent, child):
1453
1824
            self._known_paths[trans_id] = self._determine_path(trans_id)
1454
1825
        return self._known_paths[trans_id]
1455
1826
 
 
1827
    def get_paths(self, trans_ids):
 
1828
        return [(self.get_path(t), t) for t in trans_ids]
 
1829
 
 
1830
 
1456
1831
 
1457
1832
def topology_sorted_ids(tree):
1458
1833
    """Determine the topological order of the ids in a tree"""
1461
1836
    return file_ids
1462
1837
 
1463
1838
 
1464
 
def build_tree(tree, wt, accelerator_tree=None, hardlink=False):
 
1839
def build_tree(tree, wt, accelerator_tree=None, hardlink=False,
 
1840
               delta_from_tree=False):
1465
1841
    """Create working tree for a branch, using a TreeTransform.
1466
1842
    
1467
1843
    This function should be used on empty trees, having a tree root at most.
1483
1859
    :param hardlink: If true, hard-link files to accelerator_tree, where
1484
1860
        possible.  accelerator_tree must implement abspath, i.e. be a
1485
1861
        working tree.
 
1862
    :param delta_from_tree: If true, build_tree may use the input Tree to
 
1863
        generate the inventory delta.
1486
1864
    """
1487
1865
    wt.lock_tree_write()
1488
1866
    try:
1491
1869
            if accelerator_tree is not None:
1492
1870
                accelerator_tree.lock_read()
1493
1871
            try:
1494
 
                return _build_tree(tree, wt, accelerator_tree, hardlink)
 
1872
                return _build_tree(tree, wt, accelerator_tree, hardlink,
 
1873
                                   delta_from_tree)
1495
1874
            finally:
1496
1875
                if accelerator_tree is not None:
1497
1876
                    accelerator_tree.unlock()
1501
1880
        wt.unlock()
1502
1881
 
1503
1882
 
1504
 
def _build_tree(tree, wt, accelerator_tree, hardlink):
 
1883
def _build_tree(tree, wt, accelerator_tree, hardlink, delta_from_tree):
1505
1884
    """See build_tree."""
1506
1885
    for num, _unused in enumerate(wt.all_file_ids()):
1507
1886
        if num > 0:  # more than just a root
1508
1887
            raise errors.WorkingTreeAlreadyPopulated(base=wt.basedir)
 
1888
    existing_files = set()
 
1889
    for dir, files in wt.walkdirs():
 
1890
        existing_files.update(f[0] for f in files)
1509
1891
    file_trans_id = {}
1510
1892
    top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1511
1893
    pp = ProgressPhase("Build phase", 2, top_pb)
1530
1912
        try:
1531
1913
            deferred_contents = []
1532
1914
            num = 0
 
1915
            total = len(tree.inventory)
 
1916
            if delta_from_tree:
 
1917
                precomputed_delta = []
 
1918
            else:
 
1919
                precomputed_delta = None
1533
1920
            for num, (tree_path, entry) in \
1534
1921
                enumerate(tree.inventory.iter_entries_by_dir()):
1535
 
                pb.update("Building tree", num - len(deferred_contents),
1536
 
                          len(tree.inventory))
 
1922
                pb.update("Building tree", num - len(deferred_contents), total)
1537
1923
                if entry.parent_id is None:
1538
1924
                    continue
1539
1925
                reparent = False
1540
1926
                file_id = entry.file_id
1541
 
                target_path = wt.abspath(tree_path)
1542
 
                try:
 
1927
                if delta_from_tree:
 
1928
                    precomputed_delta.append((None, tree_path, file_id, entry))
 
1929
                if tree_path in existing_files:
 
1930
                    target_path = wt.abspath(tree_path)
1543
1931
                    kind = file_kind(target_path)
1544
 
                except NoSuchFile:
1545
 
                    pass
1546
 
                else:
1547
1932
                    if kind == "directory":
1548
1933
                        try:
1549
1934
                            bzrdir.BzrDir.open(target_path)
1557
1942
                        tt.delete_contents(tt.trans_id_tree_path(tree_path))
1558
1943
                        if kind == 'directory':
1559
1944
                            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
1945
                parent_id = file_trans_id[entry.parent_id]
1565
1946
                if entry.kind == 'file':
1566
1947
                    # We *almost* replicate new_by_entry, so that we can defer
1567
1948
                    # getting the file text, and get them all at once.
1568
1949
                    trans_id = tt.create_path(entry.name, parent_id)
1569
1950
                    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:
 
1951
                    tt.version_file(file_id, trans_id)
 
1952
                    executable = tree.is_executable(file_id, tree_path)
 
1953
                    if executable:
1573
1954
                        tt.set_executability(executable, trans_id)
1574
 
                    deferred_contents.append((entry.file_id, trans_id))
 
1955
                    deferred_contents.append((file_id, trans_id))
1575
1956
                else:
1576
1957
                    file_trans_id[file_id] = new_by_entry(tt, entry, parent_id,
1577
1958
                                                          tree)
1588
1969
        divert_trans = set(file_trans_id[f] for f in divert)
1589
1970
        resolver = lambda t, c: resolve_checkout(t, c, divert_trans)
1590
1971
        raw_conflicts = resolve_conflicts(tt, pass_func=resolver)
 
1972
        if len(raw_conflicts) > 0:
 
1973
            precomputed_delta = None
1591
1974
        conflicts = cook_conflicts(raw_conflicts, tt)
1592
1975
        for conflict in conflicts:
1593
1976
            warning(conflict)
1595
1978
            wt.add_conflicts(conflicts)
1596
1979
        except errors.UnsupportedOperation:
1597
1980
            pass
1598
 
        result = tt.apply(no_conflicts=True)
 
1981
        result = tt.apply(no_conflicts=True,
 
1982
                          precomputed_delta=precomputed_delta)
1599
1983
    finally:
1600
1984
        tt.finalize()
1601
1985
        top_pb.finished()
1644
2028
    by_parent = tt.by_parent()
1645
2029
    for child in by_parent[old_parent]:
1646
2030
        tt.adjust_path(tt.final_name(child), new_parent, child)
 
2031
    return by_parent[old_parent]
1647
2032
 
1648
2033
def _content_match(tree, entry, file_id, kind, target_path):
1649
2034
    if entry.kind != kind:
1663
2048
    new_conflicts = set()
1664
2049
    for c_type, conflict in ((c[0], c) for c in conflicts):
1665
2050
        # Anything but a 'duplicate' would indicate programmer error
1666
 
        assert c_type == 'duplicate', c_type
 
2051
        if c_type != 'duplicate':
 
2052
            raise AssertionError(c_type)
1667
2053
        # Now figure out which is new and which is old
1668
2054
        if tt.new_contents(conflict[1]):
1669
2055
            new_file = conflict[1]
1727
2113
        tt.set_executability(entry.executable, trans_id)
1728
2114
 
1729
2115
 
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
2116
def get_backup_name(entry, by_parent, parent_trans_id, tt):
1792
2117
    return _get_backup_name(entry.name, by_parent, parent_trans_id, tt)
1793
2118
 
1838
2163
    tt = TreeTransform(working_tree, pb)
1839
2164
    try:
1840
2165
        pp = ProgressPhase("Revert phase", 3, pb)
1841
 
        pp.next_phase()
1842
 
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1843
 
        try:
1844
 
            merge_modified = _alter_files(working_tree, target_tree, tt,
1845
 
                                          child_pb, filenames, backups)
1846
 
        finally:
1847
 
            child_pb.finished()
1848
 
        pp.next_phase()
1849
 
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1850
 
        try:
1851
 
            raw_conflicts = resolve_conflicts(tt, child_pb,
1852
 
                lambda t, c: conflict_pass(t, c, target_tree))
1853
 
        finally:
1854
 
            child_pb.finished()
1855
 
        conflicts = cook_conflicts(raw_conflicts, tt)
 
2166
        conflicts, merge_modified = _prepare_revert_transform(
 
2167
            working_tree, target_tree, tt, filenames, backups, pp)
1856
2168
        if change_reporter:
1857
2169
            change_reporter = delta._ChangeReporter(
1858
2170
                unversioned_filter=working_tree.is_ignored)
1869
2181
    return conflicts
1870
2182
 
1871
2183
 
 
2184
def _prepare_revert_transform(working_tree, target_tree, tt, filenames,
 
2185
                              backups, pp, basis_tree=None,
 
2186
                              merge_modified=None):
 
2187
    pp.next_phase()
 
2188
    child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
2189
    try:
 
2190
        if merge_modified is None:
 
2191
            merge_modified = working_tree.merge_modified()
 
2192
        merge_modified = _alter_files(working_tree, target_tree, tt,
 
2193
                                      child_pb, filenames, backups,
 
2194
                                      merge_modified, basis_tree)
 
2195
    finally:
 
2196
        child_pb.finished()
 
2197
    pp.next_phase()
 
2198
    child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
2199
    try:
 
2200
        raw_conflicts = resolve_conflicts(tt, child_pb,
 
2201
            lambda t, c: conflict_pass(t, c, target_tree))
 
2202
    finally:
 
2203
        child_pb.finished()
 
2204
    conflicts = cook_conflicts(raw_conflicts, tt)
 
2205
    return conflicts, merge_modified
 
2206
 
 
2207
 
1872
2208
def _alter_files(working_tree, target_tree, tt, pb, specific_files,
1873
 
                 backups):
1874
 
    merge_modified = working_tree.merge_modified()
 
2209
                 backups, merge_modified, basis_tree=None):
 
2210
    if basis_tree is not None:
 
2211
        basis_tree.lock_read()
1875
2212
    change_list = target_tree.iter_changes(working_tree,
1876
2213
        specific_files=specific_files, pb=pb)
1877
 
    if target_tree.inventory.root is None:
 
2214
    if target_tree.get_root_id() is None:
1878
2215
        skip_root = True
1879
2216
    else:
1880
2217
        skip_root = False
1881
 
    basis_tree = None
1882
2218
    try:
1883
2219
        deferred_files = []
1884
2220
        for id_num, (file_id, path, changed_content, versioned, parent, name,
1920
2256
                        # contents
1921
2257
                        mode_id = trans_id
1922
2258
                        trans_id = new_trans_id
1923
 
                if kind[1] == 'directory':
 
2259
                if kind[1] in ('directory', 'tree-reference'):
1924
2260
                    tt.create_directory(trans_id)
 
2261
                    if kind[1] == 'tree-reference':
 
2262
                        revision = target_tree.get_reference_revision(file_id,
 
2263
                                                                      path[1])
 
2264
                        tt.set_tree_reference(revision, trans_id)
1925
2265
                elif kind[1] == 'symlink':
1926
2266
                    tt.create_symlink(target_tree.get_symlink_target(file_id),
1927
2267
                                      trans_id)
1941
2281
                    # preserve the execute bit when backing up
1942
2282
                    if keep_content and executable[0] == executable[1]:
1943
2283
                        tt.set_executability(executable[1], trans_id)
1944
 
                else:
1945
 
                    assert kind[1] is None
 
2284
                elif kind[1] is not None:
 
2285
                    raise AssertionError(kind[1])
1946
2286
            if versioned == (False, True):
1947
2287
                tt.version_file(file_id, trans_id)
1948
2288
            if versioned == (True, False):
1949
2289
                tt.unversion_file(trans_id)
1950
 
            if (name[1] is not None and 
 
2290
            if (name[1] is not None and
1951
2291
                (name[0] != name[1] or parent[0] != parent[1])):
1952
 
                tt.adjust_path(
1953
 
                    name[1], tt.trans_id_file_id(parent[1]), trans_id)
 
2292
                if name[1] == '' and parent[1] is None:
 
2293
                    parent_trans = ROOT_PARENT
 
2294
                else:
 
2295
                    parent_trans = tt.trans_id_file_id(parent[1])
 
2296
                tt.adjust_path(name[1], parent_trans, trans_id)
1954
2297
            if executable[0] != executable[1] and kind[1] == "file":
1955
2298
                tt.set_executability(executable[1], trans_id)
1956
2299
        for (trans_id, mode_id), bytes in target_tree.iter_files_bytes(
2019
2362
                new_conflicts.add(('deleting parent', 'Not deleting', 
2020
2363
                                   trans_id))
2021
2364
            except KeyError:
2022
 
                tt.create_directory(trans_id)
2023
 
                new_conflicts.add((c_type, 'Created directory', trans_id))
 
2365
                create = True
2024
2366
                try:
2025
2367
                    tt.final_name(trans_id)
2026
2368
                except NoFinalPath:
2027
2369
                    if path_tree is not None:
2028
2370
                        file_id = tt.final_file_id(trans_id)
 
2371
                        if file_id is None:
 
2372
                            file_id = tt.inactive_file_id(trans_id)
2029
2373
                        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)
 
2374
                        # special-case the other tree root (move its
 
2375
                        # children to current root)
 
2376
                        if entry.parent_id is None:
 
2377
                            create=False
 
2378
                            moved = _reparent_transform_children(
 
2379
                                tt, trans_id, tt.root)
 
2380
                            for child in moved:
 
2381
                                new_conflicts.add((c_type, 'Moved to root',
 
2382
                                                   child))
 
2383
                        else:
 
2384
                            parent_trans_id = tt.trans_id_file_id(
 
2385
                                entry.parent_id)
 
2386
                            tt.adjust_path(entry.name, parent_trans_id,
 
2387
                                           trans_id)
 
2388
                if create:
 
2389
                    tt.create_directory(trans_id)
 
2390
                    new_conflicts.add((c_type, 'Created directory', trans_id))
2032
2391
        elif c_type == 'unversioned parent':
2033
 
            tt.version_file(tt.inactive_file_id(conflict[1]), conflict[1])
 
2392
            file_id = tt.inactive_file_id(conflict[1])
 
2393
            # special-case the other tree root (move its children instead)
 
2394
            if path_tree and file_id in path_tree:
 
2395
                if path_tree.inventory[file_id].parent_id is None:
 
2396
                    continue
 
2397
            tt.version_file(file_id, conflict[1])
2034
2398
            new_conflicts.add((c_type, 'Versioned directory', conflict[1]))
2035
2399
        elif c_type == 'non-directory parent':
2036
2400
            parent_id = conflict[1]
2043
2407
            if parent_file_id is not None:
2044
2408
                tt.unversion_file(parent_id)
2045
2409
            new_conflicts.add((c_type, 'Created directory', new_parent_id))
 
2410
        elif c_type == 'versioning no contents':
 
2411
            tt.cancel_versioning(conflict[1])
2046
2412
    return new_conflicts
2047
2413
 
2048
2414