# HG changeset patch # User Mads Kiilerich # Date 1416185323 -3600 # Node ID 5ccced6eab0be9e3479e7981687c6a0ab937fa15 # Parent 83cbf556babf1e5484fda6708eef34497d567a36 mq: when adding headers in plain mode, separate them from message (issue4453) c87f2a5a6e49 did a clean-up in one direction ... but we want it in the other direction. diff -r 83cbf556babf -r 5ccced6eab0b hgext/mq.py --- a/hgext/mq.py Mon Nov 17 01:48:19 2014 +0100 +++ b/hgext/mq.py Mon Nov 17 01:48:43 2014 +0100 @@ -151,6 +151,8 @@ return lines def insertplainheader(lines, header, value): + if lines and lines[0] and ':' not in lines[0]: + lines.insert(0, '') lines.insert(0, '%s: %s' % (header, value)) return lines diff -r 83cbf556babf -r 5ccced6eab0b tests/test-mq-header-date.t --- a/tests/test-mq-header-date.t Mon Nov 17 01:48:19 2014 +0100 +++ b/tests/test-mq-header-date.t Mon Nov 17 01:48:43 2014 +0100 @@ -311,6 +311,7 @@ 0: [mq]: 1.patch - test ==== qref -d Date: 9 0 + Four diff -r ... 4 @@ -494,6 +495,7 @@ ==== qref -u -d Date: 15 0 From: john + Nine diff -r ... 9 diff -r 83cbf556babf -r 5ccced6eab0b tests/test-mq-header-from.t --- a/tests/test-mq-header-from.t Mon Nov 17 01:48:19 2014 +0100 +++ b/tests/test-mq-header-from.t Mon Nov 17 01:48:43 2014 +0100 @@ -250,6 +250,7 @@ 0: [mq]: 1.patch - mary ==== qref -u From: jane + Four diff -r ... 4of