Mercurial > dotfiles

annotate .hgrc @ 87:b958738c16f3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix an oops in the .hgrc.
author Augie Fackler <durin42@gmail.com>
date Thu, 16 Apr 2009 14:56:15 -0500
parents 68f53fa09e99
children 9d09939f1100
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
1 [extensions]
23
e1caf3e773a8 Need an alias to do log of a named branch
Augie Fackler <durin42@gmail.com>
parents: 21
diff changeset
2 hgext.alias=
21
b465892f75e4 Start using bookmarks.
Augie Fackler <durin42@gmail.com>
parents: 20
diff changeset
3 hgext.bookmarks=
9
a6581f7a5b1a Enable the color extension for hg.
Augie Fackler <durin42@gmail.com>
parents: 2
diff changeset
4 hgext.color=
0
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
5 hgext.convert=
15
a757a99bc885 Add purge extension and sort the extension list.
Augie Fackler <durin42@gmail.com>
parents: 9
diff changeset
6 hgext.graphlog=
36
74e6d193f4a8 enable highlight
Augie Fackler <durin42@gmail.com>
parents: 26
diff changeset
7 hgext.highlight=
15
a757a99bc885 Add purge extension and sort the extension list.
Augie Fackler <durin42@gmail.com>
parents: 9
diff changeset
8 hgext.hgk=
a757a99bc885 Add purge extension and sort the extension list.
Augie Fackler <durin42@gmail.com>
parents: 9
diff changeset
9 hgext.mq=
0
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
10 hgext.parentrevspec=
15
a757a99bc885 Add purge extension and sort the extension list.
Augie Fackler <durin42@gmail.com>
parents: 9
diff changeset
11 hgext.patchbomb=
a757a99bc885 Add purge extension and sort the extension list.
Augie Fackler <durin42@gmail.com>
parents: 9
diff changeset
12 hgext.purge=
0
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
13 hgext.rebase=
15
a757a99bc885 Add purge extension and sort the extension list.
Augie Fackler <durin42@gmail.com>
parents: 9
diff changeset
14 hgext.record=
a757a99bc885 Add purge extension and sort the extension list.
Augie Fackler <durin42@gmail.com>
parents: 9
diff changeset
15 hgext.transplant=
86
68f53fa09e99 Moving all clojure stuff to a more self-contained area.
Augie Fackler <durin42@gmail.com>
parents: 78
diff changeset
16 # hgext.zeroconf=
87
b958738c16f3 Fix an oops in the .hgrc.
Augie Fackler <durin42@gmail.com>
parents: 86
diff changeset
17 hgsubversion=
40
94604a37503a Load hggit.
Augie Fackler <durin42@gmail.com>
parents: 36
diff changeset
18 hggit=
71
38d7b422fcf5 Using histedit now.
Augie Fackler <durin42@gmail.com>
parents: 68
diff changeset
19 histedit=
0
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
20
87
b958738c16f3 Fix an oops in the .hgrc.
Augie Fackler <durin42@gmail.com>
parents: 86
diff changeset
21 [merge-tools]
b958738c16f3 Fix an oops in the .hgrc.
Augie Fackler <durin42@gmail.com>
parents: 86
diff changeset
22 filemerge.executable = opendiff-w
b958738c16f3 Fix an oops in the .hgrc.
Augie Fackler <durin42@gmail.com>
parents: 86
diff changeset
23 filemerge.args = $local $other -ancestor $base -merge $output
b958738c16f3 Fix an oops in the .hgrc.
Augie Fackler <durin42@gmail.com>
parents: 86
diff changeset
24
23
e1caf3e773a8 Need an alias to do log of a named branch
Augie Fackler <durin42@gmail.com>
parents: 21
diff changeset
25 [alias]
68
e4aa44f30f2c Remove bad default from log.
Augie Fackler <durin42@gmail.com>
parents: 53
diff changeset
26 ll=log --graph -l 6
23
e1caf3e773a8 Need an alias to do log of a named branch
Augie Fackler <durin42@gmail.com>
parents: 21
diff changeset
27
0
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
28 [ui]
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
29 username = Augie Fackler <durin42@gmail.com>
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
30 style = compact
26
895bcf0db86a Global ignores for hg.
Augie Fackler <durin42@gmail.com>
parents: 23
diff changeset
31 ignore = ~/.hgglobalignore
0
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
32
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
33 [defaults]
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
34 qimport = --git
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
35 qrefresh = --git
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
36 annotate = -nu
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
37 heads = --style default
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
38 serve = -v
2
cc09fbf53d4d Add --graph to default for out/in/log and remove the no-longer-needed glog pref.
Augie Fackler <durin42@gmail.com>
parents: 1
diff changeset
39 outgoing = --graph
86
68f53fa09e99 Moving all clojure stuff to a more self-contained area.
Augie Fackler <durin42@gmail.com>
parents: 78
diff changeset
40 # --graph is breaking incoming, need to investigate
68f53fa09e99 Moving all clojure stuff to a more self-contained area.
Augie Fackler <durin42@gmail.com>
parents: 78
diff changeset
41 # incoming = --graph
0
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
42 diff = -p
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
43
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
44 [diff]
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
45 git=1
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
46
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
47 [web]
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
48 style = gitweb
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
49 port=7000
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
50 allow_archive = bz2 zip
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
51
20
a7d20c040af0 Don't use black for ignored files since I have a black terminal background.
Augie Fackler <durin42@gmail.com>
parents: 15
diff changeset
52 [color]
a7d20c040af0 Don't use black for ignored files since I have a black terminal background.
Augie Fackler <durin42@gmail.com>
parents: 15
diff changeset
53 status.ignored = magenta bold
a7d20c040af0 Don't use black for ignored files since I have a black terminal background.
Augie Fackler <durin42@gmail.com>
parents: 15
diff changeset
54
0
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
55 [paths]
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
56 hgcrew = http://hg.intevation.org/mercurial/crew
48
bc63fd9e6d64 Edit some paths in .hgrc
Augie Fackler <durin42@gmail.com>
parents: 45
diff changeset
57 hgsubv = ssh://hg@bitbucket.org/durin42/hgsubversion/
53
ade76bc406d7 Fix a path entry.
Augie Fackler <durin42@gmail.com>
parents: 48
diff changeset
58 hggit = ssh://hg@bitbucket.org/durin42/hggit/
72
d23dde77450a add histedit to paths
Augie Fackler <durin42@gmail.com>
parents: 71
diff changeset
59 histedit = ssh://hg@bitbucket.org/durin42/histedit/
0
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
60
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
61 [hooks]
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
62 # Prevent "hg pull" if MQ patches are applied.
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
63 #prechangegroup.mq-no-pull = ! hg qtop > /dev/null 2>&1
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
64 # Prevent "hg push" if MQ patches are applied.
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
65 #preoutgoing.mq-no-push = ! hg qtop > /dev/null 2>&1