Mercurial > repos > other > linux

annotate hgrc @ 152:510c38f1cfc2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add helpful Git defaults for branch, pull/merge and publishing Also includes a broken command to try and alias adding to DVC since it always gives you a command to run
author IBBoard <dev@ibboard.co.uk>
date Tue, 11 Jan 2022 20:48:33 +0000
parents c67c56b569d8
children 961186621cc8
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
133
ac6c055e7441 Start using newer features of Mercurial - interactive commit!
IBBoard <dev@ibboard.co.uk>
parents: 106
diff changeset
4 # git add -p, only MORE interactive!
ac6c055e7441 Start using newer features of Mercurial - interactive commit!
IBBoard <dev@ibboard.co.uk>
parents: 106
diff changeset
5 interface = curses
1
9114ad0f9d1d Add Mercurial config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
6
63
327c85286b54 Add override for username for use on other systems
IBBoard <dev@ibboard.co.uk>
parents: 61
diff changeset
7 %include ~/.hgrc-username-override
327c85286b54 Add override for username for use on other systems
IBBoard <dev@ibboard.co.uk>
parents: 61
diff changeset
8
7
cac8f4eec6d4 Trust "root" for hgrc settings
IBBoard <dev@ibboard.co.uk>
parents: 3
diff changeset
9 [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
10 #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
11 #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
12 users = root
cac8f4eec6d4 Trust "root" for hgrc settings
IBBoard <dev@ibboard.co.uk>
parents: 3
diff changeset
13
1
9114ad0f9d1d Add Mercurial config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
14 [alias]
9114ad0f9d1d Add Mercurial config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
15 copush = !$HG commit $@ && $HG push
9114ad0f9d1d Add Mercurial config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
16
9114ad0f9d1d Add Mercurial config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
17 [extensions]
146
c67c56b569d8 Add the rebase extension to Mercurial
IBBoard <dev@ibboard.co.uk>
parents: 133
diff changeset
18 rebase =
1
9114ad0f9d1d Add Mercurial config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
19 extdiff =
9114ad0f9d1d Add Mercurial config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
20 bookmarks =
9114ad0f9d1d Add Mercurial config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
21 hgext.convert=
9114ad0f9d1d Add Mercurial config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
22 color =
9114ad0f9d1d Add Mercurial config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
23 pager =
9114ad0f9d1d Add Mercurial config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
24 progress =
106
c9adf6fc4b61 Undo 6d1730858f0f and reinstate Hg Keyring as it is important!
IBBoard <dev@ibboard.co.uk>
parents: 73
diff changeset
25 mercurial_keyring =
64
39b07c5f8785 Add Git and Mercurial support to command prompt
IBBoard <dev@ibboard.co.uk>
parents: 63
diff changeset
26 prompt = ~/.hg-prompt.py
1
9114ad0f9d1d Add Mercurial config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
27
9114ad0f9d1d Add Mercurial config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
28 [extdiff]
7
cac8f4eec6d4 Trust "root" for hgrc settings
IBBoard <dev@ibboard.co.uk>
parents: 3
diff changeset
29 cmd.meld = meld
33
9c6716c4809b Add a "hg imdiff" command for diffing images using ImageMagick
IBBoard <dev@ibboard.co.uk>
parents: 16
diff changeset
30 # Image diffing
9c6716c4809b Add a "hg imdiff" command for diffing images using ImageMagick
IBBoard <dev@ibboard.co.uk>
parents: 16
diff changeset
31 cmd.imdiff = sh
9c6716c4809b Add a "hg imdiff" command for diffing images using ImageMagick
IBBoard <dev@ibboard.co.uk>
parents: 16
diff changeset
32 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
33
61
16f295fdcd98 Force pager settings for Mercurial
IBBoard <dev@ibboard.co.uk>
parents: 52
diff changeset
34 [pager]
16f295fdcd98 Force pager settings for Mercurial
IBBoard <dev@ibboard.co.uk>
parents: 52
diff changeset
35 pager = LESS='FSRX' less
16f295fdcd98 Force pager settings for Mercurial
IBBoard <dev@ibboard.co.uk>
parents: 52
diff changeset
36 ignore = version, help, update, serve, record
16f295fdcd98 Force pager settings for Mercurial
IBBoard <dev@ibboard.co.uk>
parents: 52
diff changeset
37
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
38 %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
39
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
40 %include ~/.hgrc-auth