← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

  • Committer: Aaron Bentley
  • Date: 2012-07-19 15:44:55 UTC
  • mto: This revision was merged to the branch mainline in revision 6540.
  • Revision ID: aaron@aaronbentley.com-20120719154455-j7y8fm7o9y95vo38
Eliminate get_stored_uncommitted from API.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
1
 
# Copyright (C) 2007-2010 Canonical Ltd
 
1
# Copyright (C) 2007-2011 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
22
22
WorkingTree.open(dir).
23
23
"""
24
24
 
 
25
from __future__ import absolute_import
 
26
 
25
27
from cStringIO import StringIO
26
28
import os
27
29
import sys
31
33
import errno
32
34
import stat
33
35
 
34
 
import bzrlib
35
36
from bzrlib import (
36
37
    bzrdir,
37
38
    cache_utf8,
 
39
    config,
 
40
    conflicts as _mod_conflicts,
 
41
    controldir,
38
42
    debug,
39
43
    dirstate,
40
44
    errors,
 
45
    filters as _mod_filters,
41
46
    generate_ids,
42
47
    osutils,
43
48
    revision as _mod_revision,
46
51
    transform,
47
52
    views,
48
53
    )
49
 
import bzrlib.branch
50
 
import bzrlib.ui
51
54
""")
52
55
 
53
56
from bzrlib.decorators import needs_read_lock, needs_write_lock
54
 
from bzrlib.filters import filtered_input_file, internal_size_sha_file_byname
55
57
from bzrlib.inventory import Inventory, ROOT_ID, entry_factory
56
 
from bzrlib.mutabletree import needs_tree_write_lock
 
58
from bzrlib.lock import LogicalLockResult
 
59
from bzrlib.lockable_files import LockableFiles
 
60
from bzrlib.lockdir import LockDir
 
61
from bzrlib.mutabletree import (
 
62
    MutableTree,
 
63
    needs_tree_write_lock,
 
64
    )
57
65
from bzrlib.osutils import (
58
66
    file_kind,
59
67
    isdir,
61
69
    realpath,
62
70
    safe_unicode,
63
71
    )
64
 
from bzrlib.trace import mutter
 
72
from bzrlib.symbol_versioning import (
 
73
    deprecated_in,
 
74
    deprecated_method,
 
75
    )
65
76
from bzrlib.transport.local import LocalTransport
66
 
from bzrlib.tree import InterTree
67
 
from bzrlib.tree import Tree
68
 
from bzrlib.workingtree import WorkingTree, WorkingTree3, WorkingTreeFormat3
69
 
 
70
 
 
71
 
class DirStateWorkingTree(WorkingTree3):
 
77
from bzrlib.tree import (
 
78
    InterTree,
 
79
    InventoryTree,
 
80
    )
 
81
from bzrlib.workingtree import (
 
82
    InventoryWorkingTree,
 
83
    WorkingTree,
 
84
    WorkingTreeFormatMetaDir,
 
85
    )
 
86
 
 
87
 
 
88
class DirStateWorkingTree(InventoryWorkingTree):
 
89
 
72
90
    def __init__(self, basedir,
73
91
                 branch,
74
92
                 _control_files=None,
84
102
        self._format = _format
85
103
        self.bzrdir = _bzrdir
86
104
        basedir = safe_unicode(basedir)
87
 
        mutter("opening working tree %r", basedir)
 
105
        trace.mutter("opening working tree %r", basedir)
88
106
        self._branch = branch
89
107
        self.basedir = realpath(basedir)
90
108
        # if branch is at our basedir and is a format 6 or less
124
142
            state.add(f, file_id, kind, None, '')
125
143
        self._make_dirty(reset_inventory=True)
126
144
 
 
145
    def _get_check_refs(self):
 
146
        """Return the references needed to perform a check of this tree."""
 
147
        return [('trees', self.last_revision())]
 
148
 
127
149
    def _make_dirty(self, reset_inventory):
128
150
        """Make the tree state dirty.
129
151
 
181
203
 
182
204
    def _comparison_data(self, entry, path):
183
205
        kind, executable, stat_value = \
184
 
            WorkingTree3._comparison_data(self, entry, path)
 
206
            WorkingTree._comparison_data(self, entry, path)
185
207
        # it looks like a plain directory, but it's really a reference -- see
186
208
        # also kind()
187
209
        if (self._repo_supports_tree_reference and kind == 'directory'
193
215
    def commit(self, message=None, revprops=None, *args, **kwargs):
194
216
        # mark the tree as dirty post commit - commit
195
217
        # can change the current versioned list by doing deletes.
196
 
        result = WorkingTree3.commit(self, message, revprops, *args, **kwargs)
 
218
        result = WorkingTree.commit(self, message, revprops, *args, **kwargs)
197
219
        self._make_dirty(reset_inventory=True)
198
220
        return result
199
221
 
218
240
        local_path = self.bzrdir.get_workingtree_transport(None
219
241
            ).local_abspath('dirstate')
220
242
        self._dirstate = dirstate.DirState.on_file(local_path,
221
 
            self._sha1_provider())
 
243
            self._sha1_provider(), self._worth_saving_limit())
222
244
        return self._dirstate
223
245
 
224
246
    def _sha1_provider(self):
233
255
        else:
234
256
            return None
235
257
 
 
258
    def _worth_saving_limit(self):
 
259
        """How many hash changes are ok before we must save the dirstate.
 
260
 
 
261
        :return: an integer. -1 means never save.
 
262
        """
 
263
        conf = self.get_config_stack()
 
264
        return conf.get('bzr.workingtree.worth_saving_limit')
 
265
 
236
266
    def filter_unversioned_files(self, paths):
237
267
        """Filter out paths that are versioned.
238
268
 
368
398
        state = self.current_dirstate()
369
399
        if stat_value is None:
370
400
            try:
371
 
                stat_value = os.lstat(file_abspath)
 
401
                stat_value = osutils.lstat(file_abspath)
372
402
            except OSError, e:
373
403
                if e.errno == errno.ENOENT:
374
404
                    return None
389
419
                return link_or_sha1
390
420
        return None
391
421
 
392
 
    def _get_inventory(self):
 
422
    def _get_root_inventory(self):
393
423
        """Get the inventory for the tree. This is only valid within a lock."""
394
424
        if 'evil' in debug.debug_flags:
395
425
            trace.mutter_callsite(2,
400
430
        self._generate_inventory()
401
431
        return self._inventory
402
432
 
 
433
    @deprecated_method(deprecated_in((2, 5, 0)))
 
434
    def _get_inventory(self):
 
435
        return self.root_inventory
 
436
 
403
437
    inventory = property(_get_inventory,
404
438
                         doc="Inventory of this Tree")
405
439
 
 
440
    root_inventory = property(_get_root_inventory,
 
441
        "Root inventory of this tree")
 
442
 
406
443
    @needs_read_lock
407
444
    def get_parent_ids(self):
408
445
        """See Tree.get_parent_ids.
455
492
            return False # Missing entries are not executable
456
493
        return entry[1][0][3] # Executable?
457
494
 
458
 
    if not osutils.supports_executable():
459
 
        def is_executable(self, file_id, path=None):
460
 
            """Test if a file is executable or not.
 
495
    def is_executable(self, file_id, path=None):
 
496
        """Test if a file is executable or not.
461
497
 
462
 
            Note: The caller is expected to take a read-lock before calling this.
463
 
            """
 
498
        Note: The caller is expected to take a read-lock before calling this.
 
499
        """
 
500
        if not self._supports_executable():
464
501
            entry = self._get_entry(file_id=file_id, path=path)
465
502
            if entry == (None, None):
466
503
                return False
467
504
            return entry[1][0][3]
468
 
 
469
 
        _is_executable_from_path_and_stat = \
470
 
            _is_executable_from_path_and_stat_from_basis
471
 
    else:
472
 
        def is_executable(self, file_id, path=None):
473
 
            """Test if a file is executable or not.
474
 
 
475
 
            Note: The caller is expected to take a read-lock before calling this.
476
 
            """
 
505
        else:
477
506
            self._must_be_locked()
478
507
            if not path:
479
508
                path = self.id2path(file_id)
480
 
            mode = os.lstat(self.abspath(path)).st_mode
 
509
            mode = osutils.lstat(self.abspath(path)).st_mode
481
510
            return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
482
511
 
483
512
    def all_file_ids(self):
567
596
            return _mod_revision.NULL_REVISION
568
597
 
569
598
    def lock_read(self):
570
 
        """See Branch.lock_read, and WorkingTree.unlock."""
 
599
        """See Branch.lock_read, and WorkingTree.unlock.
 
600
 
 
601
        :return: A bzrlib.lock.LogicalLockResult.
 
602
        """
571
603
        self.branch.lock_read()
572
604
        try:
573
605
            self._control_files.lock_read()
586
618
        except:
587
619
            self.branch.unlock()
588
620
            raise
 
621
        return LogicalLockResult(self.unlock)
589
622
 
590
623
    def _lock_self_write(self):
591
624
        """This should be called after the branch is locked."""
606
639
        except:
607
640
            self.branch.unlock()
608
641
            raise
 
642
        return LogicalLockResult(self.unlock)
609
643
 
610
644
    def lock_tree_write(self):
611
 
        """See MutableTree.lock_tree_write, and WorkingTree.unlock."""
 
645
        """See MutableTree.lock_tree_write, and WorkingTree.unlock.
 
646
 
 
647
        :return: A bzrlib.lock.LogicalLockResult.
 
648
        """
612
649
        self.branch.lock_read()
613
 
        self._lock_self_write()
 
650
        return self._lock_self_write()
614
651
 
615
652
    def lock_write(self):
616
 
        """See MutableTree.lock_write, and WorkingTree.unlock."""
 
653
        """See MutableTree.lock_write, and WorkingTree.unlock.
 
654
 
 
655
        :return: A bzrlib.lock.LogicalLockResult.
 
656
        """
617
657
        self.branch.lock_write()
618
 
        self._lock_self_write()
 
658
        return self._lock_self_write()
619
659
 
620
660
    @needs_tree_write_lock
621
661
    def move(self, from_paths, to_dir, after=False):
652
692
 
653
693
        if self._inventory is not None:
654
694
            update_inventory = True
655
 
            inv = self.inventory
 
695
            inv = self.root_inventory
656
696
            to_dir_id = to_entry[0][2]
657
697
            to_dir_ie = inv[to_dir_id]
658
698
        else:
838
878
                rollback_rename()
839
879
                raise
840
880
            result.append((from_rel, to_rel))
841
 
            state._dirblock_state = dirstate.DirState.IN_MEMORY_MODIFIED
 
881
            state._mark_modified()
842
882
            self._make_dirty(reset_inventory=False)
843
883
 
844
884
        return result
854
894
    @needs_read_lock
855
895
    def path2id(self, path):
856
896
        """Return the id for path in this tree."""
 
897
        if isinstance(path, list):
 
898
            if path == []:
 
899
                path = [""]
 
900
            path = osutils.pathjoin(*path)
857
901
        path = path.strip('/')
858
902
        entry = self._get_entry(path=path)
859
903
        if entry == (None, None):
937
981
                    all_versioned = False
938
982
                    break
939
983
            if not all_versioned:
940
 
                raise errors.PathsNotVersionedError(paths)
 
984
                raise errors.PathsNotVersionedError(
 
985
                    [p.decode('utf-8') for p in paths])
941
986
        # -- remove redundancy in supplied paths to prevent over-scanning --
942
987
        search_paths = osutils.minimum_path_selection(paths)
943
988
        # sketch:
992
1037
            found_dir_names = set(dir_name_id[:2] for dir_name_id in found)
993
1038
            for dir_name in split_paths:
994
1039
                if dir_name not in found_dir_names:
995
 
                    raise errors.PathsNotVersionedError(paths)
 
1040
                    raise errors.PathsNotVersionedError(
 
1041
                        [p.decode('utf-8') for p in paths])
996
1042
 
997
1043
        for dir_name_id, trees_info in found.iteritems():
998
1044
            for index in search_indexes:
1005
1051
 
1006
1052
        This is a meaningless operation for dirstate, but we obey it anyhow.
1007
1053
        """
1008
 
        return self.inventory
 
1054
        return self.root_inventory
1009
1055
 
1010
1056
    @needs_read_lock
1011
1057
    def revision_tree(self, revision_id):
1101
1147
                        _mod_revision.NULL_REVISION)))
1102
1148
                ghosts.append(rev_id)
1103
1149
            accepted_revisions.add(rev_id)
1104
 
        dirstate.set_parent_trees(real_trees, ghosts=ghosts)
 
1150
        updated = False
 
1151
        if (len(real_trees) == 1
 
1152
            and not ghosts
 
1153
            and self.branch.repository._format.fast_deltas
 
1154
            and isinstance(real_trees[0][1],
 
1155
                revisiontree.InventoryRevisionTree)
 
1156
            and self.get_parent_ids()):
 
1157
            rev_id, rev_tree = real_trees[0]
 
1158
            basis_id = self.get_parent_ids()[0]
 
1159
            # There are times when basis_tree won't be in
 
1160
            # self.branch.repository, (switch, for example)
 
1161
            try:
 
1162
                basis_tree = self.branch.repository.revision_tree(basis_id)
 
1163
            except errors.NoSuchRevision:
 
1164
                # Fall back to the set_parent_trees(), since we can't use
 
1165
                # _make_delta if we can't get the RevisionTree
 
1166
                pass
 
1167
            else:
 
1168
                delta = rev_tree.root_inventory._make_delta(
 
1169
                    basis_tree.root_inventory)
 
1170
                dirstate.update_basis_by_delta(delta, rev_id)
 
1171
                updated = True
 
1172
        if not updated:
 
1173
            dirstate.set_parent_trees(real_trees, ghosts=ghosts)
1105
1174
        self._make_dirty(reset_inventory=False)
1106
1175
 
1107
1176
    def _set_root_id(self, file_id):
1127
1196
 
1128
1197
    def unlock(self):
1129
1198
        """Unlock in format 4 trees needs to write the entire dirstate."""
1130
 
        # do non-implementation specific cleanup
1131
 
        self._cleanup()
1132
 
 
1133
1199
        if self._control_files._lock_count == 1:
 
1200
            # do non-implementation specific cleanup
 
1201
            self._cleanup()
 
1202
 
1134
1203
            # eventually we should do signature checking during read locks for
1135
1204
            # dirstate updates.
1136
1205
            if self._control_files._lock_mode == 'w':
1235
1304
        # have to change the legacy inventory too.
1236
1305
        if self._inventory is not None:
1237
1306
            for file_id in file_ids:
1238
 
                self._inventory.remove_recursive_id(file_id)
 
1307
                if self._inventory.has_id(file_id):
 
1308
                    self._inventory.remove_recursive_id(file_id)
1239
1309
 
1240
1310
    @needs_tree_write_lock
1241
1311
    def rename_one(self, from_rel, to_rel, after=False):
1242
1312
        """See WorkingTree.rename_one"""
1243
1313
        self.flush()
1244
 
        WorkingTree.rename_one(self, from_rel, to_rel, after)
 
1314
        super(DirStateWorkingTree, self).rename_one(from_rel, to_rel, after)
1245
1315
 
1246
1316
    @needs_tree_write_lock
1247
1317
    def apply_inventory_delta(self, changes):
1273
1343
        # being created.
1274
1344
        self._inventory = None
1275
1345
        # generate a delta,
1276
 
        delta = inv._make_delta(self.inventory)
 
1346
        delta = inv._make_delta(self.root_inventory)
1277
1347
        # and apply it.
1278
1348
        self.apply_inventory_delta(delta)
1279
1349
        if had_inventory:
1280
1350
            self._inventory = inv
1281
1351
        self.flush()
1282
1352
 
 
1353
    @needs_tree_write_lock
 
1354
    def reset_state(self, revision_ids=None):
 
1355
        """Reset the state of the working tree.
 
1356
 
 
1357
        This does a hard-reset to a last-known-good state. This is a way to
 
1358
        fix if something got corrupted (like the .bzr/checkout/dirstate file)
 
1359
        """
 
1360
        if revision_ids is None:
 
1361
            revision_ids = self.get_parent_ids()
 
1362
        if not revision_ids:
 
1363
            base_tree = self.branch.repository.revision_tree(
 
1364
                _mod_revision.NULL_REVISION)
 
1365
            trees = []
 
1366
        else:
 
1367
            trees = zip(revision_ids,
 
1368
                        self.branch.repository.revision_trees(revision_ids))
 
1369
            base_tree = trees[0][1]
 
1370
        state = self.current_dirstate()
 
1371
        # We don't support ghosts yet
 
1372
        state.set_state_from_scratch(base_tree.root_inventory, trees, [])
 
1373
 
1283
1374
 
1284
1375
class ContentFilterAwareSHA1Provider(dirstate.SHA1Provider):
1285
1376
 
1290
1381
        """See dirstate.SHA1Provider.sha1()."""
1291
1382
        filters = self.tree._content_filter_stack(
1292
1383
            self.tree.relpath(osutils.safe_unicode(abspath)))
1293
 
        return internal_size_sha_file_byname(abspath, filters)[1]
 
1384
        return _mod_filters.internal_size_sha_file_byname(abspath, filters)[1]
1294
1385
 
1295
1386
    def stat_and_sha1(self, abspath):
1296
1387
        """See dirstate.SHA1Provider.stat_and_sha1()."""
1300
1391
        try:
1301
1392
            statvalue = os.fstat(file_obj.fileno())
1302
1393
            if filters:
1303
 
                file_obj = filtered_input_file(file_obj, filters)
 
1394
                file_obj = _mod_filters.filtered_input_file(file_obj, filters)
1304
1395
            sha1 = osutils.size_sha_file(file_obj)[1]
1305
1396
        finally:
1306
1397
            file_obj.close()
1317
1408
    def _file_content_summary(self, path, stat_result):
1318
1409
        # This is to support the somewhat obsolete path_content_summary method
1319
1410
        # with content filtering: see
1320
 
        # <https://bugs.edge.launchpad.net/bzr/+bug/415508>.
 
1411
        # <https://bugs.launchpad.net/bzr/+bug/415508>.
1321
1412
        #
1322
1413
        # If the dirstate cache is up to date and knows the hash and size,
1323
1414
        # return that.
1336
1427
class WorkingTree4(DirStateWorkingTree):
1337
1428
    """This is the Format 4 working tree.
1338
1429
 
1339
 
    This differs from WorkingTree3 by:
 
1430
    This differs from WorkingTree by:
1340
1431
     - Having a consolidated internal dirstate, stored in a
1341
1432
       randomly-accessible sorted file on disk.
1342
1433
     - Not having a regular inventory attribute.  One can be synthesized
1370
1461
        return views.PathBasedViews(self)
1371
1462
 
1372
1463
 
1373
 
class DirStateWorkingTreeFormat(WorkingTreeFormat3):
 
1464
class DirStateWorkingTreeFormat(WorkingTreeFormatMetaDir):
 
1465
 
 
1466
    missing_parent_conflicts = True
 
1467
 
 
1468
    supports_versioned_directories = True
 
1469
 
 
1470
    _lock_class = LockDir
 
1471
    _lock_file_name = 'lock'
 
1472
 
 
1473
    def _open_control_files(self, a_bzrdir):
 
1474
        transport = a_bzrdir.get_workingtree_transport(None)
 
1475
        return LockableFiles(transport, self._lock_file_name,
 
1476
                             self._lock_class)
1374
1477
 
1375
1478
    def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
1376
1479
                   accelerator_tree=None, hardlink=False):
1377
1480
        """See WorkingTreeFormat.initialize().
1378
1481
 
1379
1482
        :param revision_id: allows creating a working tree at a different
1380
 
        revision than the branch is at.
 
1483
            revision than the branch is at.
1381
1484
        :param accelerator_tree: A tree which can be used for retrieving file
1382
1485
            contents more quickly than the revision tree, i.e. a workingtree.
1383
1486
            The revision tree will be used for cases where accelerator_tree's
1394
1497
        control_files = self._open_control_files(a_bzrdir)
1395
1498
        control_files.create_lock()
1396
1499
        control_files.lock_write()
1397
 
        transport.put_bytes('format', self.get_format_string(),
 
1500
        transport.put_bytes('format', self.as_string(),
1398
1501
            mode=a_bzrdir._get_file_mode())
1399
1502
        if from_branch is not None:
1400
1503
            branch = from_branch
1460
1563
                transform.build_tree(basis, wt, accelerator_tree,
1461
1564
                                     hardlink=hardlink,
1462
1565
                                     delta_from_tree=delta_from_tree)
 
1566
                for hook in MutableTree.hooks['post_build_tree']:
 
1567
                    hook(wt)
1463
1568
            finally:
1464
1569
                basis.unlock()
1465
1570
        finally:
1476
1581
        :param wt: the WorkingTree object
1477
1582
        """
1478
1583
 
 
1584
    def open(self, a_bzrdir, _found=False):
 
1585
        """Return the WorkingTree object for a_bzrdir
 
1586
 
 
1587
        _found is a private parameter, do not use it. It is used to indicate
 
1588
               if format probing has already been done.
 
1589
        """
 
1590
        if not _found:
 
1591
            # we are being called directly and must probe.
 
1592
            raise NotImplementedError
 
1593
        if not isinstance(a_bzrdir.transport, LocalTransport):
 
1594
            raise errors.NotLocalUrl(a_bzrdir.transport.base)
 
1595
        wt = self._open(a_bzrdir, self._open_control_files(a_bzrdir))
 
1596
        return wt
 
1597
 
1479
1598
    def _open(self, a_bzrdir, control_files):
1480
1599
        """Open the tree itself.
1481
1600
 
1494
1613
    def _get_matchingbzrdir(self):
1495
1614
        """Overrideable method to get a bzrdir for testing."""
1496
1615
        # please test against something that will let us do tree references
1497
 
        return bzrdir.format_registry.make_bzrdir(
1498
 
            'dirstate-with-subtree')
 
1616
        return controldir.format_registry.make_bzrdir(
 
1617
            'development-subtree')
1499
1618
 
1500
1619
    _matchingbzrdir = property(__get_matchingbzrdir)
1501
1620
 
1506
1625
    This format:
1507
1626
        - exists within a metadir controlling .bzr
1508
1627
        - includes an explicit version marker for the workingtree control
1509
 
          files, separate from the BzrDir format
 
1628
          files, separate from the ControlDir format
1510
1629
        - modifies the hash cache format
1511
1630
        - is new in bzr 0.15
1512
1631
        - uses a LockDir to guard access to it.
1516
1635
 
1517
1636
    _tree_class = WorkingTree4
1518
1637
 
1519
 
    def get_format_string(self):
 
1638
    @classmethod
 
1639
    def get_format_string(cls):
1520
1640
        """See WorkingTreeFormat.get_format_string()."""
1521
1641
        return "Bazaar Working Tree Format 4 (bzr 0.15)\n"
1522
1642
 
1533
1653
 
1534
1654
    _tree_class = WorkingTree5
1535
1655
 
1536
 
    def get_format_string(self):
 
1656
    @classmethod
 
1657
    def get_format_string(cls):
1537
1658
        """See WorkingTreeFormat.get_format_string()."""
1538
1659
        return "Bazaar Working Tree Format 5 (bzr 1.11)\n"
1539
1660
 
1553
1674
 
1554
1675
    _tree_class = WorkingTree6
1555
1676
 
1556
 
    def get_format_string(self):
 
1677
    @classmethod
 
1678
    def get_format_string(cls):
1557
1679
        """See WorkingTreeFormat.get_format_string()."""
1558
1680
        return "Bazaar Working Tree Format 6 (bzr 1.14)\n"
1559
1681
 
1572
1694
        return True
1573
1695
 
1574
1696
 
1575
 
class DirStateRevisionTree(Tree):
 
1697
class DirStateRevisionTree(InventoryTree):
1576
1698
    """A revision tree pulling the inventory from a dirstate.
1577
1699
    
1578
1700
    Note that this is one of the historical (ie revision) trees cached in the
1597
1719
    def annotate_iter(self, file_id,
1598
1720
                      default_revision=_mod_revision.CURRENT_REVISION):
1599
1721
        """See Tree.annotate_iter"""
1600
 
        text_key = (file_id, self.inventory[file_id].revision)
 
1722
        text_key = (file_id, self.get_file_revision(file_id))
1601
1723
        annotations = self._repository.texts.annotate(text_key)
1602
1724
        return [(key[-1], line) for (key, line) in annotations]
1603
1725
 
1604
 
    def _get_ancestors(self, default_revision):
1605
 
        return set(self._repository.get_ancestry(self._revision_id,
1606
 
                                                 topo_sorted=False))
1607
1726
    def _comparison_data(self, entry, path):
1608
1727
        """See Tree._comparison_data."""
1609
1728
        if entry is None:
1662
1781
        if path is not None:
1663
1782
            path = path.encode('utf8')
1664
1783
        parent_index = self._get_parent_index()
1665
 
        return self._dirstate._get_entry(parent_index, fileid_utf8=file_id, path_utf8=path)
 
1784
        return self._dirstate._get_entry(parent_index, fileid_utf8=file_id,
 
1785
            path_utf8=path)
1666
1786
 
1667
1787
    def _generate_inventory(self):
1668
1788
        """Create and set self.inventory from the dirstate object.
1725
1845
                elif kind == 'directory':
1726
1846
                    parent_ies[(dirname + '/' + name).strip('/')] = inv_entry
1727
1847
                elif kind == 'symlink':
1728
 
                    inv_entry.executable = False
1729
 
                    inv_entry.text_size = None
1730
1848
                    inv_entry.symlink_target = utf8_decode(fingerprint)[0]
1731
1849
                elif kind == 'tree-reference':
1732
1850
                    inv_entry.reference_revision = fingerprint or None
1752
1870
        # Make sure the file exists
1753
1871
        entry = self._get_entry(file_id, path=path)
1754
1872
        if entry == (None, None): # do we raise?
1755
 
            return None
 
1873
            raise errors.NoSuchId(self, file_id)
1756
1874
        parent_index = self._get_parent_index()
1757
1875
        last_changed_revision = entry[1][parent_index][4]
1758
1876
        try:
1769
1887
            return parent_details[1]
1770
1888
        return None
1771
1889
 
 
1890
    @needs_read_lock
 
1891
    def get_file_revision(self, file_id):
 
1892
        inv, inv_file_id = self._unpack_file_id(file_id)
 
1893
        return inv[inv_file_id].revision
 
1894
 
1772
1895
    def get_file(self, file_id, path=None):
1773
1896
        return StringIO(self.get_file_text(file_id))
1774
1897
 
1775
1898
    def get_file_size(self, file_id):
1776
1899
        """See Tree.get_file_size"""
1777
 
        return self.inventory[file_id].text_size
 
1900
        inv, inv_file_id = self._unpack_file_id(file_id)
 
1901
        return inv[inv_file_id].text_size
1778
1902
 
1779
1903
    def get_file_text(self, file_id, path=None):
1780
1904
        _, content = list(self.iter_files_bytes([(file_id, None)]))[0]
1781
1905
        return ''.join(content)
1782
1906
 
1783
1907
    def get_reference_revision(self, file_id, path=None):
1784
 
        return self.inventory[file_id].reference_revision
 
1908
        inv, inv_file_id = self._unpack_file_id(file_id)
 
1909
        return inv[inv_file_id].reference_revision
1785
1910
 
1786
1911
    def iter_files_bytes(self, desired_files):
1787
1912
        """See Tree.iter_files_bytes.
1797
1922
                                       identifier))
1798
1923
        return self._repository.iter_files_bytes(repo_desired_files)
1799
1924
 
1800
 
    def get_symlink_target(self, file_id):
 
1925
    def get_symlink_target(self, file_id, path=None):
1801
1926
        entry = self._get_entry(file_id=file_id)
1802
1927
        parent_index = self._get_parent_index()
1803
1928
        if entry[1][parent_index][0] != 'l':
1811
1936
        """Return the revision id for this tree."""
1812
1937
        return self._revision_id
1813
1938
 
1814
 
    def _get_inventory(self):
 
1939
    def _get_root_inventory(self):
1815
1940
        if self._inventory is not None:
1816
1941
            return self._inventory
1817
1942
        self._must_be_locked()
1818
1943
        self._generate_inventory()
1819
1944
        return self._inventory
1820
1945
 
 
1946
    root_inventory = property(_get_root_inventory,
 
1947
                         doc="Inventory of this Tree")
 
1948
 
 
1949
    @deprecated_method(deprecated_in((2, 5, 0)))
 
1950
    def _get_inventory(self):
 
1951
        return self.root_inventory
 
1952
 
1821
1953
    inventory = property(_get_inventory,
1822
1954
                         doc="Inventory of this Tree")
1823
1955
 
1841
1973
 
1842
1974
    def path_content_summary(self, path):
1843
1975
        """See Tree.path_content_summary."""
1844
 
        id = self.inventory.path2id(path)
1845
 
        if id is None:
 
1976
        inv, inv_file_id = self._path2inv_file_id(path)
 
1977
        if inv_file_id is None:
1846
1978
            return ('missing', None, None, None)
1847
 
        entry = self._inventory[id]
 
1979
        entry = inv[inv_file_id]
1848
1980
        kind = entry.kind
1849
1981
        if kind == 'file':
1850
1982
            return (kind, entry.text_size, entry.executable, entry.text_sha1)
1854
1986
            return (kind, None, None, None)
1855
1987
 
1856
1988
    def is_executable(self, file_id, path=None):
1857
 
        ie = self.inventory[file_id]
 
1989
        inv, inv_file_id = self._unpack_file_id(file_id)
 
1990
        ie = inv[inv_file_id]
1858
1991
        if ie.kind != "file":
1859
 
            return None
 
1992
            return False
1860
1993
        return ie.executable
1861
1994
 
 
1995
    def is_locked(self):
 
1996
        return self._locked
 
1997
 
1862
1998
    def list_files(self, include_root=False, from_dir=None, recursive=True):
1863
1999
        # We use a standard implementation, because DirStateRevisionTree is
1864
2000
        # dealing with one of the parents of the current state
1865
 
        inv = self._get_inventory()
1866
2001
        if from_dir is None:
 
2002
            inv = self.root_inventory
1867
2003
            from_dir_id = None
1868
2004
        else:
1869
 
            from_dir_id = inv.path2id(from_dir)
 
2005
            inv, from_dir_id = self._path2inv_file_id(from_dir)
1870
2006
            if from_dir_id is None:
1871
2007
                # Directory not versioned
1872
2008
                return
 
2009
        # FIXME: Support nested trees
1873
2010
        entries = inv.iter_entries(from_dir=from_dir_id, recursive=recursive)
1874
2011
        if inv.root is not None and not include_root and from_dir is None:
1875
2012
            entries.next()
1877
2014
            yield path, 'V', entry.kind, entry.file_id, entry
1878
2015
 
1879
2016
    def lock_read(self):
1880
 
        """Lock the tree for a set of operations."""
 
2017
        """Lock the tree for a set of operations.
 
2018
 
 
2019
        :return: A bzrlib.lock.LogicalLockResult.
 
2020
        """
1881
2021
        if not self._locked:
1882
2022
            self._repository.lock_read()
1883
2023
            if self._dirstate._lock_token is None:
1884
2024
                self._dirstate.lock_read()
1885
2025
                self._dirstate_locked = True
1886
2026
        self._locked += 1
 
2027
        return LogicalLockResult(self.unlock)
1887
2028
 
1888
2029
    def _must_be_locked(self):
1889
2030
        if not self._locked:
1893
2034
    def path2id(self, path):
1894
2035
        """Return the id for path in this tree."""
1895
2036
        # lookup by path: faster than splitting and walking the ivnentory.
 
2037
        if isinstance(path, list):
 
2038
            if path == []:
 
2039
                path = [""]
 
2040
            path = osutils.pathjoin(*path)
1896
2041
        entry = self._get_entry(path=path)
1897
2042
        if entry == (None, None):
1898
2043
            return None
1921
2066
        # So for now, we just build up the parent inventory, and extract
1922
2067
        # it the same way RevisionTree does.
1923
2068
        _directory = 'directory'
1924
 
        inv = self._get_inventory()
 
2069
        inv = self._get_root_inventory()
1925
2070
        top_id = inv.path2id(prefix)
1926
2071
        if top_id is None:
1927
2072
            pending = []
1968
2113
    def make_source_parent_tree(source, target):
1969
2114
        """Change the source tree into a parent of the target."""
1970
2115
        revid = source.commit('record tree')
1971
 
        target.branch.repository.fetch(source.branch.repository, revid)
 
2116
        target.branch.fetch(source.branch, revid)
1972
2117
        target.set_parent_ids([revid])
1973
2118
        return target.basis_tree(), target
1974
2119
 
2066
2211
                path_entries = state._entries_for_path(path)
2067
2212
                if not path_entries:
2068
2213
                    # this specified path is not present at all: error
2069
 
                    not_versioned.append(path)
 
2214
                    not_versioned.append(path.decode('utf-8'))
2070
2215
                    continue
2071
2216
                found_versioned = False
2072
2217
                # for each id at this path
2080
2225
                if not found_versioned:
2081
2226
                    # none of the indexes was not 'absent' at all ids for this
2082
2227
                    # path.
2083
 
                    not_versioned.append(path)
 
2228
                    not_versioned.append(path.decode('utf-8'))
2084
2229
            if len(not_versioned) > 0:
2085
2230
                raise errors.PathsNotVersionedError(not_versioned)
2086
2231
        # -- remove redundancy in supplied specific_files to prevent over-scanning --
2153
2298
    def update_format(self, tree):
2154
2299
        """Change the format marker."""
2155
2300
        tree._transport.put_bytes('format',
2156
 
            self.target_format.get_format_string(),
 
2301
            self.target_format.as_string(),
2157
2302
            mode=tree.bzrdir._get_file_mode())
2158
2303
 
2159
2304
 
2176
2321
    def update_format(self, tree):
2177
2322
        """Change the format marker."""
2178
2323
        tree._transport.put_bytes('format',
2179
 
            self.target_format.get_format_string(),
 
2324
            self.target_format.as_string(),
2180
2325
            mode=tree.bzrdir._get_file_mode())
2181
2326
 
2182
2327
 
2205
2350
    def update_format(self, tree):
2206
2351
        """Change the format marker."""
2207
2352
        tree._transport.put_bytes('format',
2208
 
            self.target_format.get_format_string(),
 
2353
            self.target_format.as_string(),
2209
2354
            mode=tree.bzrdir._get_file_mode())