From patchwork Fri Feb  6 00:00:46 2015
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [4,of,4] trydiff: call util.binary in only one place
From: Martin von Zweigbergk <martinvonz@google.com>
X-Patchwork-Id: 7696
Message-Id: <914241af8a67fa52e23d.1423180846@martinvonz.mtv.corp.google.com>
To: mercurial-devel@selenic.com
Date: Thu, 05 Feb 2015 16:00:46 -0800

# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1421994129 28800
#      Thu Jan 22 22:22:09 2015 -0800
# Node ID 914241af8a67fa52e23d288b3cfc27cf492f2c94
# Parent  282e35936726d0267ffcf58f949c56d8de1b33f8
trydiff: call util.binary in only one place

It's practically free to call util.binary on empty or None content. By
relying on that, we can replace the current four call sites by one.

diff -r 282e35936726 -r 914241af8a67 mercurial/patch.py
--- a/mercurial/patch.py	Thu Jan 22 21:35:57 2015 -0800
+++ b/mercurial/patch.py	Thu Jan 22 22:22:09 2015 -0800
@@ -1796,7 +1796,6 @@
                         else:
                             copyop = 'copy'
                         content1 = getfilectx(f1, ctx1).data()
-                binary = util.binary(content1) or util.binary(content2)
             elif f in removedset:
                 if opts.git:
                     # have we already reported a copy above?
@@ -1805,13 +1804,11 @@
                         continue
                     else:
                         flag1 = ctx1.flags(f)
-                        binary = util.binary(content1)
-                else:
-                    binary = util.binary(content1)
             else:
                 flag1 = ctx1.flags(f)
                 flag2 = ctx2.flags(f)
-                binary = util.binary(content1) or util.binary(content2)
+
+            binary = util.binary(content1) or util.binary(content2)
 
         if losedatafn and not opts.git:
             if (binary or