facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 15:27:13 +03:00
Code Issues Projects Releases Wiki Activity

diffstat: scale adds/removes proportionally to graph width

Browse Source 
The previous method of scaling had a tendency to include graph lines that
went past the output width when the file with the most changes had a very
large number of changes.
This commit is contained in:
Brodie Rao 2009-08-10 22:59:29 +02:00
parent 8cd1935907
commit 5c00bff54a
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
mercurial/patch.py
View File

@ -9,7 +9,7 @@
from i18n import _
from node import hex, nullid, short
import base85, cmdutil, mdiff, util, diffhelpers, copies
import cStringIO, email.Parser, os, re, math
import cStringIO, email.Parser, os, re
import sys, tempfile, zlib
gitre = re.compile('diff --git a/(.*) b/(.*)')
@ -1429,18 +1429,21 @@ def diffstat(lines, width=80):
maxtotal = max(maxtotal, adds+removes)
countwidth = len(str(maxtotal))
graphwidth = width - countwidth - maxname
graphwidth = width - countwidth - maxname - 6
if graphwidth < 10:
graphwidth = 10
factor = max(int(math.ceil(float(maxtotal) / graphwidth)), 1)
def scale(i):
if maxtotal <= graphwidth:
return i
# If diffstat runs out of room it doesn't print anything,
# which isn't very useful, so always print at least one + or -
# if there were at least some changes.
return max(i * graphwidth // maxtotal, int(bool(i)))
for filename, adds, removes in stats:
# If diffstat runs out of room it doesn't print anything, which
# isn't very useful, so always print at least one + or - if there
# were at least some changes
pluses = '+' * max(adds // factor, int(bool(adds)))
minuses = '-' * max(removes // factor, int(bool(removes)))
pluses = '+' * scale(adds)
minuses = '-' * scale(removes)
output.append(' %-*s | %*.d %s%s\n' % (maxname, filename, countwidth,
adds+removes, pluses, minuses))