# HG changeset patch
# User Patrick Mezard <pmezard@gmail.com>
# Date 2011-04-26 19:22:14
# Node ID 19a7b48446e398641d6d5bba341e53b1d106138e
# Parent  bd738875943a3295c9dec7b8191e93ceb0319c79

patch: remove redundant variable in iterhunks()

diff --git a/mercurial/patch.py b/mercurial/patch.py
--- a/mercurial/patch.py
+++ b/mercurial/patch.py
@@ -1007,7 +1007,7 @@ def iterhunks(ui, fp):
     bfile = ""
     state = None
     hunknum = 0
-    emitfile = False
+    emitfile = newfile = False
     git = False
 
     # our states
@@ -1016,7 +1016,6 @@ def iterhunks(ui, fp):
     lr = linereader(fp)
 
     while True:
-        newfile = newgitfile = False
         x = lr.readline()
         if not x:
             break
@@ -1058,7 +1057,7 @@ def iterhunks(ui, fp):
                 if gp and (gp.op in ('COPY', 'DELETE', 'RENAME', 'ADD')
                            or gp.mode):
                     afile = bfile
-                newgitfile = True
+                newfile = True
         elif x.startswith('---'):
             # check for a unified diff
             l2 = lr.readline()
@@ -1085,7 +1084,8 @@ def iterhunks(ui, fp):
             afile = parsefilename(x)
             bfile = parsefilename(l2)
 
-        if newgitfile or newfile:
+        if newfile:
+            newfile = False
             emitfile = True
             state = BFILE
             hunknum = 0