/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/missing.py

  • Committer: Aaron Bentley
  • Date: 2005-11-29 18:34:21 UTC
  • mto: (1185.72.2 bzr.dev)
  • mto: This revision was merged to the branch mainline in revision 1525.
  • Revision ID: abentley@panoramicfeedback.com-20051129183421-8ee4609bc4c8fec3
Restructured find_unmerged, so it returns lists of (revno, revision) pairs

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/missing.py
110
110
                    if elem in remote_rev_history:
111
111
                        remote_extra.add(elem)
112
112
            progress.clear()
113
 
            local_extra = list(local_extra)
114
 
            local_extra.sort(key=local_rev_history_map.get)
115
 
            remote_extra = list(remote_extra)
116
 
            remote_extra.sort(key=remote_rev_history_map.get)
 
113
            local_extra = sorted_revisions(local_extra, local_rev_history_map)
 
114
            remote_extra = sorted_revisions(remote_extra, 
 
115
                                            remote_rev_history_map)
117
116
                    
118
117
        finally:
119
118
            remote_branch.unlock()
120
119
    finally:
121
120
        local_branch.unlock()
122
 
    return (local_extra, local_rev_history_map, remote_extra, 
123
 
            remote_rev_history_map)
 
121
    return (local_extra, remote_extra)
 
122
 
 
123
def sorted_revisions(revisions, history_map):
 
124
    revisions = [(history_map[r],r) for r in revisions]
 
125
    revisions.sort()
 
126
    return revisions