Mercurial > hg
changeset 21861:b515c3a63e96
encoding: add 'leftside' argument into 'trim' to switch trimming side
| author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
|---|---|
| date | Sun, 06 Jul 2014 02:56:41 +0900 |
| parents | e382cf9ec30b |
| children | ba7f75e7f4e5 |
| files | mercurial/encoding.py |
| diffstat | 1 files changed, 26 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/encoding.py Sun Jul 06 02:56:41 2014 +0900 +++ b/mercurial/encoding.py Sun Jul 06 02:56:41 2014 +0900 @@ -165,9 +165,12 @@ if colwidth(t) == c: return t -def trim(s, width, ellipsis=''): +def trim(s, width, ellipsis='', leftside=False): """Trim string 's' to at most 'width' columns (including 'ellipsis'). + If 'leftside' is True, left side of string 's' is trimmed. + 'ellipsis' is always placed at trimmed side. + >>> ellipsis = '+++' >>> from mercurial import encoding >>> encoding.encoding = 'utf-8' @@ -178,8 +181,12 @@ 1234567890 >>> print trim(t, 8, ellipsis=ellipsis) 12345+++ + >>> print trim(t, 8, ellipsis=ellipsis, leftside=True) + +++67890 >>> print trim(t, 8) 12345678 + >>> print trim(t, 8, leftside=True) + 34567890 >>> print trim(t, 3, ellipsis=ellipsis) +++ >>> print trim(t, 1, ellipsis=ellipsis) @@ -192,10 +199,16 @@ \xe3\x81\x82\xe3\x81\x84\xe3\x81\x86\xe3\x81\x88\xe3\x81\x8a >>> print trim(t, 8, ellipsis=ellipsis) \xe3\x81\x82\xe3\x81\x84+++ + >>> print trim(t, 8, ellipsis=ellipsis, leftside=True) + +++\xe3\x81\x88\xe3\x81\x8a >>> print trim(t, 5) \xe3\x81\x82\xe3\x81\x84 + >>> print trim(t, 5, leftside=True) + \xe3\x81\x88\xe3\x81\x8a >>> print trim(t, 4, ellipsis=ellipsis) +++ + >>> print trim(t, 4, ellipsis=ellipsis, leftside=True) + +++ >>> t = '\x11\x22\x33\x44\x55\x66\x77\x88\x99\xaa' # invalid byte sequence >>> print trim(t, 12, ellipsis=ellipsis) \x11\x22\x33\x44\x55\x66\x77\x88\x99\xaa @@ -203,8 +216,12 @@ \x11\x22\x33\x44\x55\x66\x77\x88\x99\xaa >>> print trim(t, 8, ellipsis=ellipsis) \x11\x22\x33\x44\x55+++ + >>> print trim(t, 8, ellipsis=ellipsis, leftside=True) + +++\x66\x77\x88\x99\xaa >>> print trim(t, 8) \x11\x22\x33\x44\x55\x66\x77\x88 + >>> print trim(t, 8, leftside=True) + \x33\x44\x55\x66\x77\x88\x99\xaa >>> print trim(t, 3, ellipsis=ellipsis) +++ >>> print trim(t, 1, ellipsis=ellipsis) @@ -218,6 +235,8 @@ width -= len(ellipsis) if width <= 0: # no enough room even for ellipsis return ellipsis[:width + len(ellipsis)] + if leftside: + return ellipsis + s[-width:] return s[:width] + ellipsis if ucolwidth(u) <= width: # trimming is not needed @@ -227,8 +246,12 @@ if width <= 0: # no enough room even for ellipsis return ellipsis[:width + len(ellipsis)] - uslice = lambda i: u[:-i] - concat = lambda s: s + ellipsis + if leftside: + uslice = lambda i: u[i:] + concat = lambda s: ellipsis + s + else: + uslice = lambda i: u[:-i] + concat = lambda s: s + ellipsis for i in xrange(1, len(u)): usub = uslice(i) if ucolwidth(usub) <= width: