##// END OF EJS Templates
pager: rename 'pager.enable' to 'ui.paginate'...
Pierre-Yves David -
r32105:f06d23af stable
parent child Browse files
Show More
@@ -1367,9 +1367,6 b' Supported arguments:'
1367 Setting used to control when to paginate and with what external tool. See
1367 Setting used to control when to paginate and with what external tool. See
1368 :hg:`help pager` for details.
1368 :hg:`help pager` for details.
1369
1369
1370 ``enable``
1371 Control the pagination of command output (default: True).
1372
1373 ``pager``
1370 ``pager``
1374 Define the external tool used as pager.
1371 Define the external tool used as pager.
1375
1372
@@ -1963,6 +1960,10 b' User interface controls.'
1963 The path to a directory used to store generated .orig files. If the path is
1960 The path to a directory used to store generated .orig files. If the path is
1964 not a directory, one will be created.
1961 not a directory, one will be created.
1965
1962
1963 ``paginate``
1964 Control the pagination of command output (default: True). See :hg:`help pager`
1965 for details.
1966
1966 ``patch``
1967 ``patch``
1967 An optional external tool that ``hg import`` and some extensions
1968 An optional external tool that ``hg import`` and some extensions
1968 will use for applying patches. By default Mercurial uses an
1969 will use for applying patches. By default Mercurial uses an
@@ -29,7 +29,7 b' you can use --pager=<value>:'
29
29
30 To globally turn off all attempts to use a pager, set::
30 To globally turn off all attempts to use a pager, set::
31
31
32 [pager]
32 [ui]
33 enable = false
33 paginate = never
34
34
35 which will prevent the pager from running.
35 which will prevent the pager from running.
@@ -55,10 +55,9 b' username ='
55 # (see 'hg help color' for details)
55 # (see 'hg help color' for details)
56 # color = never
56 # color = never
57
57
58 [pager]
59 # uncomment to disable command output pagination
58 # uncomment to disable command output pagination
60 # (see 'hg help pager' for details)
59 # (see 'hg help pager' for details)
61 # enable = never
60 # paginate = never
62
61
63 [extensions]
62 [extensions]
64 # uncomment these lines to enable some popular extensions
63 # uncomment these lines to enable some popular extensions
@@ -108,10 +107,9 b' default = %s'
108 # (see 'hg help color' for details)
107 # (see 'hg help color' for details)
109 # color = never
108 # color = never
110
109
111 [pager]
112 # uncomment to disable command output pagination
110 # uncomment to disable command output pagination
113 # (see 'hg help pager' for details)
111 # (see 'hg help pager' for details)
114 # enable = never
112 # paginate = never
115
113
116 [extensions]
114 [extensions]
117 # uncomment these lines to enable some popular extensions
115 # uncomment these lines to enable some popular extensions
@@ -858,7 +856,8 b' class ui(object):'
858 if (self._disablepager
856 if (self._disablepager
859 or self.pageractive
857 or self.pageractive
860 or command in self.configlist('pager', 'ignore')
858 or command in self.configlist('pager', 'ignore')
861 or not self.configbool('pager', 'enable', True)
859 or not self.configbool('ui', 'paginate',
860 self.configbool('pager', 'enable', True))
862 or not self.configbool('pager', 'attend-' + command, True)
861 or not self.configbool('pager', 'attend-' + command, True)
863 # TODO: if we want to allow HGPLAINEXCEPT=pager,
862 # TODO: if we want to allow HGPLAINEXCEPT=pager,
864 # formatted() will need some adjustment.
863 # formatted() will need some adjustment.
@@ -54,21 +54,21 b' By default diff and log are paged, but i'
54
54
55 We can control the pager from the config
55 We can control the pager from the config
56
56
57 $ hg log --limit 1 --config 'pager.enable=False'
57 $ hg log --limit 1 --config 'ui.paginate=False'
58 changeset: 10:46106edeeb38
58 changeset: 10:46106edeeb38
59 tag: tip
59 tag: tip
60 user: test
60 user: test
61 date: Thu Jan 01 00:00:00 1970 +0000
61 date: Thu Jan 01 00:00:00 1970 +0000
62 summary: modify a 10
62 summary: modify a 10
63
63
64 $ hg log --limit 1 --config 'pager.enable=0'
64 $ hg log --limit 1 --config 'ui.paginate=0'
65 changeset: 10:46106edeeb38
65 changeset: 10:46106edeeb38
66 tag: tip
66 tag: tip
67 user: test
67 user: test
68 date: Thu Jan 01 00:00:00 1970 +0000
68 date: Thu Jan 01 00:00:00 1970 +0000
69 summary: modify a 10
69 summary: modify a 10
70
70
71 $ hg log --limit 1 --config 'pager.enable=1'
71 $ hg log --limit 1 --config 'ui.paginate=1'
72 paged! 'changeset: 10:46106edeeb38\n'
72 paged! 'changeset: 10:46106edeeb38\n'
73 paged! 'tag: tip\n'
73 paged! 'tag: tip\n'
74 paged! 'user: test\n'
74 paged! 'user: test\n'
General Comments 0
You need to be logged in to leave comments. Login now