--- a/mercurial/patch.py	Tue Oct 06 02:01:53 2015 -0700
+++ b/mercurial/patch.py	Tue Oct 06 02:04:06 2015 -0700
@@ -271,15 +271,11 @@
         data['branch'] = branch
         return data
 
+    p1 = p2 = None
     if parents:
         p1 = parents.pop(0)
-    else:
-        p1 = None
-
-    if parents:
-        p2 = parents.pop(0)
-    else:
-        p2 = None
+        if parents:
+            p2 = parents.pop(0)
 
     data['filename'] = tmpname
     data['message'] = message