Merge with hg-stable

Merge with hg-stable

--- a/hgext/mq.py	Wed Aug 15 15:30:33 2007 -0500
+++ b/hgext/mq.py	Thu Aug 16 08:19:15 2007 +0200
@@ -916,8 +916,6 @@
             if line.startswith('diff --git'):
                 self.diffopts().git = True
                 break
-        patchf.seek(0)
-        patchf.truncate()
 
         msg = opts.get('msg', '').rstrip()
         if msg:
@@ -932,6 +930,10 @@
                         ci += 1
                     del comments[ci]
             comments.append(msg)
+
+        patchf.seek(0)
+        patchf.truncate()
+
         if comments:
             comments = "\n".join(comments) + '\n\n'
             patchf.write(comments)