← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

  • Committer: Andrew Bennetts
  • Date: 2011-05-18 15:45:07 UTC
  • mto: This revision was merged to the branch mainline in revision 5895.
  • Revision ID: andrew.bennetts@canonical.com-20110518154507-t3qudgcb7fj3omjc
Use pydoctor in api-docs make target.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
1145
1145
                        _mod_revision.NULL_REVISION)))
1146
1146
                ghosts.append(rev_id)
1147
1147
            accepted_revisions.add(rev_id)
1148
 
        updated = False
1149
 
        if (len(real_trees) == 1
1150
 
            and not ghosts
1151
 
            and self.branch.repository._format.fast_deltas
1152
 
            and isinstance(real_trees[0][1],
1153
 
                revisiontree.InventoryRevisionTree)
1154
 
            and self.get_parent_ids()):
1155
 
            rev_id, rev_tree = real_trees[0]
1156
 
            basis_id = self.get_parent_ids()[0]
1157
 
            # There are times when basis_tree won't be in
1158
 
            # self.branch.repository, (switch, for example)
1159
 
            try:
1160
 
                basis_tree = self.branch.repository.revision_tree(basis_id)
1161
 
            except errors.NoSuchRevision:
1162
 
                # Fall back to the set_parent_trees(), since we can't use
1163
 
                # _make_delta if we can't get the RevisionTree
1164
 
                pass
1165
 
            else:
1166
 
                delta = rev_tree.inventory._make_delta(basis_tree.inventory)
1167
 
                dirstate.update_basis_by_delta(delta, rev_id)
1168
 
                updated = True
1169
 
        if not updated:
1170
 
            dirstate.set_parent_trees(real_trees, ghosts=ghosts)
 
1148
        dirstate.set_parent_trees(real_trees, ghosts=ghosts)
1171
1149
        self._make_dirty(reset_inventory=False)
1172
1150
 
1173
1151
    def _set_root_id(self, file_id):
1193
1171
 
1194
1172
    def unlock(self):
1195
1173
        """Unlock in format 4 trees needs to write the entire dirstate."""
 
1174
        # do non-implementation specific cleanup
 
1175
        self._cleanup()
 
1176
 
1196
1177
        if self._control_files._lock_count == 1:
1197
 
            # do non-implementation specific cleanup
1198
 
            self._cleanup()
1199
 
 
1200
1178
            # eventually we should do signature checking during read locks for
1201
1179
            # dirstate updates.
1202
1180
            if self._control_files._lock_mode == 'w':
1462
1440
 
1463
1441
    missing_parent_conflicts = True
1464
1442
 
1465
 
    supports_versioned_directories = True
1466
 
 
1467
1443
    _lock_class = LockDir
1468
1444
    _lock_file_name = 'lock'
1469
1445
 
1477
1453
        """See WorkingTreeFormat.initialize().
1478
1454
 
1479
1455
        :param revision_id: allows creating a working tree at a different
1480
 
            revision than the branch is at.
 
1456
        revision than the branch is at.
1481
1457
        :param accelerator_tree: A tree which can be used for retrieving file
1482
1458
            contents more quickly than the revision tree, i.e. a workingtree.
1483
1459
            The revision tree will be used for cases where accelerator_tree's
1715
1691
        annotations = self._repository.texts.annotate(text_key)
1716
1692
        return [(key[-1], line) for (key, line) in annotations]
1717
1693
 
 
1694
    def _get_ancestors(self, default_revision):
 
1695
        return set(self._repository.get_ancestry(self._revision_id,
 
1696
                                                 topo_sorted=False))
1718
1697
    def _comparison_data(self, entry, path):
1719
1698
        """See Tree._comparison_data."""
1720
1699
        if entry is None: