Mercurial > hg
changeset 24102:00280a2b8b9a
trydiff: break 'if opts.git or losedatafn' into two
This moves the initialization 'binary' closer to its other assignment,
but exists mostly to simplify future patches.
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 06 Feb 2015 15:21:56 -0800 |
parents | 1ea90d140ee3 |
children | c666c85f71ba |
files | mercurial/patch.py |
diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/patch.py Thu Jan 22 22:42:35 2015 -0800 +++ b/mercurial/patch.py Fri Feb 06 15:21:56 2015 -0800 @@ -1776,7 +1776,6 @@ flag2 = None content1 = None content2 = None - binary = False copyop = None if f not in addedset: content1 = getfilectx(f, ctx1).data() @@ -1810,6 +1809,8 @@ flag1 = ctx1.flags(f) flag2 = ctx2.flags(f) + binary = False + if opts.git or losedatafn: binary = util.binary(content1) or util.binary(content2) if losedatafn and not opts.git: