view .hgrc @ 153:eb7cb3d25060

Merge
author Augie Fackler <durin42@gmail.com>
date Fri, 09 Oct 2009 21:50:40 -0400
parents a585b0d2b828
children 98000a1107bf
line wrap: on
line source

[extensions]
hgext.bookmarks=
hgext.color=
hgext.convert=
hgext.graphlog=
hgext.highlight=
hgext.hgk=
hgext.mq=
hgext.parentrevspec=
hgext.patchbomb=
hgext.purge=
hgext.rebase=
hgext.record=
hgext.transplant=
hggit=
hgsubversion=
histedit=

[merge-tools]
filemerge.executable = opendiff-w
filemerge.args = $local $other -ancestor $base -merge $output

[alias]
ll=log --graph -l 6

[ui]
username = Augie Fackler <durin42@gmail.com>
style = compact
ignore = ~/.hgglobalignore

[defaults]
qimport = --git
qrefresh = --git
annotate = -nu
heads = --style default
serve = -v
outgoing = --graph
# --graph is breaking incoming, need to investigate
# incoming =  --graph
diff = -p

[diff]
git=1

[web]
style = gitweb
port=7000
allow_archive = bz2 zip

[color]
status.ignored = magenta bold

[paths]
hgcrew = http://hg.intevation.org/mercurial/crew
hgsubv = ssh://hg@bitbucket.org/durin42/hgsubversion/
hggit = ssh://hg@bitbucket.org/durin42/hg-git/
histedit = ssh://hg@bitbucket.org/durin42/histedit/

[hooks]
# Prevent "hg pull" if MQ patches are applied.
#prechangegroup.mq-no-pull = ! hg qtop > /dev/null 2>&1
# Prevent "hg push" if MQ patches are applied.
#preoutgoing.mq-no-push = ! hg qtop > /dev/null 2>&1