upstream/mercurial-mirror Files · tests/test-diff-binary-file.t

identify: add template support...

identify: add template support This is based on a patch proposed last year by Mathias De Maré[1], with a few changes. - Tags and bookmarks are now formatted lists, for more flexible queries. - The templater is populated whether or not [-nibtB] is specified. (Plain output is unchanged.) This seems more consistent with other templated commands. - The 'id' property is a string, instead of a list. - The parents of 'wdir()' have their own list of attributes. I left 'id' as a string because it seems very useful for generating version info. It's also a bit strange because the value and meaning changes depending on whether or not --debug is passed (short vs full hash), whether the revision is a merge or not (one hash or two, separated by a '+'), the working directory or not (node vs p1node), and local or not (remote defaults to tip, and never has '+'). The equivalent string built with {rev} seems much less useful, and I couldn't think of a reasonable name, so I left it out. The discussion seemed to be pointing towards having a list of nodes, with more than one entry for a merge. It seems simpler to give the nodes a name, and use {node} for the actual commit probed, especially now that there is a virtual node for 'wdir()'. Yuya mentioned using fm.nested() in that thread, so I did for the parent nodes. I'm not sure if the plan is to fill in all of the context attributes in these items, or if these nested items should simply be made {p1node} and {p1rev}. I used ':' as the tag separator for consistency with {tags} in the log templater. Likewise, bookmarks are separated by a space for consistency with the corresponding log template. [1] https://www.mercurial-scm.org/pipermail/mercurial-devel/2016-August/087039.html

Augie Fackler - - Load All Authors

File last commit:

r32940:75be1499 default


                r33051:15a79ac8

default

Download file

             test-diff-binary-file.t
        
                    144 lines
            
             | 4.7 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-diff-binary-file.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init a

        $ cd a

        $ cp "$TESTDIR/binfile.bin" .

        $ hg add binfile.bin

        $ hg ci -m 'add binfile.bin'

        $ echo >> binfile.bin

        $ hg ci -m 'change binfile.bin'

        $ hg revert -r 0 binfile.bin

        $ hg ci -m 'revert binfile.bin'

        $ hg cp binfile.bin nonbinfile

        $ echo text > nonbinfile

        $ hg ci -m 'make non-binary copy of binary file'

        $ hg diff --nodates -r 0 -r 1

        diff -r 48b371597640 -r acea2ab458c8 binfile.bin

        Binary file binfile.bin has changed

        $ hg diff --nodates -r 0 -r 2

        $ hg diff --git -r 0 -r 1

        diff --git a/binfile.bin b/binfile.bin

        index 37ba3d1c6f17137d9c5f5776fa040caf5fe73ff9..58dc31a9e2f40f74ff3b45903f7d620b8e5b7356

        GIT binary patch

        literal 594

        zc$@)J0<HatP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00009a7bBm000XU

        z000XU0RWnu7ytkO2XskIMF-Uh9TW;VpMjwv0005-Nkl<ZD9@FWPs=e;7{<>W$NUkd

        zX$nnYLt$-$V!?uy+1V%`z&Eh=ah|duER<4|QWhju3gb^nF*8iYobxWG-qqXl=2~5M

        z*IoDB)sG^CfNuoBmqLTVU^<;@nwHP!1wrWd`{(mHo6VNXWtyh{alzqmsH*yYzpvLT

        zLdY<T=ks|woh-`&01!ej#(xbV1f|pI*=%;d-%F*E*X#ZH`4I%6SS+$EJDE&ct=8po

        ziN#{?_j|kD%Cd|oiqds`xm@;oJ-^?NG3Gdqrs?5u*zI;{nogxsx~^|Fn^Y?Gdc6<;

        zfMJ+iF1J`LMx&A2?dEwNW8ClebzPTbIh{@$hS6*`kH@1d%Lo7fA#}N1)oN7`gm$~V

        z+wDx#)OFqMcE{s!JN0-xhG8ItAjVkJwEcb`3WWlJfU2r?;Pd%dmR+q@mSri5q9_W-

        zaR2~ECX?B2w+zELozC0s*6Z~|QG^f{3I#<`?)Q7U-JZ|q5W;9Q8i_=pBuSzunx=U;

        z9C)5jBoYw9^?EHyQl(M}1OlQcCX>lXB*ODN003Z&P17_@)3Pi=i0wb04<W?v-u}7K

        zXmmQA+wDgE!qR9o8jr`%=ab_&uh(l?R=r;Tjiqon91I2-hIu?57~@*4h7h9uORK#=

        gQItJW-{SoTm)8|5##k|m00000NkvXXu0mjf3JwksH2?qr

        $ hg diff --git -r 0 -r 2

        $ hg diff --config diff.nobinary=True --git -r 0 -r 1

        diff --git a/binfile.bin b/binfile.bin

        Binary file binfile.bin has changed

        $ HGPLAIN=1 hg diff --config diff.nobinary=True --git -r 0 -r 1

        diff --git a/binfile.bin b/binfile.bin

        index 37ba3d1c6f17137d9c5f5776fa040caf5fe73ff9..58dc31a9e2f40f74ff3b45903f7d620b8e5b7356

        GIT binary patch

        literal 594

        zc$@)J0<HatP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00009a7bBm000XU

        z000XU0RWnu7ytkO2XskIMF-Uh9TW;VpMjwv0005-Nkl<ZD9@FWPs=e;7{<>W$NUkd

        zX$nnYLt$-$V!?uy+1V%`z&Eh=ah|duER<4|QWhju3gb^nF*8iYobxWG-qqXl=2~5M

        z*IoDB)sG^CfNuoBmqLTVU^<;@nwHP!1wrWd`{(mHo6VNXWtyh{alzqmsH*yYzpvLT

        zLdY<T=ks|woh-`&01!ej#(xbV1f|pI*=%;d-%F*E*X#ZH`4I%6SS+$EJDE&ct=8po

        ziN#{?_j|kD%Cd|oiqds`xm@;oJ-^?NG3Gdqrs?5u*zI;{nogxsx~^|Fn^Y?Gdc6<;

        zfMJ+iF1J`LMx&A2?dEwNW8ClebzPTbIh{@$hS6*`kH@1d%Lo7fA#}N1)oN7`gm$~V

        z+wDx#)OFqMcE{s!JN0-xhG8ItAjVkJwEcb`3WWlJfU2r?;Pd%dmR+q@mSri5q9_W-

        zaR2~ECX?B2w+zELozC0s*6Z~|QG^f{3I#<`?)Q7U-JZ|q5W;9Q8i_=pBuSzunx=U;

        z9C)5jBoYw9^?EHyQl(M}1OlQcCX>lXB*ODN003Z&P17_@)3Pi=i0wb04<W?v-u}7K

        zXmmQA+wDgE!qR9o8jr`%=ab_&uh(l?R=r;Tjiqon91I2-hIu?57~@*4h7h9uORK#=

        gQItJW-{SoTm)8|5##k|m00000NkvXXu0mjf3JwksH2?qr

        $ hg diff --git -r 2 -r 3

        diff --git a/binfile.bin b/nonbinfile

        copy from binfile.bin

        copy to nonbinfile

        index 37ba3d1c6f17137d9c5f5776fa040caf5fe73ff9..8e27be7d6154a1f68ea9160ef0e18691d20560dc

        GIT binary patch

        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)

      Test binary mode with extended git-style diff format

        $ hg diff --no-binary -r 0 -r 1

        diff -r fb45f71337ad -r 9ca112d1a3c1 binfile.bin

        Binary file binfile.bin has changed

        $ hg diff --git --no-binary -r 0 -r 1

        diff --git a/binfile.bin b/binfile.bin

        Binary file binfile.bin has changed

        $ hg diff --git --binary -r 0 -r 1

        diff --git a/binfile.bin b/binfile.bin

        index eaf36c1daccfdf325514461cd1a2ffbc139b5464..ba71a782e93f3fb63a428383706065e3ec2828e9

        GIT binary patch

        literal 5

        Mc${NkWMbw50018V5dZ)H

        $ hg diff --git --binary --config diff.nobinary=True -r 0 -r 1

        diff --git a/binfile.bin b/binfile.bin

        index eaf36c1daccfdf325514461cd1a2ffbc139b5464..ba71a782e93f3fb63a428383706065e3ec2828e9

        GIT binary patch

        literal 5

        Mc${NkWMbw50018V5dZ)H

        $ hg diff --git --binary --text -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 ..

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				$ hg init a
				$ cd a
				$ cp "$TESTDIR/binfile.bin" .
				$ hg add binfile.bin
				$ hg ci -m 'add binfile.bin'

				$ echo >> binfile.bin
				$ hg ci -m 'change binfile.bin'

				$ hg revert -r 0 binfile.bin
				$ hg ci -m 'revert binfile.bin'
				$ hg cp binfile.bin nonbinfile
				$ echo text > nonbinfile
				$ hg ci -m 'make non-binary copy of binary file'

				$ hg diff --nodates -r 0 -r 1
				diff -r 48b371597640 -r acea2ab458c8 binfile.bin
				Binary file binfile.bin has changed

				$ hg diff --nodates -r 0 -r 2

				$ hg diff --git -r 0 -r 1
				diff --git a/binfile.bin b/binfile.bin
				index 37ba3d1c6f17137d9c5f5776fa040caf5fe73ff9..58dc31a9e2f40f74ff3b45903f7d620b8e5b7356
				GIT binary patch
				literal 594
				zc$@)J0<HatP)<h;3K\|Lk000e1NJLTq000mG000mO0ssI2kdbIM00009a7bBm000XU
				z000XU0RWnu7ytkO2XskIMF-Uh9TW;VpMjwv0005-Nkl<ZD9@FWPs=e;7{<>W$NUkd
				zX$nnYLt$-$V!?uy+1V%`z&Eh=ah\|duER<4\|QWhju3gb^nF*8iYobxWG-qqXl=2~5M
				zIoDB)sG^CfNuoBmqLTVU^<;@nwHP!1wrWd`{(mHo6VNXWtyh{alzqmsHyYzpvLT
				zLdY<T=ks\|woh-`&01!ej#(xbV1f\|pI=%;d-%FE*X#ZH`4I%6SS+$EJDE&ct=8po
				ziN#{?_j\|kD%Cd\|oiqds`xm@;oJ-^?NG3Gdqrs?5u*zI;{nogxsx~^\|Fn^Y?Gdc6<;
				zfMJ+iF1J`LMx&A2?dEwNW8ClebzPTbIh{@$hS6*`kH@1d%Lo7fA#}N1)oN7`gm$~V
				z+wDx#)OFqMcE{s!JN0-xhG8ItAjVkJwEcb`3WWlJfU2r?;Pd%dmR+q@mSri5q9_W-
				zaR2~ECX?B2w+zELozC0s*6Z~\|QG^f{3I#<`?)Q7U-JZ\|q5W;9Q8i_=pBuSzunx=U;
				z9C)5jBoYw9^?EHyQl(M}1OlQcCX>lXB*ODN003Z&P17_@)3Pi=i0wb04<W?v-u}7K
				zXmmQA+wDgE!qR9o8jr`%=ab_&uh(l?R=r;Tjiqon91I2-hIu?57~@*4h7h9uORK#=
				gQItJW-{SoTm)8\|5##k\|m00000NkvXXu0mjf3JwksH2?qr


				$ hg diff --git -r 0 -r 2

				$ hg diff --config diff.nobinary=True --git -r 0 -r 1
				diff --git a/binfile.bin b/binfile.bin
				Binary file binfile.bin has changed

				$ HGPLAIN=1 hg diff --config diff.nobinary=True --git -r 0 -r 1
				diff --git a/binfile.bin b/binfile.bin
				index 37ba3d1c6f17137d9c5f5776fa040caf5fe73ff9..58dc31a9e2f40f74ff3b45903f7d620b8e5b7356
				GIT binary patch
				literal 594
				zc$@)J0<HatP)<h;3K\|Lk000e1NJLTq000mG000mO0ssI2kdbIM00009a7bBm000XU
				z000XU0RWnu7ytkO2XskIMF-Uh9TW;VpMjwv0005-Nkl<ZD9@FWPs=e;7{<>W$NUkd
				zX$nnYLt$-$V!?uy+1V%`z&Eh=ah\|duER<4\|QWhju3gb^nF*8iYobxWG-qqXl=2~5M
				zIoDB)sG^CfNuoBmqLTVU^<;@nwHP!1wrWd`{(mHo6VNXWtyh{alzqmsHyYzpvLT
				zLdY<T=ks\|woh-`&01!ej#(xbV1f\|pI=%;d-%FE*X#ZH`4I%6SS+$EJDE&ct=8po
				ziN#{?_j\|kD%Cd\|oiqds`xm@;oJ-^?NG3Gdqrs?5u*zI;{nogxsx~^\|Fn^Y?Gdc6<;
				zfMJ+iF1J`LMx&A2?dEwNW8ClebzPTbIh{@$hS6*`kH@1d%Lo7fA#}N1)oN7`gm$~V
				z+wDx#)OFqMcE{s!JN0-xhG8ItAjVkJwEcb`3WWlJfU2r?;Pd%dmR+q@mSri5q9_W-
				zaR2~ECX?B2w+zELozC0s*6Z~\|QG^f{3I#<`?)Q7U-JZ\|q5W;9Q8i_=pBuSzunx=U;
				z9C)5jBoYw9^?EHyQl(M}1OlQcCX>lXB*ODN003Z&P17_@)3Pi=i0wb04<W?v-u}7K
				zXmmQA+wDgE!qR9o8jr`%=ab_&uh(l?R=r;Tjiqon91I2-hIu?57~@*4h7h9uORK#=
				gQItJW-{SoTm)8\|5##k\|m00000NkvXXu0mjf3JwksH2?qr



				$ hg diff --git -r 2 -r 3
				diff --git a/binfile.bin b/nonbinfile
				copy from binfile.bin
				copy to nonbinfile
				index 37ba3d1c6f17137d9c5f5776fa040caf5fe73ff9..8e27be7d6154a1f68ea9160ef0e18691d20560dc
				GIT binary patch
				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)

				Test binary mode with extended git-style diff format
				$ hg diff --no-binary -r 0 -r 1
				diff -r fb45f71337ad -r 9ca112d1a3c1 binfile.bin
				Binary file binfile.bin has changed

				$ hg diff --git --no-binary -r 0 -r 1
				diff --git a/binfile.bin b/binfile.bin
				Binary file binfile.bin has changed

				$ hg diff --git --binary -r 0 -r 1
				diff --git a/binfile.bin b/binfile.bin
				index eaf36c1daccfdf325514461cd1a2ffbc139b5464..ba71a782e93f3fb63a428383706065e3ec2828e9
				GIT binary patch
				literal 5
				Mc${NkWMbw50018V5dZ)H

				$ hg diff --git --binary --config diff.nobinary=True -r 0 -r 1
				diff --git a/binfile.bin b/binfile.bin
				index eaf36c1daccfdf325514461cd1a2ffbc139b5464..ba71a782e93f3fb63a428383706065e3ec2828e9
				GIT binary patch
				literal 5
				Mc${NkWMbw50018V5dZ)H


				$ hg diff --git --binary --text -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 ..