Mercurial > hg > mercurial-source
changeset 23766:ed645dc672e5
trydiff: replace dodiff=True/'binary' by binarydiff=False/True
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Wed, 07 Jan 2015 11:02:10 -0800 |
parents | e30c6aa6f2a2 |
children | d43948a910a5 |
files | mercurial/patch.py |
diffstat | 1 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/patch.py +++ b/mercurial/patch.py @@ -1798,7 +1798,7 @@ 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() @@ -1836,7 +1836,7 @@ # forces git mode. if util.binary(tn): if opts.git: - dodiff = 'binary' + binarydiff = True else: losedatafn(f) if not opts.git and not tn: @@ -1854,7 +1854,7 @@ 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) @@ -1865,13 +1865,13 @@ 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))