comparison 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
comparison
equal deleted inserted replaced
16767:363bde4224c8 16769:e406b9656da3
1184 '''return byte count formatted as readable string, with units''' 1184 '''return byte count formatted as readable string, with units'''
1185 1185
1186 for multiplier, divisor, format in _byteunits: 1186 for multiplier, divisor, format in _byteunits:
1187 if nbytes >= divisor * multiplier: 1187 if nbytes >= divisor * multiplier:
1188 return format % (nbytes / float(divisor)) 1188 return format % (nbytes / float(divisor))
1189 return units[-1][2] % nbytes 1189 return _byteunits[-1][2] % nbytes
1190 1190
1191 def uirepr(s): 1191 def uirepr(s):
1192 # Avoid double backslash in Windows path repr() 1192 # Avoid double backslash in Windows path repr()
1193 return repr(s).replace('\\\\', '\\') 1193 return repr(s).replace('\\\\', '\\')
1194 1194