Merge with crew-stable

hgext/mq.py

@@ -924,8 +924,6 b' class queue:'
                 if line.startswith('diff --git'):
                     self.diffopts().git = True
                     break
-            patchf.seek(0)
-            patchf.truncate()
 
             msg = opts.get('msg', '').rstrip()
             if msg:
@@ -940,6 +938,10 b' class queue:'
                             ci += 1
                         del comments[ci]
                 comments.append(msg)
+
+            patchf.seek(0)
+            patchf.truncate()
+
             if comments:
                 comments = "\n".join(comments) + '\n\n'
                 patchf.write(comments)