annotate hgrc @ 30:9ccd41c4f3fe

Fix an emoji key combo, comment them and add "fearful" (for "terrified/bad shocked" rather than just "shocked")
author IBBoard <dev@ibboard.co.uk>
date Wed, 20 Apr 2016 19:48:00 +0100
parents c88d17a35d61
children 9c6716c4809b
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1
9114ad0f9d1d Add Mercurial config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
1 [ui]
9114ad0f9d1d Add Mercurial config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
2 username = IBBoard <dev@ibboard.co.uk>
9114ad0f9d1d Add Mercurial config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
3 merge = meld
16
c88d17a35d61 Actually, merge details and dates are useful in Mercurial logs - more reformatting!
IBBoard <dev@ibboard.co.uk>
parents: 15
diff changeset
4 logtemplate='{rev}:{node|short} - {age(date)} ({phase}){ifeq(p2rev, '-1', '', '\n Merge: {p1rev}:{p1node|short} && {p2rev}:{p2node|short}')}\n {tabindent(desc)}\n\n'
1
9114ad0f9d1d Add Mercurial config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
5
7
cac8f4eec6d4 Trust "root" for hgrc settings
IBBoard <dev@ibboard.co.uk>
parents: 3
diff changeset
6 [trusted]
10
4268b51e6b73 Add modular login credentials (to avoid version controlling them) and CA support (for StartSSL on CentOS)
IBBoard <dev@ibboard.co.uk>
parents: 9
diff changeset
7 #Trust root (mainly for VPS running, where some repos are owned by root and we want to do "hg status" without sudo-ing)
4268b51e6b73 Add modular login credentials (to avoid version controlling them) and CA support (for StartSSL on CentOS)
IBBoard <dev@ibboard.co.uk>
parents: 9
diff changeset
8 #If we don't trust root then we're screwed anyway!
7
cac8f4eec6d4 Trust "root" for hgrc settings
IBBoard <dev@ibboard.co.uk>
parents: 3
diff changeset
9 users = root
cac8f4eec6d4 Trust "root" for hgrc settings
IBBoard <dev@ibboard.co.uk>
parents: 3
diff changeset
10
1
9114ad0f9d1d Add Mercurial config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
11 [alias]
9114ad0f9d1d Add Mercurial config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
12 copush = !$HG commit $@ && $HG push
9114ad0f9d1d Add Mercurial config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
13 view = hgview
9114ad0f9d1d Add Mercurial config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
14
9114ad0f9d1d Add Mercurial config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
15 [extensions]
9114ad0f9d1d Add Mercurial config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
16 extdiff =
3
2a6d32a03c0e Work around differing paths for hgview
IBBoard <dev@ibboard.co.uk>
parents: 1
diff changeset
17 hgext.hgview = ~/.hgview.py
1
9114ad0f9d1d Add Mercurial config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
18 bookmarks =
9114ad0f9d1d Add Mercurial config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
19 hgext.convert=
9114ad0f9d1d Add Mercurial config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
20 color =
9114ad0f9d1d Add Mercurial config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
21 pager =
9114ad0f9d1d Add Mercurial config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
22 progress =
9114ad0f9d1d Add Mercurial config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
23 mercurial_keyring =
9114ad0f9d1d Add Mercurial config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
24
9114ad0f9d1d Add Mercurial config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
25 [extdiff]
7
cac8f4eec6d4 Trust "root" for hgrc settings
IBBoard <dev@ibboard.co.uk>
parents: 3
diff changeset
26 cmd.meld = meld
9
3728d07afc2c Trust system's CA bundle (otherwise StartSSL certs weren't accepted)
IBBoard <dev@ibboard.co.uk>
parents: 7
diff changeset
27
10
4268b51e6b73 Add modular login credentials (to avoid version controlling them) and CA support (for StartSSL on CentOS)
IBBoard <dev@ibboard.co.uk>
parents: 9
diff changeset
28 %include ~/.hgrc-certs
4268b51e6b73 Add modular login credentials (to avoid version controlling them) and CA support (for StartSSL on CentOS)
IBBoard <dev@ibboard.co.uk>
parents: 9
diff changeset
29
4268b51e6b73 Add modular login credentials (to avoid version controlling them) and CA support (for StartSSL on CentOS)
IBBoard <dev@ibboard.co.uk>
parents: 9
diff changeset
30 %include ~/.hgrc-auth