equal
deleted
inserted
replaced
2883 o 1: null+2 |
2883 o 1: null+2 |
2884 | |
2884 | |
2885 o 0: null+1 |
2885 o 0: null+1 |
2886 |
2886 |
2887 |
2887 |
2888 One common tag: longest path wins: |
2888 One common tag: longest path wins for {latesttagdistance}: |
2889 |
2889 |
2890 $ hg tag -r 1 -m t1 -d '6 0' t1 |
2890 $ hg tag -r 1 -m t1 -d '6 0' t1 |
2891 $ hg log -G --template '{rev}: {latesttag}+{latesttagdistance}\n' |
2891 $ hg log -G --template '{rev}: {latesttag}+{latesttagdistance}\n' |
2892 @ 6: t1+4 |
2892 @ 6: t1+4 |
2893 | |
2893 | |
2902 o 1: t1+0 |
2902 o 1: t1+0 |
2903 | |
2903 | |
2904 o 0: null+1 |
2904 o 0: null+1 |
2905 |
2905 |
2906 |
2906 |
2907 One ancestor tag: more recent wins: |
2907 One ancestor tag: closest wins: |
2908 |
2908 |
2909 $ hg tag -r 2 -m t2 -d '7 0' t2 |
2909 $ hg tag -r 2 -m t2 -d '7 0' t2 |
2910 $ hg log -G --template '{rev}: {latesttag}+{latesttagdistance}\n' |
2910 $ hg log -G --template '{rev}: {latesttag}+{latesttagdistance}\n' |
2911 @ 7: t2+3 |
2911 @ 7: t2+3 |
2912 | |
2912 | |
2923 o 1: t1+0 |
2923 o 1: t1+0 |
2924 | |
2924 | |
2925 o 0: null+1 |
2925 o 0: null+1 |
2926 |
2926 |
2927 |
2927 |
2928 Two branch tags: more recent wins: |
2928 Two branch tags: more recent wins if same number of changes: |
2929 |
2929 |
2930 $ hg tag -r 3 -m t3 -d '8 0' t3 |
2930 $ hg tag -r 3 -m t3 -d '8 0' t3 |
2931 $ hg log -G --template '{rev}: {latesttag}+{latesttagdistance}\n' |
2931 $ hg log -G --template '{rev}: {latesttag}+{latesttagdistance}\n' |
2932 @ 8: t3+5 |
2932 @ 8: t3+5 |
2933 | |
2933 | |
2946 o 1: t1+0 |
2946 o 1: t1+0 |
2947 | |
2947 | |
2948 o 0: null+1 |
2948 o 0: null+1 |
2949 |
2949 |
2950 |
2950 |
|
2951 Two branch tags: fewest changes wins: |
|
2952 |
|
2953 $ hg tag -r 4 -m t4 -d '4 0' t4 # older than t2, but should not matter |
|
2954 $ hg log -G --template "{rev}: {latesttag % '{tag}+{distance},{changes} '}\n" |
|
2955 @ 9: t4+5,6 |
|
2956 | |
|
2957 o 8: t4+4,5 |
|
2958 | |
|
2959 o 7: t4+3,4 |
|
2960 | |
|
2961 o 6: t4+2,3 |
|
2962 | |
|
2963 o 5: t4+1,2 |
|
2964 |\ |
|
2965 | o 4: t4+0,0 |
|
2966 | | |
|
2967 | o 3: t3+0,0 |
|
2968 | | |
|
2969 o | 2: t2+0,0 |
|
2970 |/ |
|
2971 o 1: t1+0,0 |
|
2972 | |
|
2973 o 0: null+1,1 |
|
2974 |
|
2975 |
2951 Merged tag overrides: |
2976 Merged tag overrides: |
2952 |
2977 |
2953 $ hg tag -r 5 -m t5 -d '9 0' t5 |
2978 $ hg tag -r 5 -m t5 -d '9 0' t5 |
2954 $ hg tag -r 3 -m at3 -d '10 0' at3 |
2979 $ hg tag -r 3 -m at3 -d '10 0' at3 |
2955 $ hg log -G --template '{rev}: {latesttag}+{latesttagdistance}\n' |
2980 $ hg log -G --template '{rev}: {latesttag}+{latesttagdistance}\n' |
2956 @ 10: t5+5 |
2981 @ 11: t5+6 |
|
2982 | |
|
2983 o 10: t5+5 |
2957 | |
2984 | |
2958 o 9: t5+4 |
2985 o 9: t5+4 |
2959 | |
2986 | |
2960 o 8: t5+3 |
2987 o 8: t5+3 |
2961 | |
2988 | |
2963 | |
2990 | |
2964 o 6: t5+1 |
2991 o 6: t5+1 |
2965 | |
2992 | |
2966 o 5: t5+0 |
2993 o 5: t5+0 |
2967 |\ |
2994 |\ |
2968 | o 4: at3:t3+1 |
2995 | o 4: t4+0 |
2969 | | |
2996 | | |
2970 | o 3: at3:t3+0 |
2997 | o 3: at3:t3+0 |
2971 | | |
2998 | | |
2972 o | 2: t2+0 |
2999 o | 2: t2+0 |
2973 |/ |
3000 |/ |
2975 | |
3002 | |
2976 o 0: null+1 |
3003 o 0: null+1 |
2977 |
3004 |
2978 |
3005 |
2979 $ hg log -G --template "{rev}: {latesttag % '{tag}+{distance},{changes} '}\n" |
3006 $ hg log -G --template "{rev}: {latesttag % '{tag}+{distance},{changes} '}\n" |
2980 @ 10: t5+5,5 |
3007 @ 11: t5+6,6 |
|
3008 | |
|
3009 o 10: t5+5,5 |
2981 | |
3010 | |
2982 o 9: t5+4,4 |
3011 o 9: t5+4,4 |
2983 | |
3012 | |
2984 o 8: t5+3,3 |
3013 o 8: t5+3,3 |
2985 | |
3014 | |
2987 | |
3016 | |
2988 o 6: t5+1,1 |
3017 o 6: t5+1,1 |
2989 | |
3018 | |
2990 o 5: t5+0,0 |
3019 o 5: t5+0,0 |
2991 |\ |
3020 |\ |
2992 | o 4: at3+1,1 t3+1,1 |
3021 | o 4: t4+0,0 |
2993 | | |
3022 | | |
2994 | o 3: at3+0,0 t3+0,0 |
3023 | o 3: at3+0,0 t3+0,0 |
2995 | | |
3024 | | |
2996 o | 2: t2+0,0 |
3025 o | 2: t2+0,0 |
2997 |/ |
3026 |/ |
2999 | |
3028 | |
3000 o 0: null+1,1 |
3029 o 0: null+1,1 |
3001 |
3030 |
3002 |
3031 |
3003 $ hg log -G --template "{rev}: {latesttag('re:^t[13]$') % '{tag}, C: {changes}, D: {distance}'}\n" |
3032 $ hg log -G --template "{rev}: {latesttag('re:^t[13]$') % '{tag}, C: {changes}, D: {distance}'}\n" |
3004 @ 10: t3, C: 8, D: 7 |
3033 @ 11: t3, C: 9, D: 8 |
|
3034 | |
|
3035 o 10: t3, C: 8, D: 7 |
3005 | |
3036 | |
3006 o 9: t3, C: 7, D: 6 |
3037 o 9: t3, C: 7, D: 6 |
3007 | |
3038 | |
3008 o 8: t3, C: 6, D: 5 |
3039 o 8: t3, C: 6, D: 5 |
3009 | |
3040 | |
3042 > [ui] |
3073 > [ui] |
3043 > style = ~/styles/teststyle |
3074 > style = ~/styles/teststyle |
3044 > EOF |
3075 > EOF |
3045 |
3076 |
3046 $ hg -R latesttag tip |
3077 $ hg -R latesttag tip |
3047 test 10:9b4a630e5f5f |
3078 test 11:97e5943b523a |
3048 |
3079 |
3049 Test recursive showlist template (issue1989): |
3080 Test recursive showlist template (issue1989): |
3050 |
3081 |
3051 $ cat > style1989 <<EOF |
3082 $ cat > style1989 <<EOF |
3052 > changeset = '{file_mods}{manifest}{extras}' |
3083 > changeset = '{file_mods}{manifest}{extras}' |
3055 > extra = '{key}: {author}\n' |
3086 > extra = '{key}: {author}\n' |
3056 > EOF |
3087 > EOF |
3057 |
3088 |
3058 $ hg -R latesttag log -r tip --style=style1989 |
3089 $ hg -R latesttag log -r tip --style=style1989 |
3059 M|test |
3090 M|test |
3060 10,test |
3091 11,test |
3061 branch: test |
3092 branch: test |
3062 |
3093 |
3063 Test new-style inline templating: |
3094 Test new-style inline templating: |
3064 |
3095 |
3065 $ hg log -R latesttag -r tip --template 'modified files: {file_mods % " {file}\n"}\n' |
3096 $ hg log -R latesttag -r tip --template 'modified files: {file_mods % " {file}\n"}\n' |
3088 Test the strip function with chars specified: |
3119 Test the strip function with chars specified: |
3089 |
3120 |
3090 $ hg log -R latesttag --template '{desc}\n' |
3121 $ hg log -R latesttag --template '{desc}\n' |
3091 at3 |
3122 at3 |
3092 t5 |
3123 t5 |
|
3124 t4 |
3093 t3 |
3125 t3 |
3094 t2 |
3126 t2 |
3095 t1 |
3127 t1 |
3096 merge |
3128 merge |
3097 h2e |
3129 h2e |
3101 a |
3133 a |
3102 |
3134 |
3103 $ hg log -R latesttag --template '{strip(desc, "te")}\n' |
3135 $ hg log -R latesttag --template '{strip(desc, "te")}\n' |
3104 at3 |
3136 at3 |
3105 5 |
3137 5 |
|
3138 4 |
3106 3 |
3139 3 |
3107 2 |
3140 2 |
3108 1 |
3141 1 |
3109 merg |
3142 merg |
3110 h2 |
3143 h2 |
3116 Test date format: |
3149 Test date format: |
3117 |
3150 |
3118 $ hg log -R latesttag --template 'date: {date(date, "%y %m %d %S %z")}\n' |
3151 $ hg log -R latesttag --template 'date: {date(date, "%y %m %d %S %z")}\n' |
3119 date: 70 01 01 10 +0000 |
3152 date: 70 01 01 10 +0000 |
3120 date: 70 01 01 09 +0000 |
3153 date: 70 01 01 09 +0000 |
|
3154 date: 70 01 01 04 +0000 |
3121 date: 70 01 01 08 +0000 |
3155 date: 70 01 01 08 +0000 |
3122 date: 70 01 01 07 +0000 |
3156 date: 70 01 01 07 +0000 |
3123 date: 70 01 01 06 +0000 |
3157 date: 70 01 01 06 +0000 |
3124 date: 70 01 01 05 +0100 |
3158 date: 70 01 01 05 +0100 |
3125 date: 70 01 01 04 +0000 |
3159 date: 70 01 01 04 +0000 |