← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/missing.py

  • Committer: Aaron Bentley
  • Date: 2005-12-25 00:38:48 UTC
  • mto: (1185.67.11 bzr.revision-storage)
  • mto: This revision was merged to the branch mainline in revision 1550.
  • Revision ID: aaron.bentley@utoronto.ca-20051225003848-111ac71170cb2605
Renamed Branch.storage to Branch.repository

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/missing.py
44
44
                                                remote_rev_history_map)
45
45
                return local_extra, remote_extra
46
46
 
47
 
            local_ancestry = _get_ancestry(local_branch.storage, progress, 
 
47
            local_ancestry = _get_ancestry(local_branch.repository, progress, 
48
48
                                           "local", 2, local_rev_history)
49
 
            remote_ancestry = _get_ancestry(remote_branch.storage, progress,
 
49
            remote_ancestry = _get_ancestry(remote_branch.repository, progress,
50
50
                                            "remote", 3, remote_rev_history)
51
51
            progress.update('pondering', 4, 5)
52
52
            extras = local_ancestry.symmetric_difference(remote_ancestry)