# HG changeset patch # User Pierre-Yves David # Date 1350590689 -7200 # Node ID 2894d180afa1851d896368fab2edaa7123a5d920 # Parent a7462ca7f75e60ae765114b2fcdf8dc7a262372b changelog: extract description cleaning logic in a dedicated function The amend logic have use for it. diff -r a7462ca7f75e -r 2894d180afa1 mercurial/changelog.py --- a/mercurial/changelog.py Thu Oct 18 22:35:28 2012 +0200 +++ b/mercurial/changelog.py Thu Oct 18 22:04:49 2012 +0200 @@ -49,6 +49,10 @@ items = [_string_escape('%s:%s' % (k, d[k])) for k in sorted(d)] return "\0".join(items) +def stripdesc(desc): + """strip trailing whitespace and leading and trailing empty lines""" + return '\n'.join([l.rstrip() for l in desc.splitlines()]).strip('\n') + class appender(object): '''the changelog index must be updated last on disk, so we use this class to delay writes to it''' @@ -308,8 +312,7 @@ raise error.RevlogError(_("username %s contains a newline") % repr(user)) - # strip trailing whitespace and leading and trailing empty lines - desc = '\n'.join([l.rstrip() for l in desc.splitlines()]).strip('\n') + desc = stripdesc(desc) if date: parseddate = "%d %d" % util.parsedate(date)