# HG changeset patch # User Gregory Szorc # Date 1518402862 28800 # Node ID 6eb7d95f897000030b30c6e12b8df3dfeb59a52a # Parent 29dd37a418aa26194a40ad603e918a7373e8c5e2 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 diff -r 29dd37a418aa -r 6eb7d95f8970 hgext/rebase.py --- 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