Re: [PATCH 02 of 11 py3] debuginstall: use %d instead of %s for formatting an int

2016-10-10 Thread Yuya Nishihara
On Sun, 09 Oct 2016 10:16:44 -0400, Augie Fackler wrote:
> # HG changeset patch
> # User Augie Fackler 
> # Date 1476020566 14400
> #  Sun Oct 09 09:42:46 2016 -0400
> # Node ID 826ebebef37bd58fea9abdd4690ea7b5ad6b7552
> # Parent  9b6ff0f940ed2ee33516aac22d5c69914400af7a
> debuginstall: use %d instead of %s for formatting an int

Queued this, thanks.

(Some of the other patches could be cherry-picked, but I don't have enough
time to sort out good ones, so took only this.)
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel


[PATCH 02 of 11 py3] debuginstall: use %d instead of %s for formatting an int

2016-10-09 Thread Augie Fackler
# HG changeset patch
# User Augie Fackler 
# Date 1476020566 14400
#  Sun Oct 09 09:42:46 2016 -0400
# Node ID 826ebebef37bd58fea9abdd4690ea7b5ad6b7552
# Parent  9b6ff0f940ed2ee33516aac22d5c69914400af7a
debuginstall: use %d instead of %s for formatting an int

% formatting on bytes on Python 3 is pickier about which % character
we specify.

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -2798,7 +2798,7 @@ def debuginstall(ui, **opts):
 if not problems:
 fm.data(problems=problems)
 fm.condwrite(problems, 'problems',
- _("%s problems detected,"
+ _("%d problems detected,"
" please check your install!\n"), problems)
 fm.end()
 
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel