From fbe8ebfa9472a95b7de0b28b84c7eb83314ddf05 Mon Sep 17 00:00:00 2001 From: Simon Ruderich Date: Fri, 1 May 2009 16:20:43 +0200 Subject: [PATCH] hgrc: Generate with m4 to allow different paths to hgk. Also added Vim modeline for proper highligting and updated .gitignore to ignore the generated file. --- .gitignore | 1 + hgrc => hgrc.m4 | 10 ++++++++++ setup.sh | 1 + 3 files changed, 12 insertions(+) rename hgrc => hgrc.m4 (90%) diff --git a/.gitignore b/.gitignore index 72db1de..c779065 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ # Ignore generated files. gitconfig +hgrc diff --git a/hgrc b/hgrc.m4 similarity index 90% rename from hgrc rename to hgrc.m4 index fb4cff6..9fa5892 100644 --- a/hgrc +++ b/hgrc.m4 @@ -1,6 +1,9 @@ # This is the Mercurial configuration file. +dnl Load m4 macros. +include(../lib.m4) + [ui] username = Simon Ruderich ignore = ~/.hgignore @@ -31,7 +34,12 @@ hgext.transplant = # Necessary for hg view. [hgk] +IF(OS, debian) +path = /usr/share/mercurial/hgk +FI +IF(OS, darwin) path = /opt/local/share/mercurial/contrib/hgk +FI [hooks] # Precommit hook which runs tests if they exist. @@ -46,3 +54,5 @@ preoutgoing.mq-no-push = ! hg qtop > /dev/null 2>&1 [pager] pager = colordiff | less ignore = record, qrecord + +# vim: ft=cfg diff --git a/setup.sh b/setup.sh index abdbc65..d070085 100755 --- a/setup.sh +++ b/setup.sh @@ -13,6 +13,7 @@ if installed tig; then fi if installed hg; then + generate m4 hgrc -DOS=`os` link hgrc ~/.hgrc link hgignore ~/.hgignore fi -- 2.45.2