Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move ellipsis code to util.ellipsis() and improve maxlength handling.
authorThomas Arendsen Hein <thomas@intevation.de>
Sat, 02 Dec 2006 22:35:17 +0100
changeset 3767 1861fa38a6a7
parent 3766 581665242c07
child 3768 6ae3685be45d
Move ellipsis code to util.ellipsis() and improve maxlength handling.
mercurial/commands.py file | annotate | diff | comparison | revisions
mercurial/util.py file | annotate | diff | comparison | revisions 
--- a/mercurial/commands.py	Sat Dec 02 22:16:00 2006 +0100
+++ b/mercurial/commands.py	Sat Dec 02 22:35:17 2006 +0100
@@ -3031,8 +3031,7 @@
         elif not inst[1]:
             u.warn(_(" empty string\n"))
         else:
-            u.warn("\n%r%s\n" %
-                    (inst[1][:400], len(inst[1]) > 400 and '...' or ''))
+            u.warn("\n%r\n" % util.ellipsis(inst[1]))
     except util.Abort, inst:
         u.warn(_("abort: %s\n") % inst)
     except TypeError, inst:
--- a/mercurial/util.py	Sat Dec 02 22:16:00 2006 +0100
+++ b/mercurial/util.py	Sat Dec 02 22:35:17 2006 +0100
@@ -1032,6 +1032,13 @@
         user = user[:f]
     return user
 
+def ellipsis(text, maxlength=400):
+    """Trim string to at most maxlength (default: 400) characters."""
+    if len(text) <= maxlength:
+        return text
+    else:
+        return "%s..." % (text[:maxlength-3])
+
 def walkrepos(path):
     '''yield every hg repository under path, recursively.'''
     def errhandler(err):
Mercurial