# HG changeset patch # User Jordi Gutiérrez Hermoso # Date 1415311070 18000 # Node ID ddd9bded7d0f0df3c034969a91bae25db08f39c2 # Parent aa2b23a68003e142357d2100290c846f319078ac Add hgrc-jordi diff -r aa2b23a68003 -r ddd9bded7d0f hgrc-jordi --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/hgrc-jordi Thu Nov 06 16:57:50 2014 -0500 @@ -0,0 +1,126 @@ +[ui] +username = Jordi Gutiérrez Hermoso +merge = emacs +editor = emacswait +debugger = ipdb +mergemarkers = detailed + +# My Emacs merge configuration +[merge-tools] +emacs.executable = emacspause +emacs.args = --eval "(ediff-merge-with-ancestor \""$local"\" \""$other"\" \""$base"\" nil \""$output"\")" + +# Some special alises +[alias] +garbage-collect=strip --hidden -r 'obsolete()' +stash=shelve +glog=log -G +email=email --confirm +pvr=log -pvr + +# These are all the extensions that I use. +[extensions] +convert= +strip= +record= +churn= +purge= +rebase= +highlight= +color= +progress= +patchbomb= +histedit= +largefiles= +shelve= + +pager = +hggit = ~/coding/vcs/hg-git/hggit +crecord= ~/coding/vcs/crecord/crecord +evolve=~/coding/vcs/evolve/hgext/evolve.py + +# The pager needs some extra config to work right... +[pager] +pager = LESS='FSRX' less +attend = tags, help, annotate, cat, diff, export, status,\ + outgoing, incoming, glog, log, grep, sl, pvr, wip + +# This defines my custom xterm-256 colours. +[color] +mode=terminfo +color.orange = 202 +color.lightyellow = 191 +color.darkorange = 220 +color.brightyellow = 226 + +status.modified = magenta bold +status.added = green bold +status.removed = red bold +status.deleted = cyan bold +status.unknown = black bold +status.ignored = black bold +log.branch = cyan +log.summary = lightyellow +log.description = lightyellow +log.bookmark = green +log.tag = darkorange +log.graph = blue + +changeset.public = orange bold +changeset.secret = blue bold +changeset.draft = brightyellow bold + +diff.tab = bold magenta_background + +desc.here = bold blue_background + +[tortoisehg] +authorcolor = True + +[subpaths] +git://git.sv.gnu.org/gnulib = /home/jordi/coding/vcs/gnulib + +# This makes diffs show more information +[diff] +git = true +showfunc = 1 + +[web] +pygments_style = emacs +style = paper +allow_archive = gz zip +archivesubrepos = true + +# This email stuff is for emailing patches to the Mercurial list for +# when I want to modify Mercurial itself. +[email] +method = smtp +from = Jordi Gutiérrez Hermoso +to = mercurial-devel@selenic.com +cc = + +[smtp] +host = fencepost.gnu.org +tls = tls +username = jordigh +port = 587 + +# I push and pull a lot with local clones, so don't make my local +# clones publish those commits. +[phases] +publish = False + +[revsetalias] +bt($1) = ::$1 - ::@ + + +# This is complicated, but cool. For an explanation, see the following url: +# http://jordi.inversethought.com/blog/customising-mercurial-like-a-pro/ +[alias] +wip = log --graph --rev=wip --template=wip + +[templates] +wip = '{label("log.branch", branches)} {label("changeset.{phase}", rev)} {label("grep.user", author|user)}{label("log.tag", if(tags," {tags}"))} {label("log.bookmark", if(bookmarks," {bookmarks}"))}\n{label(ifcontains(rev, revset('.'), 'desc.here'),desc|firstline)}' + +[revsetalias] +wip = (parents(not public()) or not public() or . or head()) and (not obsolete() or unstable()^) and not closed()