merge with stable
authorMatt Mackall <mpm@selenic.com>
Mon, 21 May 2012 17:35:28 -0500
changeset 16769 e406b9656da3
parent 16767 363bde4224c8 (current diff)
parent 16768 23a125545c3d (diff)
child 16770 b3435385f99f
merge with stable
mercurial/util.py
--- 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()