Mercurial > dotfiles

annotate .hgrc @ 153:eb7cb3d25060

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Augie Fackler <durin42@gmail.com>
date Fri, 09 Oct 2009 21:50:40 -0400
parents a585b0d2b828
children 98000a1107bf
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]
21
b465892f75e4 Start using bookmarks.
Augie Fackler <durin42@gmail.com>
parents: 20
diff changeset
2 hgext.bookmarks=
9
a6581f7a5b1a Enable the color extension for hg.
Augie Fackler <durin42@gmail.com>
parents: 2
diff changeset
3 hgext.color=
0
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
4 hgext.convert=
15
a757a99bc885 Add purge extension and sort the extension list.
Augie Fackler <durin42@gmail.com>
parents: 9
diff changeset
5 hgext.graphlog=
36
74e6d193f4a8 enable highlight
Augie Fackler <durin42@gmail.com>
parents: 26
diff changeset
6 hgext.highlight=
15
a757a99bc885 Add purge extension and sort the extension list.
Augie Fackler <durin42@gmail.com>
parents: 9
diff changeset
7 hgext.hgk=
a757a99bc885 Add purge extension and sort the extension list.
Augie Fackler <durin42@gmail.com>
parents: 9
diff changeset
8 hgext.mq=
0
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
9 hgext.parentrevspec=
15
a757a99bc885 Add purge extension and sort the extension list.
Augie Fackler <durin42@gmail.com>
parents: 9
diff changeset
10 hgext.patchbomb=
a757a99bc885 Add purge extension and sort the extension list.
Augie Fackler <durin42@gmail.com>
parents: 9
diff changeset
11 hgext.purge=
0
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
12 hgext.rebase=
15
a757a99bc885 Add purge extension and sort the extension list.
Augie Fackler <durin42@gmail.com>
parents: 9
diff changeset
13 hgext.record=
a757a99bc885 Add purge extension and sort the extension list.
Augie Fackler <durin42@gmail.com>
parents: 9
diff changeset
14 hgext.transplant=
40
94604a37503a Load hggit.
Augie Fackler <durin42@gmail.com>
parents: 36
diff changeset
15 hggit=
112
57cbf4b59097 This works better for old versions of hggit.
Augie Fackler <durin42@gmail.com>
parents: 100
diff changeset
16 hgsubversion=
71
38d7b422fcf5 Using histedit now.
Augie Fackler <durin42@gmail.com>
parents: 68
diff changeset
17 histedit=
0
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
18
87
b958738c16f3 Fix an oops in the .hgrc.
Augie Fackler <durin42@gmail.com>
parents: 86
diff changeset
19 [merge-tools]
b958738c16f3 Fix an oops in the .hgrc.
Augie Fackler <durin42@gmail.com>
parents: 86
diff changeset
20 filemerge.executable = opendiff-w
b958738c16f3 Fix an oops in the .hgrc.
Augie Fackler <durin42@gmail.com>
parents: 86
diff changeset
21 filemerge.args = $local $other -ancestor $base -merge $output
b958738c16f3 Fix an oops in the .hgrc.
Augie Fackler <durin42@gmail.com>
parents: 86
diff changeset
22
23
e1caf3e773a8 Need an alias to do log of a named branch
Augie Fackler <durin42@gmail.com>
parents: 21
diff changeset
23 [alias]
68
e4aa44f30f2c Remove bad default from log.
Augie Fackler <durin42@gmail.com>
parents: 53
diff changeset
24 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
25
0
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
26 [ui]
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
27 username = Augie Fackler <durin42@gmail.com>
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
28 style = compact
26
895bcf0db86a Global ignores for hg.
Augie Fackler <durin42@gmail.com>
parents: 23
diff changeset
29 ignore = ~/.hgglobalignore
0
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
30
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
31 [defaults]
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
32 qimport = --git
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
33 qrefresh = --git
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
34 annotate = -nu
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
35 heads = --style default
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
36 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
37 outgoing = --graph
86
68f53fa09e99 Moving all clojure stuff to a more self-contained area.
Augie Fackler <durin42@gmail.com>
parents: 78
diff changeset
38 # --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
39 # incoming = --graph
0
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
40 diff = -p
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
41
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
42 [diff]
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
43 git=1
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
44
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
45 [web]
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
46 style = gitweb
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
47 port=7000
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
48 allow_archive = bz2 zip
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
49
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
50 [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
51 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
52
0
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
53 [paths]
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
54 hgcrew = http://hg.intevation.org/mercurial/crew
48
bc63fd9e6d64 Edit some paths in .hgrc
Augie Fackler <durin42@gmail.com>
parents: 45
diff changeset
55 hgsubv = ssh://hg@bitbucket.org/durin42/hgsubversion/
145
a585b0d2b828 Fix this path.
Augie Fackler <durin42@gmail.com>
parents: 112
diff changeset
56 hggit = ssh://hg@bitbucket.org/durin42/hg-git/
72
d23dde77450a add histedit to paths
Augie Fackler <durin42@gmail.com>
parents: 71
diff changeset
57 histedit = ssh://hg@bitbucket.org/durin42/histedit/
0
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
58
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
59 [hooks]
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
60 # Prevent "hg pull" if MQ patches are applied.
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
61 #prechangegroup.mq-no-pull = ! hg qtop > /dev/null 2>&1
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
62 # Prevent "hg push" if MQ patches are applied.
c30d68fbd368 Initial import from svn.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
63 #preoutgoing.mq-no-push = ! hg qtop > /dev/null 2>&1