annotate .hgrc @ 434:d4f6995812c1

more sensible defaults
author Jeff Hammel <jhammel@mozilla.com>
date Thu, 08 Aug 2013 09:49:54 -0700
parents 433442acf48f
children 67e5137b1476
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/
k0s <k0scist@gmail.com>
parents:
diff changeset
1 [ui]
57
aa97f8ac0cbe change username to mozilla login since i dont want to change this for each repository
Jeff Hammel <jhammel@mozilla.com>
parents: 54
diff changeset
2 username = Jeff Hammel <jhammel@mozilla.com>
18
ae0ffe7c9040 modify contact information for hg
k0s <k0scist@gmail.com>
parents: 0
diff changeset
3 ignore = /home/jhammel/.hgignore
54
82d24a65cb0d use meld as merge program
Jeff Hammel <k0scist@gmail.com>
parents: 53
diff changeset
4 merge = meld
214
06b47566e7f1 add verbose = True
Jeff Hammel <jhammel@mozilla.com>
parents: 172
diff changeset
5 verbose = True
239
ee77391f0a0c save patches inline
Jeff Hammel <jhammel@mozilla.com>
parents: 216
diff changeset
6 patch =
27
3b88a6c02421 update hgrc settings wrt https://developer.mozilla.org/en/Mercurial_FAQ
Jeff Hammel <k0scist@gmail.com>
parents: 18
diff changeset
7
3b88a6c02421 update hgrc settings wrt https://developer.mozilla.org/en/Mercurial_FAQ
Jeff Hammel <k0scist@gmail.com>
parents: 18
diff changeset
8 [defaults]
3b88a6c02421 update hgrc settings wrt https://developer.mozilla.org/en/Mercurial_FAQ
Jeff Hammel <k0scist@gmail.com>
parents: 18
diff changeset
9 commit = -v
116
2a83052a7a50 add hg defaults from http://blog.bonardo.net/2010/06/22/so-youre-about-to-use-checkin-needed
Jeff Hammel <jhammel@mozilla.com>
parents: 87
diff changeset
10 diff = -p -U 8
2a83052a7a50 add hg defaults from http://blog.bonardo.net/2010/06/22/so-youre-about-to-use-checkin-needed
Jeff Hammel <jhammel@mozilla.com>
parents: 87
diff changeset
11 qdiff = -p -U 8
2a83052a7a50 add hg defaults from http://blog.bonardo.net/2010/06/22/so-youre-about-to-use-checkin-needed
Jeff Hammel <jhammel@mozilla.com>
parents: 87
diff changeset
12 qnew = -U
68
3c1f9b412675 adding some stuff
Jeff Hammel <jhammel@mozilla.com>
parents: 57
diff changeset
13 repository_host = k0s.org/hg
121
c0bd17a8033b set some more sensible defaults
Jeff Hammel <jhammel@mozilla.com>
parents: 116
diff changeset
14 pull = --rebase
c0bd17a8033b set some more sensible defaults
Jeff Hammel <jhammel@mozilla.com>
parents: 116
diff changeset
15 revert = --no-backup
116
2a83052a7a50 add hg defaults from http://blog.bonardo.net/2010/06/22/so-youre-about-to-use-checkin-needed
Jeff Hammel <jhammel@mozilla.com>
parents: 87
diff changeset
16
27
3b88a6c02421 update hgrc settings wrt https://developer.mozilla.org/en/Mercurial_FAQ
Jeff Hammel <k0scist@gmail.com>
parents: 18
diff changeset
17 [diff]
3b88a6c02421 update hgrc settings wrt https://developer.mozilla.org/en/Mercurial_FAQ
Jeff Hammel <k0scist@gmail.com>
parents: 18
diff changeset
18 git = 1
3b88a6c02421 update hgrc settings wrt https://developer.mozilla.org/en/Mercurial_FAQ
Jeff Hammel <k0scist@gmail.com>
parents: 18
diff changeset
19 showfunc = 1
3b88a6c02421 update hgrc settings wrt https://developer.mozilla.org/en/Mercurial_FAQ
Jeff Hammel <k0scist@gmail.com>
parents: 18
diff changeset
20 unified = 8
18
ae0ffe7c9040 modify contact information for hg
k0s <k0scist@gmail.com>
parents: 0
diff changeset
21
53
bd91a6bc85cd enable mercurial queues
Jeff Hammel <k0scist@gmail.com>
parents: 27
diff changeset
22 [extensions]
216
07d8aa100fc2 enable hg share extension http://mercurial.selenic.com/wiki/ShareExtension
Jeff Hammel <jhammel@mozilla.com>
parents: 214
diff changeset
23 hgext.mq =
87
c4126b9a185f add the rebase extension to be enabled in hg
Jeff Hammel <jhammel@mozilla.com>
parents: 68
diff changeset
24 rebase =
216
07d8aa100fc2 enable hg share extension http://mercurial.selenic.com/wiki/ShareExtension
Jeff Hammel <jhammel@mozilla.com>
parents: 214
diff changeset
25 convert =
07d8aa100fc2 enable hg share extension http://mercurial.selenic.com/wiki/ShareExtension
Jeff Hammel <jhammel@mozilla.com>
parents: 214
diff changeset
26 share =
265
4c11105b05d2 add purge
Jeff Hammel <jhammel@mozilla.com>
parents: 239
diff changeset
27 purge =
53
bd91a6bc85cd enable mercurial queues
Jeff Hammel <k0scist@gmail.com>
parents: 27
diff changeset
28
18
ae0ffe7c9040 modify contact information for hg
k0s <k0scist@gmail.com>
parents: 0
diff changeset
29 [trusted]
ae0ffe7c9040 modify contact information for hg
k0s <k0scist@gmail.com>
parents: 0
diff changeset
30 users = jhammel
ae0ffe7c9040 modify contact information for hg
k0s <k0scist@gmail.com>
parents: 0
diff changeset
31 groups = jhammel
ae0ffe7c9040 modify contact information for hg
k0s <k0scist@gmail.com>
parents: 0
diff changeset
32
ae0ffe7c9040 modify contact information for hg
k0s <k0scist@gmail.com>
parents: 0
diff changeset
33 [web]
370
4198a58cc520 adding aliases
Jeff Hammel <jhammel@mozilla.com>
parents: 265
diff changeset
34 allow_archive = atom, rss, zip, bz2
68
3c1f9b412675 adding some stuff
Jeff Hammel <jhammel@mozilla.com>
parents: 57
diff changeset
35 contact = jhammel at mozilla dot com
370
4198a58cc520 adding aliases
Jeff Hammel <jhammel@mozilla.com>
parents: 265
diff changeset
36
4198a58cc520 adding aliases
Jeff Hammel <jhammel@mozilla.com>
parents: 265
diff changeset
37 [alias]
420
433442acf48f add a thing
Jeff Hammel <jhammel@mozilla.com>
parents: 380
diff changeset
38 blind-push = !($HG st -q | python -c "import sys, subprocess; print ' '.join([line[2:].rstrip() for line in sys.stdin.readlines() if len(line) > 2])" > blind_commit_message) && $HG commit -l blind_commit_message && $HG push
380
5b94b85763a0 add alias to actually reset the tree
Jeff Hammel <jhammel@mozilla.com>
parents: 370
diff changeset
39 reset = !$HG revert --no-backup --all && $HG purge
370
4198a58cc520 adding aliases
Jeff Hammel <jhammel@mozilla.com>
parents: 265
diff changeset
40 sync = !$HG pull && $HG push