# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 1411225617 -7200
# Node ID 6a2cfa61acb0f20d807077b0f35dcddffb2b88f9
# Parent  0d75ce895adccf6bdf525c4b23f7670e3848f277
mq: upgrade non-plain patches to HG format when setting parent in patchheader

Parent will now always be updated or added when qrefreshing HG patches. Plain
patches will not be changed, but patches that neither are plain nor HG will be
upgraded to HG patches on first refresh.

diff -r 0d75ce895adc -r 6a2cfa61acb0 hgext/mq.py
--- a/hgext/mq.py	Sat Sep 20 17:06:56 2014 +0200
+++ b/hgext/mq.py	Sat Sep 20 17:06:57 2014 +0200
@@ -241,7 +241,9 @@
                 patchheaderat = self.comments.index('# HG changeset patch')
                 self.comments.insert(patchheaderat + 1, '# Parent  ' + parent)
             except ValueError:
-                pass
+                if not self.plainmode:
+                    tmp = ['# HG changeset patch', '# Parent  ' + parent]
+                    self.comments = tmp + self.comments
         self.parent = parent
 
     def setmessage(self, message):
diff -r 0d75ce895adc -r 6a2cfa61acb0 tests/test-mq-eol.t
--- a/tests/test-mq-eol.t	Sat Sep 20 17:06:56 2014 +0200
+++ b/tests/test-mq-eol.t	Sat Sep 20 17:06:57 2014 +0200
@@ -84,6 +84,8 @@
   now at: eol.diff
   $ hg qrefresh
   $ python ../cateol.py .hg/patches/eol.diff
+  # HG changeset patch<LF>
+  # Parent  0d0bf99a8b7a3842c6f8ef09e34f69156c4bd9d0<LF>
   test message<LF>
   <LF>
   diff -r 0d0bf99a8b7a a<LF>
diff -r 0d75ce895adc -r 6a2cfa61acb0 tests/test-mq-qpush-fail.t
--- a/tests/test-mq-qpush-fail.t	Sat Sep 20 17:06:56 2014 +0200
+++ b/tests/test-mq-qpush-fail.t	Sat Sep 20 17:06:57 2014 +0200
@@ -23,7 +23,7 @@
   $ echo bar > bar
   $ hg add bar
   $ hg qrefresh -m 'patch 2'
-  $ hg qnew --config 'mq.plain=true' bad-patch
+  $ hg qnew --config 'mq.plain=true' -U bad-patch
   $ echo >> foo
   $ hg qrefresh
   $ hg qpop -a