Show More
@@ -267,6 +267,11 b' def overridelog(orig, ui, repo, *pats, *' | |||||
267 | matchandpats = oldmatchandpats(ctx, pats, opts, globbed, default) |
|
267 | matchandpats = oldmatchandpats(ctx, pats, opts, globbed, default) | |
268 | m, p = copy.copy(matchandpats) |
|
268 | m, p = copy.copy(matchandpats) | |
269 |
|
269 | |||
|
270 | if m.always(): | |||
|
271 | # We want to match everything anyway, so there's no benefit trying | |||
|
272 | # to add standins. | |||
|
273 | return matchandpats | |||
|
274 | ||||
270 | pats = set(p) |
|
275 | pats = set(p) | |
271 | # TODO: handling of patterns in both cases below |
|
276 | # TODO: handling of patterns in both cases below | |
272 | if m._cwd: |
|
277 | if m._cwd: |
@@ -726,6 +726,7 b' Test graph log' | |||||
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 | |
@@ -799,6 +800,62 b' Test log with --patch' | |||||
799 | -normal4 |
|
800 | -normal4 | |
800 | +normal44 |
|
801 | +normal44 | |
801 |
|
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 | |||
|
852 | diff -r 9d5af5072dbd -r 4355d653f84f sub/normal4 | |||
|
853 | --- a/sub/normal4 Thu Jan 01 00:00:00 1970 +0000 | |||
|
854 | +++ b/sub/normal4 Thu Jan 01 00:00:00 1970 +0000 | |||
|
855 | @@ -1,1 +1,1 @@ | |||
|
856 | -normal4 | |||
|
857 | +normal44 | |||
|
858 | ||||
802 | $ cat sub/normal4 |
|
859 | $ cat sub/normal4 | |
803 | normal44 |
|
860 | normal44 | |
804 | $ cat sub/large4 |
|
861 | $ cat sub/large4 |
General Comments 0
You need to be logged in to leave comments.
Login now