Apple

On Nov 6, 2009, at 7:40 PM, Ben Haller wrote:

Hi all. Anybody have some good .hgrc settings for Mercurial to play nice with Xcode and such on OS X?

Here's my ~/.hgrc file:

[ui]

username = Jens Alfke <email@hidden>

ignore = ~/.hgignore

ssh = ssh -C

[diff]

git = true

ignoreblanklines = true

[extensions]

color =

hgext.extdiff =

hgext.fetch =

rebase =

[color]

status.modified = none

status.added = yellow bold

status.removed = red bold black_background

status.deleted = cyan bold underline

status.unknown = magenta bold underline

status.ignored = black bold

diff.diffline = black_background

diff.file_a = black_background

diff.file_b = yellow black_background

diff.hunk = black_background

diff.inserted = yellow

[extdiff]

cmd.opendiff = opendiff-sync

Here's the 'opendiff-sync' script:

#! /bin/bash

# opendiff returns immediately, without waiting for FileMerge to exit.

# Piping the output makes opendiff wait for FileMerge.

opendiff "$@" | cat

And here's my ~/.hgignore:

syntax: glob

.DS_Store

.svn

build

*.pbxuser

*.perspectivev3

*.mpkg

*.framework

*.pyc

Hope this helps!

—Jens

References:
	>Mercurial settings for OS X development? (From: Ben Haller <email@hidden>)
	>Re: Mercurial settings for OS X development? (From: Jens Alfke <email@hidden>)