# HG changeset patch # User Jeff Hammel # Date 1279322286 25200 # Node ID 190ce22e7e83d5ec43b4de39fe6b60d744593bc2 # Parent 4d38d14cf1d43b09909185874fcadcb46ef0f48c scour the log and format it like a civilized human being diff -r 4d38d14cf1d4 -r 190ce22e7e83 gut/main.py --- a/gut/main.py Fri Jul 16 16:00:56 2010 -0700 +++ b/gut/main.py Fri Jul 16 16:18:06 2010 -0700 @@ -75,7 +75,38 @@ output = self.branch() + '.diff' diff = diff['stdout'] log = log['stdout'] - f = file(output) # write the output to a patch file + + # format the log + lines = [] + oldline = None + for line in log.splitlines(): + if not line: + continue + if line[0].strip(): + if oldline: + lines.append(oldline) + oldline = None + incomment = False + continue + line = line.strip() + if line.startswith('*'): + if oldline: + lines.append(oldline) + oldline = None + lines.append(line[1:].strip()) + continue + if oldline: + oldline = oldline + ' ' + line + else: + oldline = line + else: + if oldline: + lines.append(oldline) + log = '\n\n'.join(['* %s' % line for line in lines]) + + f = file(output, 'w') # write the output to a patch file + print >> f, diff + f.close() return log def branch(self):