D2146: py3: port string formatting

Submitter	phabricator
Date	Feb. 11, 2018, 10:57 p.m.
Message ID	<differential-rev-PHID-DREV-7ovddfgvyiupnqfv6n5d-req@phab.mercurial-scm.org>
Download	mbox \| patch
Permalink	/patch/27594/
State	Superseded
Headers	show Return-Path: <mercurial-devel-bounces@mercurial-scm.org> Date: Sun, 11 Feb 2018 22:57:53 +0000 To: mercurial-devel@mercurial-scm.org From: "indygreg (Gregory Szorc)" <phabricator@mercurial-scm.org> Subject: D2146: py3: port string formatting Message-ID: <differential-rev-PHID-DREV-7ovddfgvyiupnqfv6n5d-req@phab.mercurial-scm.org> Thread-Topic: D2146: py3: port string formatting Precedence: bulk Thread-Index: NTg4M2IxNjVmMDI4OTkyYjc0NmI5YTBhMDM0 MIME-Version: 1.0 Reply-To: phabricator+D2146+public+f43f54f2d947ed63@mercurial-scm.org Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: mercurial-devel-bounces@mercurial-scm.org Sender: "Mercurial-devel" <mercurial-devel-bounces@mercurial-scm.org>

Comments

phabricator - Feb. 11, 2018, 10:57 p.m.

indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  bytes() should be used over str() when the output is bytes.
  
  None doesn't cast to an empty string on Python 3. So use '' explicitly.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D2146

AFFECTED FILES
  hgext/rebase.py

CHANGE DETAILS




To: indygreg, #hg-reviewers
Cc: mercurial-devel

phabricator - Feb. 12, 2018, 1:43 a.m.

yuja requested changes to this revision.
yuja added a comment.
This revision now requires changes to proceed.


  `r` looks like an integer, and `bytes(int)` is `'\0' * int`.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D2146

To: indygreg, #hg-reviewers, yuja
Cc: yuja, mercurial-devel

Patch

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -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(bytes(r) for r in sorted(skipped)) or ''))
         repo.ui.debug('rebase status resumed\n')
 
         self.originalwd = originalwd

Patchwork D2146: py3: port string formatting

Comments

Patch