Mercurial > repos > other > linux
annotate hgrc @ 41:a3e1d298f815
Swap two emojis so that they better match the images
| author | IBBoard <dev@ibboard.co.uk> |
|---|---|
| date | Tue, 17 Jan 2017 09:15:51 +0000 |
| parents | 9c6716c4809b |
| children | 708289800f62 |
| rev | line source |
|---|---|
| 1 | 1 [ui] |
| 2 username = IBBoard <dev@ibboard.co.uk> | |
| 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 | 5 |
| 7 | 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 | 9 users = root |
| 10 | |
| 1 | 11 [alias] |
| 12 copush = !$HG commit $@ && $HG push | |
| 13 view = hgview | |
| 14 | |
| 15 [extensions] | |
| 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 | 18 bookmarks = |
| 19 hgext.convert= | |
| 20 color = | |
| 21 pager = | |
| 22 progress = | |
| 23 mercurial_keyring = | |
| 24 | |
| 25 [extdiff] | |
| 7 | 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 |
|
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
|
31 %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
|
32 |
|
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
|
33 %include ~/.hgrc-auth |