/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/repofmt/knitrepo.py

Merge upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repofmt/knitrepo.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
from bzrlib.lazy_import import lazy_import
18
18
lazy_import(globals(), """
53
53
    def __repr__(self):
54
54
        return 'KnitParentsProvider(%r)' % self._knit
55
55
 
56
 
    @symbol_versioning.deprecated_method(symbol_versioning.one_one)
57
 
    def get_parents(self, revision_ids):
58
 
        """See graph._StackedParentsProvider.get_parents"""
59
 
        parent_map = self.get_parent_map(revision_ids)
60
 
        return [parent_map.get(r, None) for r in revision_ids]
61
 
 
62
56
    def get_parent_map(self, keys):
63
57
        """See graph._StackedParentsProvider.get_parent_map"""
64
58
        parent_map = {}
213
207
        revision_id = osutils.safe_revision_id(revision_id)
214
208
        return self.get_revision_reconcile(revision_id)
215
209
 
 
210
    def _refresh_data(self):
 
211
        if not self.is_locked():
 
212
            return
 
213
        # Create a new transaction to force all knits to see the scope change.
 
214
        # This is safe because we're outside a write group.
 
215
        self.control_files._finish_transaction()
 
216
        if self.is_write_locked():
 
217
            self.control_files._set_write_transaction()
 
218
        else:
 
219
            self.control_files._set_read_transaction()
 
220
 
216
221
    @needs_write_lock
217
222
    def reconcile(self, other=None, thorough=False):
218
223
        """Reconcile this repository."""
288
293
    supports_external_lookups = False
289
294
    _fetch_order = 'topological'
290
295
    _fetch_uses_deltas = True
 
296
    fast_deltas = False
291
297
 
292
298
    def _get_inventories(self, repo_transport, repo, name='inventory'):
293
299
        mapper = versionedfile.ConstantMapper(name)