mercurial-scm/hg: comparison mercurial/patch.py

equal deleted inserted replaced

-:e30c6aa6f2a2
+:ed645dc672e5
 addedset.add(f)
 modifiedset.remove(f)
 for f in sorted(modified + added + removed):
 to = None
 tn = None
-dodiff = True
+binarydiff = False
 header = []
 if f not in addedset:
 to = getfilectx(f, ctx1).data()
 if f not in removedset:
 tn = getfilectx(f, ctx2).data()
 # In theory, if tn was copied or renamed we should check
 # if the source is binary too but the copy record already
 # forces git mode.
 if util.binary(tn):
 if opts.git:
-dodiff = 'binary'
+binarydiff = True
 else:
 losedatafn(f)
 if not opts.git and not tn:
 # regular diffs cannot represent new empty file
 losedatafn(f)
 continue
 else:
 header.append('deleted file mode %s\n' %
 gitmode[ctx1.flags(f)])
 if util.binary(to):
-dodiff = 'binary'
+binarydiff = True
 elif not to or util.binary(to):
 # regular diffs cannot represent empty file deletion
 losedatafn(f)
 else:
 oflag = ctx1.flags(f)
 nflag = ctx2.flags(f)
 binary = util.binary(to) or util.binary(tn)
 if opts.git:
 addmodehdr(header, gitmode[oflag], gitmode[nflag])
 if binary:
-dodiff = 'binary'
+binarydiff = True
 elif binary or nflag != oflag:
 losedatafn(f)
 if opts.git or revs:
 header.insert(0, diffline(join(a), join(b), revs))
-if dodiff == 'binary' and not opts.nobinary:
+if binarydiff and not opts.nobinary:
 text = mdiff.b85diff(to, tn)
 if text and opts.git:
 addindexmeta(header, gitindex(to), gitindex(tn))
 else:
 text = mdiff.unidiff(to, date1,