##// END OF EJS Templates
Add progress extension to win32 default config file
Pascal Quantin -
r10474:601a9d67 stable
parent child Browse files
Show More
@@ -1,124 +1,125 b''
1 ; System-wide Mercurial config file.
1 ; System-wide Mercurial config file.
2 ;
2 ;
3 ; !!! Do Not Edit This File !!!
3 ; !!! Do Not Edit This File !!!
4 ;
4 ;
5 ; This file will be replaced by the installer on every upgrade.
5 ; This file will be replaced by the installer on every upgrade.
6 ; Editing this file can cause strange side effects on Vista.
6 ; Editing this file can cause strange side effects on Vista.
7 ;
7 ;
8 ; http://bitbucket.org/tortoisehg/stable/issue/135
8 ; http://bitbucket.org/tortoisehg/stable/issue/135
9 ;
9 ;
10 ; To change settings you see in this file, override (or enable) them in
10 ; To change settings you see in this file, override (or enable) them in
11 ; your user Mercurial.ini file, where USERNAME is your Windows user name:
11 ; your user Mercurial.ini file, where USERNAME is your Windows user name:
12 ;
12 ;
13 ; XP or older - C:\Documents and Settings\USERNAME\Mercurial.ini
13 ; XP or older - C:\Documents and Settings\USERNAME\Mercurial.ini
14 ; Vista or later - C:\Users\USERNAME\Mercurial.ini
14 ; Vista or later - C:\Users\USERNAME\Mercurial.ini
15
15
16
16
17 [ui]
17 [ui]
18 ; editor used to enter commit logs, etc. Most text editors will work.
18 ; editor used to enter commit logs, etc. Most text editors will work.
19 editor = notepad
19 editor = notepad
20 ; show changed files and be a bit more verbose if True
20 ; show changed files and be a bit more verbose if True
21 ; verbose = True
21 ; verbose = True
22
22
23 ; username data to appear in commits
23 ; username data to appear in commits
24 ; it usually takes the form: Joe User <joe.user@host.com>
24 ; it usually takes the form: Joe User <joe.user@host.com>
25 ; username = Joe User <j.user@example.com>
25 ; username = Joe User <j.user@example.com>
26
26
27 ; In order to push/pull over ssh you must specify an ssh tool
27 ; In order to push/pull over ssh you must specify an ssh tool
28 ;ssh = "C:\Progra~1\TortoiseSVN\bin\TortoisePlink.exe" -ssh -2
28 ;ssh = "C:\Progra~1\TortoiseSVN\bin\TortoisePlink.exe" -ssh -2
29 ;ssh = C:\cygwin\bin\ssh
29 ;ssh = C:\cygwin\bin\ssh
30
30
31 ;
31 ;
32 ; For more information about mercurial extensions, start here
32 ; For more information about mercurial extensions, start here
33 ; http://www.selenic.com/mercurial/wiki/index.cgi/UsingExtensions
33 ; http://www.selenic.com/mercurial/wiki/index.cgi/UsingExtensions
34 ;
34 ;
35 ; Extensions shipped with Mercurial
35 ; Extensions shipped with Mercurial
36 ;
36 ;
37 [extensions]
37 [extensions]
38 ;acl =
38 ;acl =
39 ;alias =
39 ;alias =
40 ;bookmarks =
40 ;bookmarks =
41 ;bugzilla =
41 ;bugzilla =
42 ;children =
42 ;children =
43 ;churn =
43 ;churn =
44 ;color =
44 ;color =
45 ;convert =
45 ;convert =
46 ;extdiff =
46 ;extdiff =
47 ;fetch =
47 ;fetch =
48 ;gpg =
48 ;gpg =
49 ;graphlog =
49 ;graphlog =
50 ;hgcia =
50 ;hgcia =
51 ;hgk =
51 ;hgk =
52 ;highlight =
52 ;highlight =
53 ;interhg =
53 ;interhg =
54 ;keyword =
54 ;keyword =
55 ;mq =
55 ;mq =
56 ;notify =
56 ;notify =
57 ;pager =
57 ;pager =
58 ;parentrevspec =
58 ;parentrevspec =
59 ;patchbomb =
59 ;patchbomb =
60 ;progress =
60 ;purge =
61 ;purge =
61 ;rebase =
62 ;rebase =
62 ;record =
63 ;record =
63 ;transplant =
64 ;transplant =
64 ;win32mbcs =
65 ;win32mbcs =
65 ;win32text =
66 ;win32text =
66 ;zeroconf =
67 ;zeroconf =
67
68
68 ; To use cleverencode/cleverdecode, you must enable win32text extension
69 ; To use cleverencode/cleverdecode, you must enable win32text extension
69
70
70 [encode]
71 [encode]
71 ; Encode files that don't contain NUL characters.
72 ; Encode files that don't contain NUL characters.
72
73
73 ; ** = cleverencode:
74 ; ** = cleverencode:
74
75
75 ; Alternatively, you can explicitly specify each file extension that
76 ; Alternatively, you can explicitly specify each file extension that
76 ; you want encoded (any you omit will be left untouched), like this:
77 ; you want encoded (any you omit will be left untouched), like this:
77
78
78 ; *.txt = dumbencode:
79 ; *.txt = dumbencode:
79
80
80
81
81 [decode]
82 [decode]
82 ; Decode files that don't contain NUL characters.
83 ; Decode files that don't contain NUL characters.
83
84
84 ; ** = cleverdecode:
85 ; ** = cleverdecode:
85
86
86 ; Alternatively, you can explicitly specify each file extension that
87 ; Alternatively, you can explicitly specify each file extension that
87 ; you want decoded (any you omit will be left untouched), like this:
88 ; you want decoded (any you omit will be left untouched), like this:
88
89
89 ; **.txt = dumbdecode:
90 ; **.txt = dumbdecode:
90
91
91 [patch]
92 [patch]
92 ; If you enable win32text filtering, you will want to enable this
93 ; If you enable win32text filtering, you will want to enable this
93 ; line as well to allow patching to work correctly.
94 ; line as well to allow patching to work correctly.
94
95
95 ; eol = crlf
96 ; eol = crlf
96
97
97
98
98 ;
99 ;
99 ; Define external diff commands
100 ; Define external diff commands
100 ;
101 ;
101 [extdiff]
102 [extdiff]
102 ;cmd.bc3diff = C:\Program Files\Beyond Compare 3\BCompare.exe
103 ;cmd.bc3diff = C:\Program Files\Beyond Compare 3\BCompare.exe
103 ;cmd.vdiff = C:\Progra~1\TortoiseSVN\bin\TortoiseMerge.exe
104 ;cmd.vdiff = C:\Progra~1\TortoiseSVN\bin\TortoiseMerge.exe
104 ;cmd.vimdiff = gvim.exe
105 ;cmd.vimdiff = gvim.exe
105 ;opts.vimdiff = -f '+next' '+execute "DirDiff ".argv(0)." ".argv(1)'
106 ;opts.vimdiff = -f '+next' '+execute "DirDiff ".argv(0)." ".argv(1)'
106
107
107
108
108 [hgk]
109 [hgk]
109 ; Replace the following with your path to hgk, uncomment it and
110 ; Replace the following with your path to hgk, uncomment it and
110 ; install ActiveTcl (or another win32 port like tclkit)
111 ; install ActiveTcl (or another win32 port like tclkit)
111 ; path="C:\Program Files\Mercurial\Contrib\hgk.tcl"
112 ; path="C:\Program Files\Mercurial\Contrib\hgk.tcl"
112 ; vdiff=vdiff
113 ; vdiff=vdiff
113
114
114
115
115 ;
116 ;
116 ; The git extended diff format can represent binary files, file
117 ; The git extended diff format can represent binary files, file
117 ; permission changes, and rename information that the normal patch format
118 ; permission changes, and rename information that the normal patch format
118 ; cannot describe. However it is also not compatible with tools which
119 ; cannot describe. However it is also not compatible with tools which
119 ; expect normal patches. so enable git patches at your own risk.
120 ; expect normal patches. so enable git patches at your own risk.
120 ;
121 ;
121 [diff]
122 [diff]
122 ;git = false
123 ;git = false
123 ;nodates = false
124 ;nodates = false
124
125
General Comments 0
You need to be logged in to leave comments. Login now