author | Oleksandr Gavenko <gavenkoa@gmail.com> |
Wed, 15 Jan 2014 19:29:22 +0200 | |
changeset 689 | 1a0686b5c40e |
parent 688 | 54a04b2de8bb |
child 690 | 95db953511d6 |
permissions | -rw-r--r-- |
62
54e803acda8f
Set file encoding. Fix merge command. Added win32 enc/dec example.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
60
diff
changeset
|
1 |
; -*- mode: ini-generic; coding: utf-8 -*- |
54e803acda8f
Set file encoding. Fix merge command. Added win32 enc/dec example.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
60
diff
changeset
|
2 |
|
60 | 3 |
[ui] |
118
2306b12ff466
Add comments and remove 'win32text' extensions stuff.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
111
diff
changeset
|
4 |
; Who are you? |
60 | 5 |
username = Oleksandr Gavenko <gavenkoa@gmail.com> |
118
2306b12ff466
Add comments and remove 'win32text' extensions stuff.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
111
diff
changeset
|
6 |
; Use internal merge engine. When merge fail you see <<<<<< ====== >>>>>> and a .orig file. |
62
54e803acda8f
Set file encoding. Fix merge command. Added win32 enc/dec example.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
60
diff
changeset
|
7 |
merge = internal:merge |
54e803acda8f
Set file encoding. Fix merge command. Added win32 enc/dec example.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
60
diff
changeset
|
8 |
editor = emacs -q |
132
a2d359154fb7
Add ignore file to listen.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
118
diff
changeset
|
9 |
ignore = ~/.hgignore |
60 | 10 |
|
229
c351b7891093
Add own style for HG to print date in ISO 8601 format.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
198
diff
changeset
|
11 |
style = ~/.hgstyle |
c351b7891093
Add own style for HG to print date in ISO 8601 format.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
198
diff
changeset
|
12 |
|
59 | 13 |
[defaults] |
626
ec0fb611d885
Remove follow (-v) option as it forbid VC-mode from listening history on
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
261
diff
changeset
|
14 |
log = -v |
59 | 15 |
incoming = -v |
16 |
outgoing = -v |
|
652
4371bfe8ea96
Set useful "hg diff" defaults.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
626
diff
changeset
|
17 |
|
4371bfe8ea96
Set useful "hg diff" defaults.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
626
diff
changeset
|
18 |
[diff] |
4371bfe8ea96
Set useful "hg diff" defaults.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
626
diff
changeset
|
19 |
git = 1 |
4371bfe8ea96
Set useful "hg diff" defaults.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
626
diff
changeset
|
20 |
unified = 5 |
4371bfe8ea96
Set useful "hg diff" defaults.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
626
diff
changeset
|
21 |
showfunc = 1 |
59 | 22 |
|
684
95b15ebd8e1e
Ignore whitespaces when doing source annotation.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
652
diff
changeset
|
23 |
[annotate] |
95b15ebd8e1e
Ignore whitespaces when doing source annotation.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
652
diff
changeset
|
24 |
ignorews = True |
95b15ebd8e1e
Ignore whitespaces when doing source annotation.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
652
diff
changeset
|
25 |
ignorewsamount = True |
95b15ebd8e1e
Ignore whitespaces when doing source annotation.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
652
diff
changeset
|
26 |
ignoreblanklines = True |
95b15ebd8e1e
Ignore whitespaces when doing source annotation.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
652
diff
changeset
|
27 |
|
62
54e803acda8f
Set file encoding. Fix merge command. Added win32 enc/dec example.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
60
diff
changeset
|
28 |
[web] |
54e803acda8f
Set file encoding. Fix merge command. Added win32 enc/dec example.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
60
diff
changeset
|
29 |
encoding = utf-8 |
54e803acda8f
Set file encoding. Fix merge command. Added win32 enc/dec example.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
60
diff
changeset
|
30 |
|
59 | 31 |
[extensions] |
118
2306b12ff466
Add comments and remove 'win32text' extensions stuff.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
111
diff
changeset
|
32 |
; To allow 'fetch' command. |
59 | 33 |
hgext.fetch = |
118
2306b12ff466
Add comments and remove 'win32text' extensions stuff.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
111
diff
changeset
|
34 |
; To allow Mercurial Queues. |
62
54e803acda8f
Set file encoding. Fix merge command. Added win32 enc/dec example.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
60
diff
changeset
|
35 |
hgext.mq = |
118
2306b12ff466
Add comments and remove 'win32text' extensions stuff.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
111
diff
changeset
|
36 |
; To import revisions from foreign VCS repositories into Mercurial. |
102
f4b817fa0204
Enable convert Mercurial extension.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
62
diff
changeset
|
37 |
hgext.convert = |
111
b89337474d09
Enable Graph log extension.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
102
diff
changeset
|
38 |
; Usage: hg glog <dir> |
b89337474d09
Enable Graph log extension.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
102
diff
changeset
|
39 |
hgext.graphlog = |
118
2306b12ff466
Add comments and remove 'win32text' extensions stuff.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
111
diff
changeset
|
40 |
; Enable '.hgeol' tracking (fix for CR/LF). |
2306b12ff466
Add comments and remove 'win32text' extensions stuff.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
111
diff
changeset
|
41 |
hgext.eol = |
158
1df00afab192
Allow cherry-picking.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
151
diff
changeset
|
42 |
; Allow cherry-picking. |
1df00afab192
Allow cherry-picking.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
151
diff
changeset
|
43 |
transplant = |
232
ceade72317bd
Show progress on operations.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
229
diff
changeset
|
44 |
; Show progress on operations. |
ceade72317bd
Show progress on operations.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
229
diff
changeset
|
45 |
progress = |
261 | 46 |
; Delete untracked files from the working directory. |
47 |
hgext.purge= |
|
688 | 48 |
; Color diff. |
49 |
color = |
|
232
ceade72317bd
Show progress on operations.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
229
diff
changeset
|
50 |
|
ceade72317bd
Show progress on operations.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
229
diff
changeset
|
51 |
[progress] |
ceade72317bd
Show progress on operations.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
229
diff
changeset
|
52 |
; Number of seconds (float) before showing the progress bar. |
ceade72317bd
Show progress on operations.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
229
diff
changeset
|
53 |
delay = 2 |
ceade72317bd
Show progress on operations.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
229
diff
changeset
|
54 |
; Time in seconds between refreshes of the progress bar. |
ceade72317bd
Show progress on operations.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
229
diff
changeset
|
55 |
refresh = 0.5 |
ceade72317bd
Show progress on operations.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
229
diff
changeset
|
56 |
; Format of the progress bar: topic bar number estimate. |
ceade72317bd
Show progress on operations.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
229
diff
changeset
|
57 |
format = topic bar number estimate |
ceade72317bd
Show progress on operations.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
229
diff
changeset
|
58 |
; Clear the progress bar after it's done. |
233
313f5e4493d8
Preserve progress line after compilting of operation.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
232
diff
changeset
|
59 |
clear-complete = False |
232
ceade72317bd
Show progress on operations.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
229
diff
changeset
|
60 |
; If true, don't show a progress bar. |
ceade72317bd
Show progress on operations.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
229
diff
changeset
|
61 |
disable = False |
ceade72317bd
Show progress on operations.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
229
diff
changeset
|
62 |
; If true, ALWAYS show a progress bar, unless disable is given. |
ceade72317bd
Show progress on operations.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
229
diff
changeset
|
63 |
assume-tty = False |
ceade72317bd
Show progress on operations.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
229
diff
changeset
|
64 |
|
259
dea2aa21eb9d
Add groups this was trusted.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
233
diff
changeset
|
65 |
[trusted] |
260 | 66 |
; http://mercurial.selenic.com/wiki/Trust |
259
dea2aa21eb9d
Add groups this was trusted.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
233
diff
changeset
|
67 |
; Do not include: nobody. |
dea2aa21eb9d
Add groups this was trusted.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
233
diff
changeset
|
68 |
groups = apache, daemon, www-data |