This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5063

churn: use integer division consistently
ClosedPublic

Authored by durin42 on Oct 13 2018, 6:06 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG81e4f039a0cd: churn: use integer division consistently
Summary

This results in slight output changes, but it's at least consistent
between Python 2 and 3. Since the output is just bar graphs anyway,
I'm content with the changes.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

durin42 created this revision.Oct 13 2018, 6:06 AM
pulkit accepted this revision.Oct 13 2018, 6:30 AM
Closed by commit rHG81e4f039a0cd: churn: use integer division consistently (authored by durin42). · Explain WhyOct 13 2018, 6:50 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mcontrib/python3-whitelist (1 line)
Mhgext/churn.py (4 lines)
Mtests/test-churn.t (40 lines)

Diff 12045

contrib/python3-whitelist

test-check-execute.t test-check-execute.t
test-check-interfaces.py test-check-interfaces.py
test-check-module-imports.t test-check-module-imports.t
test-check-py3-compat.t test-check-py3-compat.t
test-check-pyflakes.t test-check-pyflakes.t
test-check-pylint.t test-check-pylint.t
test-check-shbang.t test-check-shbang.t
test-children.t test-children.t
test-churn.t
test-clone-cgi.t test-clone-cgi.t
test-clone-pull-corruption.t test-clone-pull-corruption.t
test-clone-r.t test-clone-r.t
test-clone-uncompressed.t test-clone-uncompressed.t
test-clone-update-order.t test-clone-update-order.t
test-clone.t test-clone.t
test-clonebundles.t test-clonebundles.t
test-close-head.t test-close-head.t

hgext/churn.py

# churn.py - create a graph of revisions count grouped by template # churn.py - create a graph of revisions count grouped by template
# #
# Copyright 2006 Josef "Jeff" Sipek <jeffpc@josefsipek.net> # Copyright 2006 Josef "Jeff" Sipek <jeffpc@josefsipek.net>
# Copyright 2008 Alexander Solovyov <piranha@piranha.org.ua> # Copyright 2008 Alexander Solovyov <piranha@piranha.org.ua>
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
'''command to display statistics about repository history''' '''command to display statistics about repository history'''
from __future__ import absolute_import from __future__ import absolute_import, division
import datetime import datetime
import os import os
import time import time
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial import ( from mercurial import (
cmdutil, cmdutil,
'diffstat.deleted')) 'diffstat.deleted'))
else: else:
width -= 6 width -= 6
def format(name, count): def format(name, count):
return "%s %6d %s\n" % (pad(name, maxname), sum(count), return "%s %6d %s\n" % (pad(name, maxname), sum(count),
'*' * charnum(sum(count))) '*' * charnum(sum(count)))
def charnum(count): def charnum(count):
return int(round(count * width / maxcount)) return int(round(count * width // maxcount))
for name, count in rate: for name, count in rate:
ui.write(format(name, count)) ui.write(format(name, count))

tests/test-churn.t

user3 3 *************************************************************** user3 3 ***************************************************************
user1 2 ****************************************** user1 2 ******************************************
user2 2 ****************************************** user2 2 ******************************************
churn up to rev 2 churn up to rev 2
$ hg churn -r :2 $ hg churn -r :2
user2 2 *************************************************************** user2 2 ***************************************************************
user1 1 ******************************** user1 1 *******************************
$ cd .. $ cd ..
churn with aliases churn with aliases
$ cat > ../aliases <<EOF $ cat > ../aliases <<EOF
> user1 alias1 > user1 alias1
> user3 alias3 > user3 alias3
> not-an-alias > not-an-alias
$ COLUMNS=40 hg churn $ COLUMNS=40 hg churn
user1 3 *********************** user1 3 ***********************
user3 3 *********************** user3 3 ***********************
user2 2 *************** user2 2 ***************
churn by hour churn by hour
$ hg churn -f '%H' -s $ hg churn -f '%H' -s
06 1 ***************** 06 1 ****************
09 2 ********************************* 09 2 *********************************
12 4 ****************************************************************** 12 4 ******************************************************************
13 1 ***************** 13 1 ****************
churn with separated added/removed lines churn with separated added/removed lines
$ hg rm d/g/f2.txt $ hg rm d/g/f2.txt
$ hg ci -Am "removed d/g/f2.txt" -u user1 -d 14:00 d/g/f2.txt $ hg ci -Am "removed d/g/f2.txt" -u user1 -d 14:00 d/g/f2.txt
$ hg churn --diffstat $ hg churn --diffstat
user1 +3/-1 +++++++++++++++++++++++++++++++++++++++++-------------- user1 +3/-1 ++++++++++++++++++++++++++++++++++++++++-------------
user3 +3/-0 +++++++++++++++++++++++++++++++++++++++++ user3 +3/-0 ++++++++++++++++++++++++++++++++++++++++
user2 +2/-0 +++++++++++++++++++++++++++ user2 +2/-0 +++++++++++++++++++++++++++
churn --diffstat with color churn --diffstat with color
$ hg --config extensions.color= churn --config color.mode=ansi \ $ hg --config extensions.color= churn --config color.mode=ansi \
> --diffstat --color=always > --diffstat --color=always
user1 +3/-1 \x1b[0;32m+++++++++++++++++++++++++++++++++++++++++\x1b[0m\x1b[0;31m--------------\x1b[0m (esc) user1 +3/-1 \x1b[0;32m++++++++++++++++++++++++++++++++++++++++\x1b[0m\x1b[0;31m-------------\x1b[0m (esc)
user3 +3/-0 \x1b[0;32m+++++++++++++++++++++++++++++++++++++++++\x1b[0m (esc) user3 +3/-0 \x1b[0;32m++++++++++++++++++++++++++++++++++++++++\x1b[0m (esc)
user2 +2/-0 \x1b[0;32m+++++++++++++++++++++++++++\x1b[0m (esc) user2 +2/-0 \x1b[0;32m+++++++++++++++++++++++++++\x1b[0m (esc)
changeset number churn changeset number churn
$ hg churn -c $ hg churn -c
user1 4 *************************************************************** user1 4 ***************************************************************
user3 3 *********************************************** user3 3 ***********************************************
user2 2 ******************************** user2 2 *******************************
$ echo 'with space = no-space' >> ../aliases $ echo 'with space = no-space' >> ../aliases
$ echo a >> a $ echo a >> a
$ hg commit -m a -u 'with space' -d 15:00 $ hg commit -m a -u 'with space' -d 15:00
churn with space in alias churn with space in alias
$ hg churn --aliases ../aliases -r tip $ hg churn --aliases ../aliases -r tip
$ touch foo $ touch foo
$ hg ci -Am'foo' -u 'user4 < user4@x.com >' $ hg ci -Am'foo' -u 'user4 < user4@x.com >'
adding foo adding foo
$ hg log -l2 --template '[{author|email}]\n' $ hg log -l2 --template '[{author|email}]\n'
[ user4@x.com ] [ user4@x.com ]
[user4@x.com] [user4@x.com]
$ hg churn -c $ hg churn -c
user1 4 ********************************************************* user1 4 *********************************************************
user3 3 ******************************************* user3 3 ******************************************
user2 2 ***************************** user2 2 ****************************
user4@x.com 2 ***************************** user4@x.com 2 ****************************
with space 1 ************** with space 1 **************
Test multibyte sequences in names Test multibyte sequences in names
$ echo bar >> bar $ echo bar >> bar
$ hg --encoding utf-8 ci -m'changed bar' -u 'El Niño <nino@x.com>' $ hg --encoding utf-8 ci -m'changed bar' -u 'El Niño <nino@x.com>'
$ hg --encoding utf-8 churn -ct '{author|person}' $ hg --encoding utf-8 churn -ct '{author|person}'
user1 4 ********************************************************** user1 4 **********************************************************
user3 3 ******************************************** user3 3 *******************************************
user2 2 ***************************** user2 2 *****************************
user4 2 ***************************** user4 2 *****************************
El Ni\xc3\xb1o 1 *************** (esc) El Ni\xc3\xb1o 1 ************** (esc)
with space 1 *************** with space 1 **************
Test --template argument, with backwards compatibility Test --template argument, with backwards compatibility
$ hg churn -t '{author|user}' $ hg churn -t '{author|user}'
user1 4 *************************************************************** user1 4 ***************************************************************
user3 3 *********************************************** user3 3 ***********************************************
user2 2 ******************************** user2 2 *******************************
nino 1 **************** nino 1 ***************
with 1 **************** with 1 ***************
0 0
user4 0 user4 0
$ hg churn -T '{author|user}' $ hg churn -T '{author|user}'
user1 4 *************************************************************** user1 4 ***************************************************************
user3 3 *********************************************** user3 3 ***********************************************
user2 2 ******************************** user2 2 *******************************
nino 1 **************** nino 1 ***************
with 1 **************** with 1 ***************
0 0
user4 0 user4 0
$ hg churn -t 'alltogether' $ hg churn -t 'alltogether'
alltogether 11 ********************************************************* alltogether 11 *********************************************************
$ hg churn -T 'alltogether' $ hg churn -T 'alltogether'
alltogether 11 ********************************************************* alltogether 11 *********************************************************
$ cd .. $ cd ..