Patchwork D1940: patch: avoid repeated binary checks if all files in a patch are text

login
register
mail settings
Submitter phabricator
Date Feb. 1, 2018, 9:47 p.m.
Message ID <b2aff84f2984625933a14ddc90ec4050@localhost.localdomain>
Download mbox | patch
Permalink /patch/27152/
State Not Applicable
Headers show

Comments

phabricator - Feb. 1, 2018, 9:47 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG079b27b5a869: patch: avoid repeated binary checks if all files in a patch are text (authored by joerg.sonnenberger, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D1940?vs=5006&id=5081

REVISION DETAIL
  https://phab.mercurial-scm.org/D1940

AFFECTED FILES
  mercurial/mdiff.py
  mercurial/patch.py

CHANGE DETAILS




To: joerg.sonnenberger, #hg-reviewers
Cc: lothiraldan, mercurial-devel

Patch

diff --git a/mercurial/patch.py b/mercurial/patch.py
--- a/mercurial/patch.py
+++ b/mercurial/patch.py
@@ -2698,8 +2698,13 @@ 
             if opts.git or losedatafn:
                 flag2 = ctx2.flags(f2)
         # if binary is True, output "summary" or "base85", but not "text diff"
-        binary = not opts.text and any(f.isbinary()
-                                       for f in [fctx1, fctx2] if f is not None)
+        if opts.text:
+            check_binary = True
+            binary = False
+        else:
+            check_binary = any(f.isbinary()
+                               for f in [fctx1, fctx2] if f is not None)
+            binary = check_binary
 
         if losedatafn and not opts.git:
             if (binary or
@@ -2789,7 +2794,8 @@ 
 
             uheaders, hunks = mdiff.unidiff(content1, date1,
                                             content2, date2,
-                                            path1, path2, opts=opts)
+                                            path1, path2, opts=opts,
+                                            check_binary=check_binary)
             header.extend(uheaders)
         yield fctx1, fctx2, header, hunks
 
diff --git a/mercurial/mdiff.py b/mercurial/mdiff.py
--- a/mercurial/mdiff.py
+++ b/mercurial/mdiff.py
@@ -234,13 +234,16 @@ 
             yield s, type
         yield s1, '='
 
-def unidiff(a, ad, b, bd, fn1, fn2, opts=defaultopts):
+def unidiff(a, ad, b, bd, fn1, fn2, opts=defaultopts, check_binary=True):
     """Return a unified diff as a (headers, hunks) tuple.
 
     If the diff is not null, `headers` is a list with unified diff header
     lines "--- <original>" and "+++ <new>" and `hunks` is a generator yielding
     (hunkrange, hunklines) coming from _unidiff().
     Otherwise, `headers` and `hunks` are empty.
+
+    Setting `check_binary` to false will skip the binary check, i.e. when
+    it has been done in advance. Files are expected to be text in this case.
     """
     def datetag(date, fn=None):
         if not opts.git and not opts.nodates:
@@ -270,7 +273,7 @@ 
                 text += "\n\ No newline at end of file\n"
             yield text
 
-    if not opts.text and (util.binary(a) or util.binary(b)):
+    if not opts.text and check_binary and (util.binary(a) or util.binary(b)):
         if a and b and len(a) == len(b) and a == b:
             return sentinel
         headerlines = []