Mercurial > hg

changeset 36147:6eb7d95f8970

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: port string formatting `skipped` is a set of integer revs here. So cast integers to strings using %d. None doesn't cast to an empty string on Python 3. So use '' explicitly. Differential Revision: https://phab.mercurial-scm.org/D2146
author Gregory Szorc <gregory.szorc@gmail.com>
date Sun, 11 Feb 2018 18:34:22 -0800
parents 29dd37a418aa
children 0f9e52f900c4
files hgext/rebase.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/rebase.py	Thu Jan 25 21:16:28 2018 -0500
+++ b/hgext/rebase.py	Sun Feb 11 18:34:22 2018 -0800
@@ -289,7 +289,7 @@
                     skipped.add(old)
                 seen.add(new)
         repo.ui.debug('computed skipped revs: %s\n' %
-                        (' '.join(str(r) for r in sorted(skipped)) or None))
+                        (' '.join('%d' % r for r in sorted(skipped)) or ''))
         repo.ui.debug('rebase status resumed\n')
 
         self.originalwd = originalwd