# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1444122669 25200
# Node ID 1e33384ff2edb2124c6b05b8533ee30ebd01c4c1
# Parent  a6d51dcb18239b191fb3a9d71ea251fae5fa35be
extract: use a single return

The differences between both returns are now very thin, we factor out
that part.

diff -r a6d51dcb1823 -r 1e33384ff2ed mercurial/patch.py
--- a/mercurial/patch.py	Wed Oct 07 00:50:53 2015 -0700
+++ b/mercurial/patch.py	Tue Oct 06 02:11:09 2015 -0700
@@ -262,16 +262,15 @@
     data['message'] = message
     data['user'] = user
     tmpfp.close()
-    if not diffs_seen:
-        os.unlink(tmpname)
-        return data
-
     if parents:
         data['p1'] = parents.pop(0)
         if parents:
             data['p2'] = parents.pop(0)
 
-    data['filename'] = tmpname
+    if diffs_seen:
+        data['filename'] = tmpname
+    else:
+        os.unlink(tmpname)
     return data
 
 class patchmeta(object):