Mercurial > repos > other > linux

annotate hgrc @ 124:c3320f06d412

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add a minimal global gitignore We could add more, but this is intended for things that only I need to ignore (such as build directories that other people might do differently) rather than stuff that everyone wants to do (like ignoring .pyc files or log files in the project)
author IBBoard <dev@ibboard.co.uk>
date Wed, 13 Mar 2019 19:19:50 +0000
parents c9adf6fc4b61
children ac6c055e7441
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
9114ad0f9d1d Add Mercurial config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
4
63
327c85286b54 Add override for username for use on other systems
IBBoard <dev@ibboard.co.uk>
parents: 61
diff changeset
5 %include ~/.hgrc-username-override
327c85286b54 Add override for username for use on other systems
IBBoard <dev@ibboard.co.uk>
parents: 61
diff changeset
6
7
cac8f4eec6d4 Trust "root" for hgrc settings
IBBoard <dev@ibboard.co.uk>
parents: 3
diff changeset
7 [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
8 #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
9 #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
10 users = root
cac8f4eec6d4 Trust "root" for hgrc settings
IBBoard <dev@ibboard.co.uk>
parents: 3
diff changeset
11
1
9114ad0f9d1d Add Mercurial config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
12 [alias]
9114ad0f9d1d Add Mercurial config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
13 copush = !$HG commit $@ && $HG push
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 =
9114ad0f9d1d Add Mercurial config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
17 bookmarks =
9114ad0f9d1d Add Mercurial config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
18 hgext.convert=
9114ad0f9d1d Add Mercurial config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
19 color =
9114ad0f9d1d Add Mercurial config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
20 pager =
9114ad0f9d1d Add Mercurial config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
21 progress =
106
c9adf6fc4b61 Undo 6d1730858f0f and reinstate Hg Keyring as it is important!
IBBoard <dev@ibboard.co.uk>
parents: 73
diff changeset
22 mercurial_keyring =
64
39b07c5f8785 Add Git and Mercurial support to command prompt
IBBoard <dev@ibboard.co.uk>
parents: 63
diff changeset
23 prompt = ~/.hg-prompt.py
1
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
33
9c6716c4809b Add a "hg imdiff" command for diffing images using ImageMagick
IBBoard <dev@ibboard.co.uk>
parents: 16
diff changeset
27 # Image diffing
9c6716c4809b Add a "hg imdiff" command for diffing images using ImageMagick
IBBoard <dev@ibboard.co.uk>
parents: 16
diff changeset
28 cmd.imdiff = sh
9c6716c4809b Add a "hg imdiff" command for diffing images using ImageMagick
IBBoard <dev@ibboard.co.uk>
parents: 16
diff changeset
29 opts.imdiff = -c 'compare $0 $1 compared.png; display compared.png'
9
3728d07afc2c Trust system's CA bundle (otherwise StartSSL certs weren't accepted)
IBBoard <dev@ibboard.co.uk>
parents: 7
diff changeset
30
61
16f295fdcd98 Force pager settings for Mercurial
IBBoard <dev@ibboard.co.uk>
parents: 52
diff changeset
31 [pager]
16f295fdcd98 Force pager settings for Mercurial
IBBoard <dev@ibboard.co.uk>
parents: 52
diff changeset
32 pager = LESS='FSRX' less
16f295fdcd98 Force pager settings for Mercurial
IBBoard <dev@ibboard.co.uk>
parents: 52
diff changeset
33 ignore = version, help, update, serve, record
16f295fdcd98 Force pager settings for Mercurial
IBBoard <dev@ibboard.co.uk>
parents: 52
diff changeset
34
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
35 %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
36
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
37 %include ~/.hgrc-auth