~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1413
1413
        """See Branch.set_revision_history."""
1414
1414
        if 'evil' in debug.debug_flags:
1415
1415
            mutter_callsite(3, "set_revision_history scales with history.")
 
1416
        check_not_reserved_id = _mod_revision.check_not_reserved_id
 
1417
        for rev_id in rev_history:
 
1418
            check_not_reserved_id(rev_id)
1416
1419
        self._write_revision_history(rev_history)
1417
1420
        self._clear_cached_state()
1418
1421
        self._cache_revision_history(rev_history)
1476
1479
            raise errors.NoSuchRevision(self, revision_id)
1477
1480
        current_rev_id = revision_id
1478
1481
        new_history = []
 
1482
        check_not_reserved_id = _mod_revision.check_not_reserved_id
1479
1483
        # Do not include ghosts or graph origin in revision_history
1480
1484
        while (current_rev_id in parents_map and
1481
1485
               len(parents_map[current_rev_id]) > 0):
 
1486
            check_not_reserved_id(current_rev_id)
1482
1487
            new_history.append(current_rev_id)
1483
1488
            current_rev_id = parents_map[current_rev_id][0]
1484
1489
            parents_map = graph.get_parent_map([current_rev_id])