~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/missing.py

MergedĀ fromĀ mainline

Show diffs side-by-side

added added

removed removed

Lines of Context:
60
60
    for revno, rev_id in missing_remote:
61
61
        rev = br_remote.storage.get_revision(rev_id)
62
62
        if verbose:
 
63
            remote_tree = br_remote.storage.revision_tree
63
64
            parent_rev_id = rev.parent_ids[0]
64
65
            if last_rev_id == parent_rev_id:
65
66
                parent_tree = last_tree
66
67
            else:
67
 
                parent_tree = br_remote.revision_tree(parent_rev_id)
68
 
            revision_tree = br_remote.revision_tree(rev_id)
 
68
                parent_tree = remote_tree(parent_rev_id)
 
69
            revision_tree = remote_tree(rev_id)
69
70
            last_rev_id = rev_id
70
71
            last_tree = revision_tree
71
72
            delta = compare_trees(revision_tree, parent_tree)