Mercurial > hg
comparison hgext/rebase.py @ 36478:a6e9a360ccd8
py3: use '%d' for integers instead of b'%s'
Differential Revision: https://phab.mercurial-scm.org/D2502
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Wed, 28 Feb 2018 21:45:15 +0530 |
| parents | 7b84b737352d |
| children | f7e3fe95b663 |
comparison
equal
deleted
inserted
replaced
| 36477:035b77bf01d2 | 36478:a6e9a360ccd8 |
|---|---|
| 1034 parents.add(p.rev()) | 1034 parents.add(p.rev()) |
| 1035 if not parents: | 1035 if not parents: |
| 1036 return nullrev | 1036 return nullrev |
| 1037 if len(parents) == 1: | 1037 if len(parents) == 1: |
| 1038 return parents.pop() | 1038 return parents.pop() |
| 1039 raise error.Abort(_('unable to collapse on top of %s, there is more ' | 1039 raise error.Abort(_('unable to collapse on top of %d, there is more ' |
| 1040 'than one external parent: %s') % | 1040 'than one external parent: %s') % |
| 1041 (max(destancestors), | 1041 (max(destancestors), |
| 1042 ', '.join("%d" % p for p in sorted(parents)))) | 1042 ', '.join("%d" % p for p in sorted(parents)))) |
| 1043 | 1043 |
| 1044 def concludememorynode(repo, rev, p1, p2, wctx=None, | 1044 def concludememorynode(repo, rev, p1, p2, wctx=None, |