Mercurial > index.cgi > dotfiles

annotate .hgrc @ 87:a835f8c36e93

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed PS1 & vimdiff * PS1 had nonprintable characters in it, but bash didn't know that; so it wrapped in all the wrong places. * vimdiff was using different window placements than kdiff would use, leading to much confusion. This way feels nicer, leaving the "good" output file at the bottom.
author Steve Huston <huston@astro.princeton.edu>
date Wed, 01 May 2013 14:08:33 -0400
parents 463fe15a340f
children 21e0ab41e180
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
85
c75fecccc3e5 HG config changes:
Steve Huston <huston@astro.princeton.edu>
parents: 81
diff changeset
1 # Global .hgrc - see bottom for local information
c75fecccc3e5 HG config changes:
Steve Huston <huston@astro.princeton.edu>
parents: 81
diff changeset
2
73
09b915fb36b8 * JT-65 alias for Wine on the home (ham shack) computer
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents:
diff changeset
3 [ui]
85
c75fecccc3e5 HG config changes:
Steve Huston <huston@astro.princeton.edu>
parents: 81
diff changeset
4 username = Steve Huston <huston@astro.princeton.edu>
73
09b915fb36b8 * JT-65 alias for Wine on the home (ham shack) computer
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents:
diff changeset
5 merge = vimdiff
85
c75fecccc3e5 HG config changes:
Steve Huston <huston@astro.princeton.edu>
parents: 81
diff changeset
6 editor = $HOME/bin/hgeditor
73
09b915fb36b8 * JT-65 alias for Wine on the home (ham shack) computer
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents:
diff changeset
7
09b915fb36b8 * JT-65 alias for Wine on the home (ham shack) computer
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents:
diff changeset
8 [extensions]
09b915fb36b8 * JT-65 alias for Wine on the home (ham shack) computer
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents:
diff changeset
9 convert =
09b915fb36b8 * JT-65 alias for Wine on the home (ham shack) computer
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents:
diff changeset
10 keyword =
09b915fb36b8 * JT-65 alias for Wine on the home (ham shack) computer
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents:
diff changeset
11 color =
09b915fb36b8 * JT-65 alias for Wine on the home (ham shack) computer
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents:
diff changeset
12
09b915fb36b8 * JT-65 alias for Wine on the home (ham shack) computer
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents:
diff changeset
13 [merge-tools]
09b915fb36b8 * JT-65 alias for Wine on the home (ham shack) computer
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents:
diff changeset
14 vimdiff.executable = vim
87
a835f8c36e93 Fixed PS1 & vimdiff
Steve Huston <huston@astro.princeton.edu>
parents: 86
diff changeset
15 vimdiff.args = -d $output $base $local $other -c "wincmd J"
85
c75fecccc3e5 HG config changes:
Steve Huston <huston@astro.princeton.edu>
parents: 81
diff changeset
16
86
463fe15a340f Trust the 'help' group repository configs and whatnot.
Steve Huston <huston@astro.princeton.edu>
parents: 85
diff changeset
17 [trusted]
463fe15a340f Trust the 'help' group repository configs and whatnot.
Steve Huston <huston@astro.princeton.edu>
parents: 85
diff changeset
18 groups = help
463fe15a340f Trust the 'help' group repository configs and whatnot.
Steve Huston <huston@astro.princeton.edu>
parents: 85
diff changeset
19
85
c75fecccc3e5 HG config changes:
Steve Huston <huston@astro.princeton.edu>
parents: 81
diff changeset
20 # Includes - here we pull in a config file for the particular host on which
c75fecccc3e5 HG config changes:
Steve Huston <huston@astro.princeton.edu>
parents: 81
diff changeset
21 # we're running, if there is one. This lets us set specific things on
c75fecccc3e5 HG config changes:
Steve Huston <huston@astro.princeton.edu>
parents: 81
diff changeset
22 # specific hosts fairly easily. $HOST must be defined in the environment
c75fecccc3e5 HG config changes:
Steve Huston <huston@astro.princeton.edu>
parents: 81
diff changeset
23 # (bash's built-in $HOSTNAME is insufficient)
c75fecccc3e5 HG config changes:
Steve Huston <huston@astro.princeton.edu>
parents: 81
diff changeset
24 %include $HOME/.hgrc.d/$HOST.rc