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

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-06-29 23:46:33 UTC
  • mfrom: (6997.6.10 annotate)
  • Revision ID: breezy.the.bot@gmail.com-20180629234633-viw3mz29w1eygx1y
Add HPSS call for Tree.annotate_iter.

Merged from https://code.launchpad.net/~jelmer/brz/hpss-annotate/+merge/348438

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/merge_directive.py
224
224
        if self.revision_id == revision_id:
225
225
            revno = [revno]
226
226
        else:
227
 
            revno = branch.get_revision_id_to_revno_map().get(self.revision_id,
228
 
                ['merge'])
 
227
            try:
 
228
                revno = branch.revision_id_to_dotted_revno(self.revision_id)
 
229
            except errors.NoSuchRevision:
 
230
                revno = ['merge']
229
231
        nick = re.sub('(\\W+)', '-', branch.nick).strip('-')
230
232
        return '%s-%s' % (nick, '.'.join(str(n) for n in revno))
231
233