← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/reconcile.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/reconcile.py
29
29
from bzrlib import (
30
30
    cleanup,
31
31
    errors,
32
 
    revision as _mod_revision,
33
32
    ui,
34
33
    )
35
34
from bzrlib.trace import mutter
145
144
        self._reconcile_revision_history()
146
145
 
147
146
    def _reconcile_revision_history(self):
 
147
        repo = self.branch.repository
148
148
        last_revno, last_revision_id = self.branch.last_revision_info()
149
149
        real_history = []
150
 
        graph = self.branch.repository.get_graph()
151
150
        try:
152
 
            for revid in graph.iter_lefthand_ancestry(
153
 
                    last_revision_id, (_mod_revision.NULL_REVISION,)):
 
151
            for revid in repo.iter_reverse_revision_history(
 
152
                    last_revision_id):
154
153
                real_history.append(revid)
155
154
        except errors.RevisionNotPresent:
156
155
            pass # Hit a ghost left hand parent