.hgrc
author Oleksandr Gavenko <gavenkoa@gmail.com>
Mon, 01 Aug 2011 11:53:45 +0300
changeset 158 1df00afab192
parent 151 03f294e76a50
child 198 6fd142910e94
permissions -rw-r--r--
Allow cherry-picking.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
0980cc675a28 Added user name.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 59
diff changeset
     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
0980cc675a28 Added user name.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 59
diff changeset
     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
0980cc675a28 Added user name.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 59
diff changeset
    10
59
9c0a6fa1b7bd Added hg config.
user@localhost
parents:
diff changeset
    11
[defaults]
151
03f294e76a50 Follow history after rename.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 145
diff changeset
    12
log = -v -f
59
9c0a6fa1b7bd Added hg config.
user@localhost
parents:
diff changeset
    13
incoming = -v
9c0a6fa1b7bd Added hg config.
user@localhost
parents:
diff changeset
    14
outgoing = -v
9c0a6fa1b7bd Added hg config.
user@localhost
parents:
diff changeset
    15
145
90f8794f2290 Add emacs merge tool.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 132
diff changeset
    16
[merge-tools]
90f8794f2290 Add emacs merge tool.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 132
diff changeset
    17
emacs.args = -q --eval "(ediff-merge-with-ancestor \"$local\" \"$other\" \"$base\" nil \"$output\")"
90f8794f2290 Add emacs merge tool.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 132
diff changeset
    18
62
54e803acda8f Set file encoding. Fix merge command. Added win32 enc/dec example.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 60
diff changeset
    19
[web]
54e803acda8f Set file encoding. Fix merge command. Added win32 enc/dec example.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 60
diff changeset
    20
encoding = utf-8
54e803acda8f Set file encoding. Fix merge command. Added win32 enc/dec example.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 60
diff changeset
    21
59
9c0a6fa1b7bd Added hg config.
user@localhost
parents:
diff changeset
    22
[extensions]
118
2306b12ff466 Add comments and remove 'win32text' extensions stuff.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 111
diff changeset
    23
; To allow 'fetch' command.
59
9c0a6fa1b7bd Added hg config.
user@localhost
parents:
diff changeset
    24
hgext.fetch =
118
2306b12ff466 Add comments and remove 'win32text' extensions stuff.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 111
diff changeset
    25
; 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
    26
hgext.mq =
118
2306b12ff466 Add comments and remove 'win32text' extensions stuff.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 111
diff changeset
    27
; To import revisions from foreign VCS repositories into Mercurial.
102
f4b817fa0204 Enable convert Mercurial extension.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 62
diff changeset
    28
hgext.convert =
111
b89337474d09 Enable Graph log extension.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 102
diff changeset
    29
; Usage:  hg glog <dir>
b89337474d09 Enable Graph log extension.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 102
diff changeset
    30
hgext.graphlog =
118
2306b12ff466 Add comments and remove 'win32text' extensions stuff.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 111
diff changeset
    31
; Enable '.hgeol' tracking (fix for CR/LF).
2306b12ff466 Add comments and remove 'win32text' extensions stuff.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 111
diff changeset
    32
hgext.eol =
158
1df00afab192 Allow cherry-picking.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 151
diff changeset
    33
; Allow cherry-picking.
1df00afab192 Allow cherry-picking.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 151
diff changeset
    34
transplant =