view .hgrc @ 376:fe18716866e9

hgrc: disable vimdiff as a merge tool forever
author Augie Fackler <raf@durin42.com>
date Sun, 31 Jan 2016 20:36:18 -0500
parents 81ca70aa5281
children 20e47bc8eea9
line wrap: on
line source

[extensions]
hgext.bookmarks=
hgext.color=
hgext.convert=
hgext.highlight=
hgext.histedit=
hgext.mq=
hgext.parentrevspec=
hgext.patchbomb=
hgext.progress=
hgext.purge=
hgext.rebase=
hgext.record=
hgext.schemes=
hgext.shelve=
hgext.transplant=
hggit=
hgsubversion=
hg_remotebranches=

[alias]
ll=log --graph --style compact --limit 6 -r 'sort((::. or bookmark() or heads(upstream())), "-rev")'
upstream-bookmarks = log -r 'bookmark() and (upstream() or obsolete())' --template '{bookmarks}\n'
utip = log -r 'limit(heads(upstream()), 1)'
egrep = !$HG locate -0 '$2' $3 $4 $5 $6 $7 $8 $9 | xargs -0 egrep -H '$1'
crecord = !$HG commit --interactive --config experimental.crecord=yes $@

wc-out = log -r 'ancestors(.) and not upstream()'
wc-email = email -r 'ancestors(.) and not upstream()'
havepatch = log -r 'grep("$1")'

[ui]
username = Augie Fackler <raf@durin42.com>
ignore = ~/.hgglobalignore
usehttp2=true
mergemarkers = detailed

[merge-tools]
vimdiff.disable = yes
gvimdiff.disable = yes

[defaults]
annotate = -nu
serve = -v

[experimental]
graph-group-branches = yes
rebaseskipobsolete = yes

[diff]
git=1
showfunc = 1

[bookmarks]
track.current = 1

[histedit]
defaultrev = only(.) and canmutate

[web]
port=7000
allow_archive = bz2 zip

[color]
status.ignored = magenta bold
qseries.unapplied = magenta bold

[phases]
publish=false

# Config tricks from mpm for smartlog
[alias]
sl = log -Gr smart -Tsl
si = incoming -GTsl
sl. = log -Gr 'smart and ::.' -Tsl

[templates]
sl = '{ifeq(branch,"default","","{label(black_background, branch)} ")}{label("log.changeset changeset.{phase}", shortest(node))} {label("grep.user", author|user)}{label("tags.normal", if(tags," {tags}"))}{label("sl.book", if(bookmarks," {bookmarks}"))}{label("sl.topic", if(topics," {topics}"))}\n{label(ifcontains(rev, revset('.'), 'desc.here'),desc|firstline)}'

[color]
sl.book = magenta bold
sl.topic = yellow bold
changeset.draft = magenta
changeset.secret = red
desc.here = inverse

[revsetalias]
canmutate = not (public() or upstream())
smart = ((parents(canmutate) or canmutate or (head() - closed())) and (not obsolete() or unstable()^)) or .

%include .private/hgrc
%include $HOME/.hgrc-machine