# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1444122286 25200
# Node ID 1a680ccdb09aa96545157af27b4025ba74b3b635
# Parent  25a58881efdde4c5a7bcf4ec5c763749ba083334
extract: assign message only once

This return is shared between the two cases. We can move it earlier.

diff -r 25a58881efdd -r 1a680ccdb09a mercurial/patch.py
--- a/mercurial/patch.py	Tue Oct 06 02:04:06 2015 -0700
+++ b/mercurial/patch.py	Tue Oct 06 02:04:46 2015 -0700
@@ -262,10 +262,10 @@
 
     if subject and not message.startswith(subject):
         message = '%s\n%s' % (subject, message)
+    data['message'] = message
     tmpfp.close()
     if not diffs_seen:
         os.unlink(tmpname)
-        data['message'] = message
         data['user'] = user
         data['date'] = date
         data['branch'] = branch
@@ -278,7 +278,6 @@
             p2 = parents.pop(0)
 
     data['filename'] = tmpname
-    data['message'] = message
     data['user'] = user
     data['date'] = date
     data['branch'] = branch