Patchwork [1,of,3,v2] patch: make diff in git mode respect --text option (issue5510)

login
register
mail settings
Submitter Alexander Fomin
Date April 5, 2017, 10:51 p.m.
Message ID <bb06942306b27dfbbe55.1491432707@devvm2125.lla2.facebook.com>
Download mbox | patch
Permalink /patch/19973/
State Accepted
Headers show

Comments

Alexander Fomin - April 5, 2017, 10:51 p.m.
# HG changeset patch
# User Alexander Fomin <afomin@fb.com>
# Date 1491430506 25200
#      Wed Apr 05 15:15:06 2017 -0700
# Node ID bb06942306b27dfbbe554c307f82a5c6b08e0cae
# Parent  65969cd351b73228642d1e491e8c78b20d85405a
patch: make diff in git mode respect --text option (issue5510)

This changeset makes patch respect -a/--text option in --git mode by aligning
its behaviour with git itself.

Patch

diff --git a/mercurial/patch.py b/mercurial/patch.py
--- a/mercurial/patch.py
+++ b/mercurial/patch.py
@@ -2552,7 +2552,7 @@  def trydiff(repo, revs, ctx1, ctx2, modi
         elif revs and not repo.ui.quiet:
             header.append(diffline(path1, revs))
 
-        if binary and opts.git and not opts.nobinary:
+        if binary and opts.git and not opts.nobinary and not opts.text:
             text = mdiff.b85diff(content1, content2)
             if text:
                 header.append('index %s..%s' %
diff --git a/tests/test-diff-binary-file.t b/tests/test-diff-binary-file.t
--- a/tests/test-diff-binary-file.t
+++ b/tests/test-diff-binary-file.t
@@ -73,5 +73,39 @@ 
   literal 5
   Mc$_OqttjCF00uV!&;S4c
   
+  $ cd ..
+
+Test text mode with extended git-style diff format
+  $ hg init b
+  $ cd b
+  $ cat > writebin.py <<EOF
+  > import sys
+  > path = sys.argv[1]
+  > open(path, 'wb').write('\x00\x01\x02\x03')
+  > EOF
+  $ python writebin.py binfile.bin
+  $ hg add binfile.bin
+  $ hg ci -m 'add binfile.bin'
+
+  $ echo >> binfile.bin
+  $ hg ci -m 'change binfile.bin'
+
+  $ hg diff --git -a -r 0 -r 1
+  diff --git a/binfile.bin b/binfile.bin
+  --- a/binfile.bin
+  +++ b/binfile.bin
+  @@ -1,1 +1,1 @@
+  -\x00\x01\x02\x03 (esc)
+  \ No newline at end of file
+  +\x00\x01\x02\x03 (esc)
+
+  $ HGPLAIN=1 hg diff --git -a -r 0 -r 1
+  diff --git a/binfile.bin b/binfile.bin
+  --- a/binfile.bin
+  +++ b/binfile.bin
+  @@ -1,1 +1,1 @@
+  -\x00\x01\x02\x03 (esc)
+  \ No newline at end of file
+  +\x00\x01\x02\x03 (esc)
 
   $ cd ..