From: Andrew Oakley <andrew@adoakley.name>
To: Joel Holdsworth <jholdsworth@nvidia.com>
Cc: git@vger.kernel.org,
Tzadik Vanderhoof <tzadik.vanderhoof@gmail.com>,
Dorgon Chang <dorgonman@hotmail.com>,
Joachim Kuebart <joachim.kuebart@gmail.com>,
Daniel Levin <dendy.ua@gmail.com>,
Johannes Schindelin <johannes.schindelin@gmx.de>,
Luke Diamand <luke@diamand.org>, Ben Keene <seraphire@gmail.com>
Subject: Re: [PATCH 1/2] git-p4: print size values in appropriate units
Date: Fri, 17 Dec 2021 16:56:27 +0000 [thread overview]
Message-ID: <20211217165627.49e931d6@ado-tr.dyn.home.arpa> (raw)
In-Reply-To: <20211217145949.2229886-2-jholdsworth@nvidia.com>
On Fri, 17 Dec 2021 14:59:48 +0000
Joel Holdsworth <jholdsworth@nvidia.com> wrote:
> The git-p4 script reports file sizes in various log messages.
> Previously, in each case the script would print them as the number of
> bytes divided by 1048576 i.e. the size in mebibytes, rounded down to
> an integer. This resulted in small files being described as having a
> size of "0 MB".
>
> This patch replaces the existing behaviour with a new helper function:
> format_size_human_readable, which takes a number of bytes (or any
> other quantity), and computes the appropriate prefix to use: none,
> Ki, Mi, Gi, Ti, Pi, Ei, Zi, Yi.
>
> For example, a size of 123456 will now be printed as "120.6 KiB"
> greatly improving the readability of the log output.
>
> Large valued prefixes such as pebi, exbi, zebi and yobi are included
> for completeness, though they not expected to appear in any real-world
> Perforce repository!
>
> Signed-off-by: Joel Holdsworth <jholdsworth@nvidia.com>
> ---
> git-p4.py | 22 +++++++++++++++++-----
> 1 file changed, 17 insertions(+), 5 deletions(-)
>
> diff --git a/git-p4.py b/git-p4.py
> index 2b4500226a..8c1130cb8f 100755
> --- a/git-p4.py
> +++ b/git-p4.py
> @@ -56,6 +56,16 @@
>
> p4_access_checked = False
>
> +def format_size_human_readable(num, suffix="B"):
> + """ Returns a number of units (typically bytes) formatted as a
> human-readable
> + string.
> + """
> + for unit in ["", "Ki", "Mi", "Gi", "Ti", "Pi", "Ei", "Zi"]:
> + if abs(num) < 1024.0:
> + return "{:3.1f} {}{}".format(num, unit, suffix)
> + num /= 1024.0
> + return "{:.1f} Yi{}".format(num, suffix)
If it's always bytes, why keep the suffix separate?
> +
> def p4_build_cmd(cmd):
> """Build a suitable p4 command line.
>
> @@ -2966,7 +2976,8 @@ def streamOneP4File(self, file, contents):
> size = int(self.stream_file['fileSize'])
> else:
> size = 0 # deleted files don't get a fileSize
> apparently
> - sys.stdout.write('\r%s --> %s (%i MB)\n' % (file_path,
> relPath, size/1024/1024))
> + sys.stdout.write('\r%s --> %s (%s MB)\n' % (
> + file_path, relPath,
> format_size_human_readable(size))) sys.stdout.flush()
You've left the "MB" in. The same thing happens elsewhere.
next prev parent reply other threads:[~2021-12-17 16:56 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-17 14:59 [PATCH 0/2] git-p4: improve formatting of numeric values Joel Holdsworth
2021-12-17 14:59 ` [PATCH 1/2] git-p4: print size values in appropriate units Joel Holdsworth
2021-12-17 16:56 ` Andrew Oakley [this message]
2021-12-17 20:39 ` Joel Holdsworth
2021-12-17 14:59 ` [PATCH 2/2] git-p4: show progress as an integer Joel Holdsworth
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211217165627.49e931d6@ado-tr.dyn.home.arpa \
--to=andrew@adoakley.name \
--cc=dendy.ua@gmail.com \
--cc=dorgonman@hotmail.com \
--cc=git@vger.kernel.org \
--cc=jholdsworth@nvidia.com \
--cc=joachim.kuebart@gmail.com \
--cc=johannes.schindelin@gmx.de \
--cc=luke@diamand.org \
--cc=seraphire@gmail.com \
--cc=tzadik.vanderhoof@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).