.hgrc

[ui]
username = Ches Martin <ches@whiskeyandgrits.net>
ssh = ssh -C
ignore = ~/.config/hg/ignore

# Abort instead of trying to auto-commit when subrepos have changes
commitsubrepos = no

[subrepos]

git:allowed = true

[web]
style = monoblue
allow_archive = bz2, gz, zip
pygments_style = manni

[diff]
# copy/rename support, permission bits, etc. See `hg help diffs`
git = True

[extensions]
hgext.bookmarks =
hgext.convert =
hgext.extdiff =
hgext.fetch =
hgext.gpg =
hgext.hgk =
hgext.highlight =
hgext.histedit =
hgext.mq =
# git-style ancestor references, e.g. foo^, foo~3:
hgext.parentrevspec =
hgext.purge =
hgext.rebase =
hgext.schemes =
hgext.shelve =
hgext.transplant =
hgext.zeroconf =
#qct=/usr/local/lib/hg/qct.py
hggit =

[alias]
blame = blame --number --user --date -q
glog = log --graph
nlog = log --style ~/.hglib/styles/map-cmdline.nlog
slog = log --style ~/.hglib/styles/map-cmdline.slog
sglog = glog --style ~/.hglib/styles/map-cmdline.sglog
vlog = nlog -v
vlg = nlog -vp

gitlog = log --style ~/.hglib/styles/git.style

# Thanks: http://wikis.sun.com/display/SunOnMac/MercurialTips
# prints files changed (only) in the current patch:
qstatus = status --rev -2:-1
# empty current patch, but leave the diffs in the working copy:
qclear = qrefresh -X re:.

cherry-pick = graft
shelf = shelve --list
untrack = rm -Af

# parity with my git mappings
df = diff
lg = log --patch
ll = sglog -v
show = log --patch --rev
last = show .

[bookmarks]
# More git-like behavior: only update the bookmark you are currently using,
# instead of multiple if they are pointing to the same changeset
track.current = True

# Mercurial actually does directory diffs instead of file-by-file like git
# difftool. Vim can't do this without a plugin; this is where meld and kdiff3
# really earn their pay.
[extdiff]
vdiff = fmdiff
meld =
kdiff = kdiff3
sdiff = colordiff -Nry

[gpg]
key = 23D618B53AB8209FF172C0706E5CD3ED8638EE95

[merge-tools]
kdiff3.args = $base $local $other -o $output
kdiff3.fixeol=True
kdiff3.gui=True

# Needs testing for sensible order...
meld.args = $base $local $other $output

# See http://mercurial.selenic.com/wiki/MergingWithVim
vimdiff.executable = mvim
vimdiff.args = -f -d $output -M $local $base $other -c "wincmd J" -c "set modifiable" -c "set write"
vimdiff.checkchanged = true
vimdiff.gui = true
vimdiff.premerge = keep

merge.checkconflicts=True
merge.priority=-10

filemerge.args=-left $other -right $local -ancestor $base -merge $output
filemerge.gui=True

[pager]
pager = LESS='FRX' less

[mq]
# Use the secret phase for mq changesets -- see `hg help phases`
secret = True

[hgk]
path=~/bin/hgk