← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

(jameinel) (bug #780544) when updating the WT,
 allow it to be done with a fast delta,
 rather than setting the state from scratch. (John A Meinel)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
1193
1193
 
1194
1194
    def unlock(self):
1195
1195
        """Unlock in format 4 trees needs to write the entire dirstate."""
 
1196
        # do non-implementation specific cleanup
 
1197
        self._cleanup()
 
1198
 
1196
1199
        if self._control_files._lock_count == 1:
1197
 
            # do non-implementation specific cleanup
1198
 
            self._cleanup()
1199
 
 
1200
1200
            # eventually we should do signature checking during read locks for
1201
1201
            # dirstate updates.
1202
1202
            if self._control_files._lock_mode == 'w':
1462
1462
 
1463
1463
    missing_parent_conflicts = True
1464
1464
 
1465
 
    supports_versioned_directories = True
1466
 
 
1467
1465
    _lock_class = LockDir
1468
1466
    _lock_file_name = 'lock'
1469
1467
 
1715
1713
        annotations = self._repository.texts.annotate(text_key)
1716
1714
        return [(key[-1], line) for (key, line) in annotations]
1717
1715
 
 
1716
    def _get_ancestors(self, default_revision):
 
1717
        return set(self._repository.get_ancestry(self._revision_id,
 
1718
                                                 topo_sorted=False))
1718
1719
    def _comparison_data(self, entry, path):
1719
1720
        """See Tree._comparison_data."""
1720
1721
        if entry is None: