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