X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;ds=inline;f=hgrc;h=ee4de5709664cc1e41944a670c746fa5044867fd;hb=3c57463b04d385441f71820ea0c9b7fd933f4f9f;hp=4a540474918680d0413cdb294741d50232a3f55a;hpb=89f35ec9b36aa9288182916db92cd4ee5a4826d0;p=config%2Fdotfiles.git
diff --git a/hgrc b/hgrc
index 4a54047..ee4de57 100644
--- a/hgrc
+++ b/hgrc
@@ -1,11 +1,23 @@
# This is the Mercurial configuration file.
+# Copyright (C) 2011-2012 Simon Ruderich
+#
+# This file is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this file. If not, see .
+
[ui]
-username = Simon Ruderich
-ignore = ~/.hgignore
-# Use Apple's FileMerge for merge conflicts.
-merge = opendiff-merge
+username = Simon Ruderich
# Use git diffs with support for renames, binaries, access rights, etc.
[diff]
@@ -16,10 +28,14 @@ git = True
hgext.convert =
# Simplify pull and merge processes.
hgext.fetch =
+# Log output similar to hg view but as ASCII.
+hgext.graphlog =
# Enable hg view.
hgext.hgk =
# Patch stack support.
hgext.mq =
+# Use a pager for all output.
+hgext.pager =
# Partial commit utility.
hgext.record =
# Allows cherry-picking and rebasing.
@@ -27,7 +43,7 @@ hgext.transplant =
# Necessary for hg view.
[hgk]
-path = /opt/local/share/mercurial/contrib/hgk
+path = /usr/share/mercurial/hgk
[hooks]
# Precommit hook which runs tests if they exist.
@@ -36,3 +52,11 @@ precommit = precommit-runtests
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
+
+# Use colordiff and less as pager so that output from diff is colored and
+# everything is easily readable in a terminal.
+[pager]
+pager = colordiff | less
+ignore = record, qrecord, view, clone
+
+# vim: ft=cfg