upstream/mercurial-mirror Commit - r28999:790c076c

graphmod: disable graph styling when HGPLAIN is set (issue5212)...

Martijn Pieters -

r28999:790c076c stable

parent child

mercurial/cmdutil.py

0 +20 -14

@@ -2234,20 +2234,26 b' def displaygraph(ui, repo, dag, displaye'
2234	formatnode = _graphnodeformatter(ui, displayer)	2234	formatnode = _graphnodeformatter(ui, displayer)
2235	state = graphmod.asciistate()	2235	state = graphmod.asciistate()
2236	styles = state['styles']	2236	styles = state['styles']
2237	edgetypes = {	2237
2238	'parent': graphmod.PARENT,	2238	# only set graph styling if HGPLAIN is not set.
2239	'grandparent': graphmod.GRANDPARENT,	2239	if ui.plain('graph'):
2240	'missing': graphmod.MISSINGPARENT	2240	# set all edge styles to \|, the default pre-3.8 behaviour
2241	}	2241	styles.update(dict.fromkeys(styles, '\|'))
2242	for name, key in edgetypes.items():	2242	else:
2243	# experimental config: experimental.graphstyle.*	2243	edgetypes = {
2244	styles[key] = ui.config('experimental', 'graphstyle.%s' % name,	2244	'parent': graphmod.PARENT,
2245	styles[key])	2245	'grandparent': graphmod.GRANDPARENT,
2246	if not styles[key]:	2246	'missing': graphmod.MISSINGPARENT
2247	styles[key] = None	2247	}
2248		2248	for name, key in edgetypes.items():
2249	# experimental config: experimental.graphs~~horten~~	2249	# experimental config: experimental.graphstyle.*
2250	st~~ate~~[~~'graphshorten'~~] = ui.config~~bool~~('experimental', 'graphs~~horten~~')	2250	styles[key] = ui.config('experimental', 'graphstyle.%s' % name,
		2251	styles[key])
		2252	if not styles[key]:
		2253	styles[key] = None
		2254
		2255	# experimental config: experimental.graphshorten
		2256	state['graphshorten'] = ui.configbool('experimental', 'graphshorten')
2251		2257
2252	for rev, type, ctx, parents in dag:	2258	for rev, type, ctx, parents in dag:
2253	char = formatnode(repo, ctx)	2259	char = formatnode(repo, ctx)

tests/test-glog.t

0 +404 0

@@ -2633,6 +2633,410 b' change graph edge styling'
2633	summary: (4) merge two known; one immediate left, one immediate right	2633	summary: (4) merge two known; one immediate left, one immediate right
2634		2634
2635		2635
		2636	Setting HGPLAIN ignores graphmod styling:
		2637
		2638	$ HGPLAIN=1 hg log -G -r 'file("a")' -m
		2639	@ changeset: 36:08a19a744424
		2640	\| branch: branch
		2641	\| tag: tip
		2642	\| parent: 35:9159c3644c5e
		2643	\| parent: 35:9159c3644c5e
		2644	\| user: test
		2645	\| date: Thu Jan 01 00:00:36 1970 +0000
		2646	\| summary: (36) buggy merge: identical parents
		2647	\|
		2648	o changeset: 32:d06dffa21a31
		2649	\|\ parent: 27:886ed638191b
		2650	\| \| parent: 31:621d83e11f67
		2651	\| \| user: test
		2652	\| \| date: Thu Jan 01 00:00:32 1970 +0000
		2653	\| \| summary: (32) expand
		2654	\| \|
		2655	o \| changeset: 31:621d83e11f67
		2656	\|\\| parent: 21:d42a756af44d
		2657	\| \| parent: 30:6e11cd4b648f
		2658	\| \| user: test
		2659	\| \| date: Thu Jan 01 00:00:31 1970 +0000
		2660	\| \| summary: (31) expand
		2661	\| \|
		2662	o \| changeset: 30:6e11cd4b648f
		2663	\|\ \ parent: 28:44ecd0b9ae99
		2664	\| \| \| parent: 29:cd9bb2be7593
		2665	\| \| \| user: test
		2666	\| \| \| date: Thu Jan 01 00:00:30 1970 +0000
		2667	\| \| \| summary: (30) expand
		2668	\| \| \|
		2669	o \| \| changeset: 28:44ecd0b9ae99
		2670	\|\ \ \ parent: 1:6db2ef61d156
		2671	\| \| \| \| parent: 26:7f25b6c2f0b9
		2672	\| \| \| \| user: test
		2673	\| \| \| \| date: Thu Jan 01 00:00:28 1970 +0000
		2674	\| \| \| \| summary: (28) merge zero known
		2675	\| \| \| \|
		2676	o \| \| \| changeset: 26:7f25b6c2f0b9
		2677	\|\ \ \ \ parent: 18:1aa84d96232a
		2678	\| \| \| \| \| parent: 25:91da8ed57247
		2679	\| \| \| \| \| user: test
		2680	\| \| \| \| \| date: Thu Jan 01 00:00:26 1970 +0000
		2681	\| \| \| \| \| summary: (26) merge one known; far right
		2682	\| \| \| \| \|
		2683	\| o-----+ changeset: 25:91da8ed57247
		2684	\| \| \| \| \| parent: 21:d42a756af44d
		2685	\| \| \| \| \| parent: 24:a9c19a3d96b7
		2686	\| \| \| \| \| user: test
		2687	\| \| \| \| \| date: Thu Jan 01 00:00:25 1970 +0000
		2688	\| \| \| \| \| summary: (25) merge one known; far left
		2689	\| \| \| \| \|
		2690	\| o \| \| \| changeset: 24:a9c19a3d96b7
		2691	\| \|\ \ \ \ parent: 0:e6eb3150255d
		2692	\| \| \| \| \| \| parent: 23:a01cddf0766d
		2693	\| \| \| \| \| \| user: test
		2694	\| \| \| \| \| \| date: Thu Jan 01 00:00:24 1970 +0000
		2695	\| \| \| \| \| \| summary: (24) merge one known; immediate right
		2696	\| \| \| \| \| \|
		2697	\| o---+ \| \| changeset: 23:a01cddf0766d
		2698	\| \| \| \| \| \| parent: 1:6db2ef61d156
		2699	\| \| \| \| \| \| parent: 22:e0d9cccacb5d
		2700	\| \| \| \| \| \| user: test
		2701	\| \| \| \| \| \| date: Thu Jan 01 00:00:23 1970 +0000
		2702	\| \| \| \| \| \| summary: (23) merge one known; immediate left
		2703	\| \| \| \| \| \|
		2704	\| o-------+ changeset: 22:e0d9cccacb5d
		2705	\| \| \| \| \| \| parent: 18:1aa84d96232a
		2706	\|/ / / / / parent: 21:d42a756af44d
		2707	\| \| \| \| \| user: test
		2708	\| \| \| \| \| date: Thu Jan 01 00:00:22 1970 +0000
		2709	\| \| \| \| \| summary: (22) merge two known; one far left, one far right
		2710	\| \| \| \| \|
		2711	\| \| \| \| o changeset: 21:d42a756af44d
		2712	\| \| \| \| \|\ parent: 19:31ddc2c1573b
		2713	\| \| \| \| \| \| parent: 20:d30ed6450e32
		2714	\| \| \| \| \| \| user: test
		2715	\| \| \| \| \| \| date: Thu Jan 01 00:00:21 1970 +0000
		2716	\| \| \| \| \| \| summary: (21) expand
		2717	\| \| \| \| \| \|
		2718	+-+-------o changeset: 20:d30ed6450e32
		2719	\| \| \| \| \| parent: 0:e6eb3150255d
		2720	\| \| \| \| \| parent: 18:1aa84d96232a
		2721	\| \| \| \| \| user: test
		2722	\| \| \| \| \| date: Thu Jan 01 00:00:20 1970 +0000
		2723	\| \| \| \| \| summary: (20) merge two known; two far right
		2724	\| \| \| \| \|
		2725	\| \| \| \| o changeset: 19:31ddc2c1573b
		2726	\| \| \| \| \|\ parent: 15:1dda3f72782d
		2727	\| \| \| \| \| \| parent: 17:44765d7c06e0
		2728	\| \| \| \| \| \| user: test
		2729	\| \| \| \| \| \| date: Thu Jan 01 00:00:19 1970 +0000
		2730	\| \| \| \| \| \| summary: (19) expand
		2731	\| \| \| \| \| \|
		2732	o---+---+ \| changeset: 18:1aa84d96232a
		2733	\| \| \| \| \| parent: 1:6db2ef61d156
		2734	/ / / / / parent: 15:1dda3f72782d
		2735	\| \| \| \| \| user: test
		2736	\| \| \| \| \| date: Thu Jan 01 00:00:18 1970 +0000
		2737	\| \| \| \| \| summary: (18) merge two known; two far left
		2738	\| \| \| \| \|
		2739	\| \| \| \| o changeset: 17:44765d7c06e0
		2740	\| \| \| \| \|\ parent: 12:86b91144a6e9
		2741	\| \| \| \| \| \| parent: 16:3677d192927d
		2742	\| \| \| \| \| \| user: test
		2743	\| \| \| \| \| \| date: Thu Jan 01 00:00:17 1970 +0000
		2744	\| \| \| \| \| \| summary: (17) expand
		2745	\| \| \| \| \| \|
		2746	+-+-------o changeset: 16:3677d192927d
		2747	\| \| \| \| \| parent: 0:e6eb3150255d
		2748	\| \| \| \| \| parent: 1:6db2ef61d156
		2749	\| \| \| \| \| user: test
		2750	\| \| \| \| \| date: Thu Jan 01 00:00:16 1970 +0000
		2751	\| \| \| \| \| summary: (16) merge two known; one immediate right, one near right
		2752	\| \| \| \| \|
		2753	\| \| \| o \| changeset: 15:1dda3f72782d
		2754	\| \| \| \|\ \ parent: 13:22d8966a97e3
		2755	\| \| \| \| \| \| parent: 14:8eac370358ef
		2756	\| \| \| \| \| \| user: test
		2757	\| \| \| \| \| \| date: Thu Jan 01 00:00:15 1970 +0000
		2758	\| \| \| \| \| \| summary: (15) expand
		2759	\| \| \| \| \| \|
		2760	+-------o \| changeset: 14:8eac370358ef
		2761	\| \| \| \| \|/ parent: 0:e6eb3150255d
		2762	\| \| \| \| \| parent: 12:86b91144a6e9
		2763	\| \| \| \| \| user: test
		2764	\| \| \| \| \| date: Thu Jan 01 00:00:14 1970 +0000
		2765	\| \| \| \| \| summary: (14) merge two known; one immediate right, one far right
		2766	\| \| \| \| \|
		2767	\| \| \| o \| changeset: 13:22d8966a97e3
		2768	\| \| \| \|\ \ parent: 9:7010c0af0a35
		2769	\| \| \| \| \| \| parent: 11:832d76e6bdf2
		2770	\| \| \| \| \| \| user: test
		2771	\| \| \| \| \| \| date: Thu Jan 01 00:00:13 1970 +0000
		2772	\| \| \| \| \| \| summary: (13) expand
		2773	\| \| \| \| \| \|
		2774	\| +---+---o changeset: 12:86b91144a6e9
		2775	\| \| \| \| \| parent: 1:6db2ef61d156
		2776	\| \| \| \| \| parent: 9:7010c0af0a35
		2777	\| \| \| \| \| user: test
		2778	\| \| \| \| \| date: Thu Jan 01 00:00:12 1970 +0000
		2779	\| \| \| \| \| summary: (12) merge two known; one immediate right, one far left
		2780	\| \| \| \| \|
		2781	\| \| \| \| o changeset: 11:832d76e6bdf2
		2782	\| \| \| \| \|\ parent: 6:b105a072e251
		2783	\| \| \| \| \| \| parent: 10:74c64d036d72
		2784	\| \| \| \| \| \| user: test
		2785	\| \| \| \| \| \| date: Thu Jan 01 00:00:11 1970 +0000
		2786	\| \| \| \| \| \| summary: (11) expand
		2787	\| \| \| \| \| \|
		2788	+---------o changeset: 10:74c64d036d72
		2789	\| \| \| \| \|/ parent: 0:e6eb3150255d
		2790	\| \| \| \| \| parent: 6:b105a072e251
		2791	\| \| \| \| \| user: test
		2792	\| \| \| \| \| date: Thu Jan 01 00:00:10 1970 +0000
		2793	\| \| \| \| \| summary: (10) merge two known; one immediate left, one near right
		2794	\| \| \| \| \|
		2795	\| \| \| o \| changeset: 9:7010c0af0a35
		2796	\| \| \| \|\ \ parent: 7:b632bb1b1224
		2797	\| \| \| \| \| \| parent: 8:7a0b11f71937
		2798	\| \| \| \| \| \| user: test
		2799	\| \| \| \| \| \| date: Thu Jan 01 00:00:09 1970 +0000
		2800	\| \| \| \| \| \| summary: (9) expand
		2801	\| \| \| \| \| \|
		2802	+-------o \| changeset: 8:7a0b11f71937
		2803	\| \| \| \|/ / parent: 0:e6eb3150255d
		2804	\| \| \| \| \| parent: 7:b632bb1b1224
		2805	\| \| \| \| \| user: test
		2806	\| \| \| \| \| date: Thu Jan 01 00:00:08 1970 +0000
		2807	\| \| \| \| \| summary: (8) merge two known; one immediate left, one far right
		2808	\| \| \| \| \|
		2809	\| \| \| o \| changeset: 7:b632bb1b1224
		2810	\| \| \| \|\ \ parent: 2:3d9a33b8d1e1
		2811	\| \| \| \| \| \| parent: 5:4409d547b708
		2812	\| \| \| \| \| \| user: test
		2813	\| \| \| \| \| \| date: Thu Jan 01 00:00:07 1970 +0000
		2814	\| \| \| \| \| \| summary: (7) expand
		2815	\| \| \| \| \| \|
		2816	\| \| \| +---o changeset: 6:b105a072e251
		2817	\| \| \| \| \|/ parent: 2:3d9a33b8d1e1
		2818	\| \| \| \| \| parent: 5:4409d547b708
		2819	\| \| \| \| \| user: test
		2820	\| \| \| \| \| date: Thu Jan 01 00:00:06 1970 +0000
		2821	\| \| \| \| \| summary: (6) merge two known; one immediate left, one far left
		2822	\| \| \| \| \|
		2823	\| \| \| o \| changeset: 5:4409d547b708
		2824	\| \| \| \|\ \ parent: 3:27eef8ed80b4
		2825	\| \| \| \| \| \| parent: 4:26a8bac39d9f
		2826	\| \| \| \| \| \| user: test
		2827	\| \| \| \| \| \| date: Thu Jan 01 00:00:05 1970 +0000
		2828	\| \| \| \| \| \| summary: (5) expand
		2829	\| \| \| \| \| \|
		2830	\| +---o \| \| changeset: 4:26a8bac39d9f
		2831	\| \| \| \|/ / parent: 1:6db2ef61d156
		2832	\| \| \| \| \| parent: 3:27eef8ed80b4
		2833	\| \| \| \| \| user: test
		2834	\| \| \| \| \| date: Thu Jan 01 00:00:04 1970 +0000
		2835	\| \| \| \| \| summary: (4) merge two known; one immediate left, one immediate right
		2836	\| \| \| \| \|
		2837
		2838	.. unless HGPLAINEXCEPT=graph is set:
		2839
		2840	$ HGPLAIN=1 HGPLAINEXCEPT=graph hg log -G -r 'file("a")' -m
		2841	@ changeset: 36:08a19a744424
		2842	: branch: branch
		2843	: tag: tip
		2844	: parent: 35:9159c3644c5e
		2845	: parent: 35:9159c3644c5e
		2846	: user: test
		2847	: date: Thu Jan 01 00:00:36 1970 +0000
		2848	: summary: (36) buggy merge: identical parents
		2849	:
		2850	o changeset: 32:d06dffa21a31
		2851	\|\ parent: 27:886ed638191b
		2852	\| : parent: 31:621d83e11f67
		2853	\| : user: test
		2854	\| : date: Thu Jan 01 00:00:32 1970 +0000
		2855	\| : summary: (32) expand
		2856	\| :
		2857	o : changeset: 31:621d83e11f67
		2858	\|\: parent: 21:d42a756af44d
		2859	\| : parent: 30:6e11cd4b648f
		2860	\| : user: test
		2861	\| : date: Thu Jan 01 00:00:31 1970 +0000
		2862	\| : summary: (31) expand
		2863	\| :
		2864	o : changeset: 30:6e11cd4b648f
		2865	\|\ \ parent: 28:44ecd0b9ae99
		2866	\| ~ : parent: 29:cd9bb2be7593
		2867	\| : user: test
		2868	\| : date: Thu Jan 01 00:00:30 1970 +0000
		2869	\| : summary: (30) expand
		2870	\| /
		2871	o : changeset: 28:44ecd0b9ae99
		2872	\|\ \ parent: 1:6db2ef61d156
		2873	\| ~ : parent: 26:7f25b6c2f0b9
		2874	\| : user: test
		2875	\| : date: Thu Jan 01 00:00:28 1970 +0000
		2876	\| : summary: (28) merge zero known
		2877	\| /
		2878	o : changeset: 26:7f25b6c2f0b9
		2879	\|\ \ parent: 18:1aa84d96232a
		2880	\| \| : parent: 25:91da8ed57247
		2881	\| \| : user: test
		2882	\| \| : date: Thu Jan 01 00:00:26 1970 +0000
		2883	\| \| : summary: (26) merge one known; far right
		2884	\| \| :
		2885	\| o : changeset: 25:91da8ed57247
		2886	\| \|\: parent: 21:d42a756af44d
		2887	\| \| : parent: 24:a9c19a3d96b7
		2888	\| \| : user: test
		2889	\| \| : date: Thu Jan 01 00:00:25 1970 +0000
		2890	\| \| : summary: (25) merge one known; far left
		2891	\| \| :
		2892	\| o : changeset: 24:a9c19a3d96b7
		2893	\| \|\ \ parent: 0:e6eb3150255d
		2894	\| \| ~ : parent: 23:a01cddf0766d
		2895	\| \| : user: test
		2896	\| \| : date: Thu Jan 01 00:00:24 1970 +0000
		2897	\| \| : summary: (24) merge one known; immediate right
		2898	\| \| /
		2899	\| o : changeset: 23:a01cddf0766d
		2900	\| \|\ \ parent: 1:6db2ef61d156
		2901	\| \| ~ : parent: 22:e0d9cccacb5d
		2902	\| \| : user: test
		2903	\| \| : date: Thu Jan 01 00:00:23 1970 +0000
		2904	\| \| : summary: (23) merge one known; immediate left
		2905	\| \| /
		2906	\| o : changeset: 22:e0d9cccacb5d
		2907	\|/:/ parent: 18:1aa84d96232a
		2908	\| : parent: 21:d42a756af44d
		2909	\| : user: test
		2910	\| : date: Thu Jan 01 00:00:22 1970 +0000
		2911	\| : summary: (22) merge two known; one far left, one far right
		2912	\| :
		2913	\| o changeset: 21:d42a756af44d
		2914	\| \|\ parent: 19:31ddc2c1573b
		2915	\| \| \| parent: 20:d30ed6450e32
		2916	\| \| \| user: test
		2917	\| \| \| date: Thu Jan 01 00:00:21 1970 +0000
		2918	\| \| \| summary: (21) expand
		2919	\| \| \|
		2920	+---o changeset: 20:d30ed6450e32
		2921	\| \| \| parent: 0:e6eb3150255d
		2922	\| \| ~ parent: 18:1aa84d96232a
		2923	\| \| user: test
		2924	\| \| date: Thu Jan 01 00:00:20 1970 +0000
		2925	\| \| summary: (20) merge two known; two far right
		2926	\| \|
		2927	\| o changeset: 19:31ddc2c1573b
		2928	\| \|\ parent: 15:1dda3f72782d
		2929	\| \| \| parent: 17:44765d7c06e0
		2930	\| \| \| user: test
		2931	\| \| \| date: Thu Jan 01 00:00:19 1970 +0000
		2932	\| \| \| summary: (19) expand
		2933	\| \| \|
		2934	o \| \| changeset: 18:1aa84d96232a
		2935	\|\\| \| parent: 1:6db2ef61d156
		2936	~ \| \| parent: 15:1dda3f72782d
		2937	\| \| user: test
		2938	\| \| date: Thu Jan 01 00:00:18 1970 +0000
		2939	\| \| summary: (18) merge two known; two far left
		2940	/ /
		2941	\| o changeset: 17:44765d7c06e0
		2942	\| \|\ parent: 12:86b91144a6e9
		2943	\| \| \| parent: 16:3677d192927d
		2944	\| \| \| user: test
		2945	\| \| \| date: Thu Jan 01 00:00:17 1970 +0000
		2946	\| \| \| summary: (17) expand
		2947	\| \| \|
		2948	\| \| o changeset: 16:3677d192927d
		2949	\| \| \|\ parent: 0:e6eb3150255d
		2950	\| \| ~ ~ parent: 1:6db2ef61d156
		2951	\| \| user: test
		2952	\| \| date: Thu Jan 01 00:00:16 1970 +0000
		2953	\| \| summary: (16) merge two known; one immediate right, one near right
		2954	\| \|
		2955	o \| changeset: 15:1dda3f72782d
		2956	\|\ \ parent: 13:22d8966a97e3
		2957	\| \| \| parent: 14:8eac370358ef
		2958	\| \| \| user: test
		2959	\| \| \| date: Thu Jan 01 00:00:15 1970 +0000
		2960	\| \| \| summary: (15) expand
		2961	\| \| \|
		2962	\| o \| changeset: 14:8eac370358ef
		2963	\| \|\\| parent: 0:e6eb3150255d
		2964	\| ~ \| parent: 12:86b91144a6e9
		2965	\| \| user: test
		2966	\| \| date: Thu Jan 01 00:00:14 1970 +0000
		2967	\| \| summary: (14) merge two known; one immediate right, one far right
		2968	\| /
		2969	o \| changeset: 13:22d8966a97e3
		2970	\|\ \ parent: 9:7010c0af0a35
		2971	\| \| \| parent: 11:832d76e6bdf2
		2972	\| \| \| user: test
		2973	\| \| \| date: Thu Jan 01 00:00:13 1970 +0000
		2974	\| \| \| summary: (13) expand
		2975	\| \| \|
		2976	+---o changeset: 12:86b91144a6e9
		2977	\| \| \| parent: 1:6db2ef61d156
		2978	\| \| ~ parent: 9:7010c0af0a35
		2979	\| \| user: test
		2980	\| \| date: Thu Jan 01 00:00:12 1970 +0000
		2981	\| \| summary: (12) merge two known; one immediate right, one far left
		2982	\| \|
		2983	\| o changeset: 11:832d76e6bdf2
		2984	\| \|\ parent: 6:b105a072e251
		2985	\| \| \| parent: 10:74c64d036d72
		2986	\| \| \| user: test
		2987	\| \| \| date: Thu Jan 01 00:00:11 1970 +0000
		2988	\| \| \| summary: (11) expand
		2989	\| \| \|
		2990	\| \| o changeset: 10:74c64d036d72
		2991	\| \|/\| parent: 0:e6eb3150255d
		2992	\| \| ~ parent: 6:b105a072e251
		2993	\| \| user: test
		2994	\| \| date: Thu Jan 01 00:00:10 1970 +0000
		2995	\| \| summary: (10) merge two known; one immediate left, one near right
		2996	\| \|
		2997	o \| changeset: 9:7010c0af0a35
		2998	\|\ \ parent: 7:b632bb1b1224
		2999	\| \| \| parent: 8:7a0b11f71937
		3000	\| \| \| user: test
		3001	\| \| \| date: Thu Jan 01 00:00:09 1970 +0000
		3002	\| \| \| summary: (9) expand
		3003	\| \| \|
		3004	\| o \| changeset: 8:7a0b11f71937
		3005	\|/\| \| parent: 0:e6eb3150255d
		3006	\| ~ \| parent: 7:b632bb1b1224
		3007	\| \| user: test
		3008	\| \| date: Thu Jan 01 00:00:08 1970 +0000
		3009	\| \| summary: (8) merge two known; one immediate left, one far right
		3010	\| /
		3011	o \| changeset: 7:b632bb1b1224
		3012	\|\ \ parent: 2:3d9a33b8d1e1
		3013	\| ~ \| parent: 5:4409d547b708
		3014	\| \| user: test
		3015	\| \| date: Thu Jan 01 00:00:07 1970 +0000
		3016	\| \| summary: (7) expand
		3017	\| /
		3018	\| o changeset: 6:b105a072e251
		3019	\|/\| parent: 2:3d9a33b8d1e1
		3020	\| ~ parent: 5:4409d547b708
		3021	\| user: test
		3022	\| date: Thu Jan 01 00:00:06 1970 +0000
		3023	\| summary: (6) merge two known; one immediate left, one far left
		3024	\|
		3025	o changeset: 5:4409d547b708
		3026	\|\ parent: 3:27eef8ed80b4
		3027	\| ~ parent: 4:26a8bac39d9f
		3028	\| user: test
		3029	\| date: Thu Jan 01 00:00:05 1970 +0000
		3030	\| summary: (5) expand
		3031	\|
		3032	o changeset: 4:26a8bac39d9f
		3033	\|\ parent: 1:6db2ef61d156
		3034	~ ~ parent: 3:27eef8ed80b4
		3035	user: test
		3036	date: Thu Jan 01 00:00:04 1970 +0000
		3037	summary: (4) merge two known; one immediate left, one immediate right
		3038
		3039
2636	$ cd ..	3040	$ cd ..
2637		3041
2638	Change graph shorten, test better with graphstyle.missing not none	3042	Change graph shorten, test better with graphstyle.missing not none

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	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