Mercurial > hg

comparison tests/test-largefiles.t @ 22170:0e1b02f984c7 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
largefiles: don't override matchandpats for always matchers (issue4334) This makes hg log --follow --patch work, since in cmdutil._makelogrevset we use the non-follow matcher for hg log --follow --patch with no file arguments.
author Siddharth Agarwal <sid0@fb.com>
date Wed, 13 Aug 2014 15:51:33 -0700
parents 35cc5b07b3fc
children 371cc920ca12
comparison
equal deleted inserted replaced
22169:35cc5b07b3fc 22170:0e1b02f984c7
724 | 724 |
725 o 0:30d30fe6a5be add files 725 o 0:30d30fe6a5be add files
726 726
727 727
728 Test log with --patch 728 Test log with --patch
729
729 $ hg log --patch -r 6::7 730 $ hg log --patch -r 6::7
730 changeset: 6:4355d653f84f 731 changeset: 6:4355d653f84f
731 user: test 732 user: test
732 date: Thu Jan 01 00:00:00 1970 +0000 733 date: Thu Jan 01 00:00:00 1970 +0000
733 summary: edit files yet again 734 summary: edit files yet again
790 --- a/.hglf/sub/large4 Thu Jan 01 00:00:00 1970 +0000 791 --- a/.hglf/sub/large4 Thu Jan 01 00:00:00 1970 +0000
791 +++ b/.hglf/sub/large4 Thu Jan 01 00:00:00 1970 +0000 792 +++ b/.hglf/sub/large4 Thu Jan 01 00:00:00 1970 +0000
792 @@ -1,1 +1,1 @@ 793 @@ -1,1 +1,1 @@
793 -aeb2210d19f02886dde00dac279729a48471e2f9 794 -aeb2210d19f02886dde00dac279729a48471e2f9
794 +971fb41e78fea4f8e0ba5244784239371cb00591 795 +971fb41e78fea4f8e0ba5244784239371cb00591
796 diff -r 9d5af5072dbd -r 4355d653f84f sub/normal4
797 --- a/sub/normal4 Thu Jan 01 00:00:00 1970 +0000
798 +++ b/sub/normal4 Thu Jan 01 00:00:00 1970 +0000
799 @@ -1,1 +1,1 @@
800 -normal4
801 +normal44
802
803
804 log with both --follow and --patch
805
806 $ hg log --follow --patch --limit 2
807 changeset: 7:daea875e9014
808 tag: tip
809 user: test
810 date: Thu Jan 01 00:00:00 1970 +0000
811 summary: add/edit more largefiles
812
813 diff -r 4355d653f84f -r daea875e9014 .hglf/large3
814 --- a/.hglf/large3 Thu Jan 01 00:00:00 1970 +0000
815 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
816 @@ -1,1 +0,0 @@
817 -7838695e10da2bb75ac1156565f40a2595fa2fa0
818 diff -r 4355d653f84f -r daea875e9014 .hglf/sub2/large6
819 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
820 +++ b/.hglf/sub2/large6 Thu Jan 01 00:00:00 1970 +0000
821 @@ -0,0 +1,1 @@
822 +0d6d75887db61b2c7e6c74b5dd8fc6ad50c0cc30
823 diff -r 4355d653f84f -r daea875e9014 .hglf/sub2/large7
824 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
825 +++ b/.hglf/sub2/large7 Thu Jan 01 00:00:00 1970 +0000
826 @@ -0,0 +1,1 @@
827 +bb3151689acb10f0c3125c560d5e63df914bc1af
828
829 changeset: 6:4355d653f84f
830 user: test
831 date: Thu Jan 01 00:00:00 1970 +0000
832 summary: edit files yet again
833
834 diff -r 9d5af5072dbd -r 4355d653f84f .hglf/large3
835 --- a/.hglf/large3 Thu Jan 01 00:00:00 1970 +0000
836 +++ b/.hglf/large3 Thu Jan 01 00:00:00 1970 +0000
837 @@ -1,1 +1,1 @@
838 -baaf12afde9d8d67f25dab6dced0d2bf77dba47c
839 +7838695e10da2bb75ac1156565f40a2595fa2fa0
840 diff -r 9d5af5072dbd -r 4355d653f84f .hglf/sub/large4
841 --- a/.hglf/sub/large4 Thu Jan 01 00:00:00 1970 +0000
842 +++ b/.hglf/sub/large4 Thu Jan 01 00:00:00 1970 +0000
843 @@ -1,1 +1,1 @@
844 -aeb2210d19f02886dde00dac279729a48471e2f9
845 +971fb41e78fea4f8e0ba5244784239371cb00591
846 diff -r 9d5af5072dbd -r 4355d653f84f normal3
847 --- a/normal3 Thu Jan 01 00:00:00 1970 +0000
848 +++ b/normal3 Thu Jan 01 00:00:00 1970 +0000
849 @@ -1,1 +1,1 @@
850 -normal3
851 +normal33
795 diff -r 9d5af5072dbd -r 4355d653f84f sub/normal4 852 diff -r 9d5af5072dbd -r 4355d653f84f sub/normal4
796 --- a/sub/normal4 Thu Jan 01 00:00:00 1970 +0000 853 --- a/sub/normal4 Thu Jan 01 00:00:00 1970 +0000
797 +++ b/sub/normal4 Thu Jan 01 00:00:00 1970 +0000 854 +++ b/sub/normal4 Thu Jan 01 00:00:00 1970 +0000
798 @@ -1,1 +1,1 @@ 855 @@ -1,1 +1,1 @@
799 -normal4 856 -normal4