##// END OF EJS Templates
win32: add shelve extension to mercurial.ini
Pascal Quantin -
r19946:b7aec4c8 stable
parent child Browse files
Show More
@@ -1,98 +1,99 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 ;blackbox =
39 ;blackbox =
40 ;bugzilla =
40 ;bugzilla =
41 ;children =
41 ;children =
42 ;churn =
42 ;churn =
43 ;color =
43 ;color =
44 ;convert =
44 ;convert =
45 ;eol =
45 ;eol =
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 ;histedit =
53 ;histedit =
54 ;interhg =
54 ;interhg =
55 ;largefiles =
55 ;largefiles =
56 ;keyword =
56 ;keyword =
57 ;mq =
57 ;mq =
58 ;notify =
58 ;notify =
59 ;pager =
59 ;pager =
60 ;patchbomb =
60 ;patchbomb =
61 ;progress =
61 ;progress =
62 ;purge =
62 ;purge =
63 ;rebase =
63 ;rebase =
64 ;record =
64 ;record =
65 ;relink =
65 ;relink =
66 ;schemes =
66 ;schemes =
67 ;share =
67 ;share =
68 ;shelve =
68 ;transplant =
69 ;transplant =
69 ;win32mbcs =
70 ;win32mbcs =
70 ;zeroconf =
71 ;zeroconf =
71
72
72 ;
73 ;
73 ; Define external diff commands
74 ; Define external diff commands
74 ;
75 ;
75 [extdiff]
76 [extdiff]
76 ;cmd.bc3diff = C:\Program Files\Beyond Compare 3\BCompare.exe
77 ;cmd.bc3diff = C:\Program Files\Beyond Compare 3\BCompare.exe
77 ;cmd.vdiff = C:\Progra~1\TortoiseSVN\bin\TortoiseMerge.exe
78 ;cmd.vdiff = C:\Progra~1\TortoiseSVN\bin\TortoiseMerge.exe
78 ;cmd.vimdiff = gvim.exe
79 ;cmd.vimdiff = gvim.exe
79 ;opts.vimdiff = -f "+next" "+execute 'DirDiff' fnameescape(argv(0)) fnameescape(argv(1))"
80 ;opts.vimdiff = -f "+next" "+execute 'DirDiff' fnameescape(argv(0)) fnameescape(argv(1))"
80
81
81
82
82 [hgk]
83 [hgk]
83 ; Replace the following with your path to hgk, uncomment it and
84 ; Replace the following with your path to hgk, uncomment it and
84 ; install ActiveTcl (or another win32 port like tclkit)
85 ; install ActiveTcl (or another win32 port like tclkit)
85 ; path="C:\Program Files\Mercurial\Contrib\hgk.tcl"
86 ; path="C:\Program Files\Mercurial\Contrib\hgk.tcl"
86 ; vdiff=vdiff
87 ; vdiff=vdiff
87
88
88
89
89 ;
90 ;
90 ; The git extended diff format can represent binary files, file
91 ; The git extended diff format can represent binary files, file
91 ; permission changes, and rename information that the normal patch format
92 ; permission changes, and rename information that the normal patch format
92 ; cannot describe. However it is also not compatible with tools which
93 ; cannot describe. However it is also not compatible with tools which
93 ; expect normal patches. so enable git patches at your own risk.
94 ; expect normal patches. so enable git patches at your own risk.
94 ;
95 ;
95 [diff]
96 [diff]
96 ;git = false
97 ;git = false
97 ;nodates = false
98 ;nodates = false
98
99
General Comments 0
You need to be logged in to leave comments. Login now