Mercurial > public > mercurial-scm > hg
diff mercurial/util.py @ 16769:e406b9656da3
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 21 May 2012 17:35:28 -0500 |
parents | c2d9ef43ff6c 23a125545c3d |
children | 107a3270a24a |
line wrap: on
line diff
--- a/mercurial/util.py Fri May 18 13:50:02 2012 -0300 +++ b/mercurial/util.py Mon May 21 17:35:28 2012 -0500 @@ -1186,7 +1186,7 @@ for multiplier, divisor, format in _byteunits: if nbytes >= divisor * multiplier: return format % (nbytes / float(divisor)) - return units[-1][2] % nbytes + return _byteunits[-1][2] % nbytes def uirepr(s): # Avoid double backslash in Windows path repr()