Mercurial > hg
comparison hgext/rebase.py @ 36185:acc8e6e52af6
py3: use "%d" to convert integers to bytes
Differential Revision: https://phab.mercurial-scm.org/D2263
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Wed, 14 Feb 2018 17:05:33 +0530 |
parents | 6eb7d95f8970 |
children | 53be14874ee8 |
comparison
equal
deleted
inserted
replaced
36184:56635c506608 | 36185:acc8e6e52af6 |
---|---|
539 if not self.collapsef: | 539 if not self.collapsef: |
540 ui.warn(_('note: rebase of %d:%s created no changes ' | 540 ui.warn(_('note: rebase of %d:%s created no changes ' |
541 'to commit\n') % (rev, ctx)) | 541 'to commit\n') % (rev, ctx)) |
542 self.skipped.add(rev) | 542 self.skipped.add(rev) |
543 self.state[rev] = p1 | 543 self.state[rev] = p1 |
544 ui.debug('next revision set to %s\n' % p1) | 544 ui.debug('next revision set to %d\n' % p1) |
545 else: | 545 else: |
546 ui.status(_('already rebased %s as %s\n') % | 546 ui.status(_('already rebased %s as %s\n') % |
547 (desc, repo[self.state[rev]])) | 547 (desc, repo[self.state[rev]])) |
548 return pos | 548 return pos |
549 | 549 |