Patchwork [1,of,4] py3: fix int formatting of "incoming changes" log

login
register
mail settings
Submitter Yuya Nishihara
Date March 4, 2018, 10:19 p.m.
Message ID <bbfaa4a0a9fde9170af6.1520201985@mimosa>
Download mbox | patch
Permalink /patch/29022/
State Accepted
Headers show

Comments

Yuya Nishihara - March 4, 2018, 10:19 p.m.
# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1520200097 18000
#      Sun Mar 04 16:48:17 2018 -0500
# Node ID bbfaa4a0a9fde9170af65ef333e63f7e4626e81e
# Parent  b77ff4fbe9ad2a27454f0edc9a9772bbc3128b28
py3: fix int formatting of "incoming changes" log
Pulkit Goyal - March 4, 2018, 10:22 p.m.
Queued the series. Many thanks.

On Mon, Mar 5, 2018 at 3:49 AM, Yuya Nishihara <yuya@tcha.org> wrote:
> # HG changeset patch
> # User Yuya Nishihara <yuya@tcha.org>
> # Date 1520200097 18000
> #      Sun Mar 04 16:48:17 2018 -0500
> # Node ID bbfaa4a0a9fde9170af65ef333e63f7e4626e81e
> # Parent  b77ff4fbe9ad2a27454f0edc9a9772bbc3128b28
> py3: fix int formatting of "incoming changes" log
>
> diff --git a/mercurial/changegroup.py b/mercurial/changegroup.py
> --- a/mercurial/changegroup.py
> +++ b/mercurial/changegroup.py
> @@ -411,7 +411,7 @@ class cg1unpacker(object):
>                      newheads = [h for h in repo.heads()
>                                  if h not in oldheads]
>                      repo.ui.log("incoming",
> -                                "%s incoming changes - new heads: %s\n",
> +                                "%d incoming changes - new heads: %s\n",
>                                  len(added),
>                                  ', '.join([hex(c[:6]) for c in newheads]))
>
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Patch

diff --git a/mercurial/changegroup.py b/mercurial/changegroup.py
--- a/mercurial/changegroup.py
+++ b/mercurial/changegroup.py
@@ -411,7 +411,7 @@  class cg1unpacker(object):
                     newheads = [h for h in repo.heads()
                                 if h not in oldheads]
                     repo.ui.log("incoming",
-                                "%s incoming changes - new heads: %s\n",
+                                "%d incoming changes - new heads: %s\n",
                                 len(added),
                                 ', '.join([hex(c[:6]) for c in newheads]))