/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 breezy/annotate.py

  • Committer: Jelmer Vernooij
  • Date: 2018-06-30 14:28:33 UTC
  • mfrom: (7005 work)
  • mto: This revision was merged to the branch mainline in revision 7008.
  • Revision ID: jelmer@jelmer.uk-20180630142833-eg208wfe8la76m0x
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/annotate.py
162
162
    :param branch: A locked branch to query for revision details.
163
163
    """
164
164
    repository = branch.repository
 
165
    revision_ids = set(o for o, t in annotations)
165
166
    if current_rev is not None:
166
167
        # This can probably become a function on MutableTree, get_revno_map
167
168
        # there, or something.
185
186
            for seq_num, rev_id, depth, revno, end_of_merge in
186
187
                merge_sorted_revisions)
187
188
    else:
 
189
        # TODO(jelmer): Only look up the revision ids that we need (i.e. those
 
190
        # in revision_ids). Possibly add a HPSS call that can look those up
 
191
        # in bulk over HPSS.
188
192
        revision_id_to_revno = branch.get_revision_id_to_revno_map()
189
193
    last_origin = None
190
 
    revision_ids = set(o for o, t in annotations)
191
194
    revisions = {}
192
195
    if CURRENT_REVISION in revision_ids:
193
196
        revision_id_to_revno[CURRENT_REVISION] = (