##// END OF EJS Templates
patch: remove redundant variable in iterhunks()
Patrick Mezard -
r14017:19a7b484 default
parent child Browse files
Show More
@@ -1007,7 +1007,7 b' def iterhunks(ui, fp):'
1007 bfile = ""
1007 bfile = ""
1008 state = None
1008 state = None
1009 hunknum = 0
1009 hunknum = 0
1010 emitfile = False
1010 emitfile = newfile = False
1011 git = False
1011 git = False
1012
1012
1013 # our states
1013 # our states
@@ -1016,7 +1016,6 b' def iterhunks(ui, fp):'
1016 lr = linereader(fp)
1016 lr = linereader(fp)
1017
1017
1018 while True:
1018 while True:
1019 newfile = newgitfile = False
1020 x = lr.readline()
1019 x = lr.readline()
1021 if not x:
1020 if not x:
1022 break
1021 break
@@ -1058,7 +1057,7 b' def iterhunks(ui, fp):'
1058 if gp and (gp.op in ('COPY', 'DELETE', 'RENAME', 'ADD')
1057 if gp and (gp.op in ('COPY', 'DELETE', 'RENAME', 'ADD')
1059 or gp.mode):
1058 or gp.mode):
1060 afile = bfile
1059 afile = bfile
1061 newgitfile = True
1060 newfile = True
1062 elif x.startswith('---'):
1061 elif x.startswith('---'):
1063 # check for a unified diff
1062 # check for a unified diff
1064 l2 = lr.readline()
1063 l2 = lr.readline()
@@ -1085,7 +1084,8 b' def iterhunks(ui, fp):'
1085 afile = parsefilename(x)
1084 afile = parsefilename(x)
1086 bfile = parsefilename(l2)
1085 bfile = parsefilename(l2)
1087
1086
1088 if newgitfile or newfile:
1087 if newfile:
1088 newfile = False
1089 emitfile = True
1089 emitfile = True
1090 state = BFILE
1090 state = BFILE
1091 hunknum = 0
1091 hunknum = 0
General Comments 0
You need to be logged in to leave comments. Login now