X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=dot-files%2F_hgrc;h=d622fe69e7f63cb8fbe8686a6541ae278271d490;hb=327001194323cff2a7532c2a5e2e3f50bebd90fe;hp=ba7491474e5f8acc13bfe6b04cccba76b4fce08a;hpb=ddc573a1b0740127262f031628fef3646326dfe8;p=sugar.git

diff --git a/dot-files/_hgrc b/dot-files/_hgrc
index ba74914..d622fe6 100644
--- a/dot-files/_hgrc
+++ b/dot-files/_hgrc
@@ -1,33 +1,54 @@
+# -*- conf -*-
+
 [defaults]
-pull = -u
 annotate = -n -l -u
+diff     = --subrepos
 branches = -a
-revert = --no-backup
+commit   = --subrepos
+in       = --subrepos
+out      = --subrepos
+pull     = --rebase
+qseries  = --summary
+revert   = --no-backup
+status   = --subrepos
 
 [ui]
 username = PHO <pho@cielonegro.org>
 
+[web]
+#cacerts = /etc/ssl/certs/ca-certificates.crt
+
 [diff]
 git = True
 
 [alias]
-egrep = !nohup egrep --color=always -n -e $1 `$HG manifest` | less -R --quit-if-one-screen
-fgrep = !nohup fgrep --color=always -n -e $1 `$HG manifest` | less -R --quit-if-one-screen
+egrep = !cd `$HG root`; nohup egrep --color=always -n -e '$1' `$HG manifest` | less -R --quit-if-one-screen
+fgrep = !cd `$HG root`; nohup fgrep --color=always -n -e '$1' `$HG manifest` | less -R --quit-if-one-screen
+stash = shelve
+qpst  = status --rev qparent:.
+qst   = status --rev '.^1:.'
+bm    = bookmark
+bms   = bookmarks
 
 [extensions]
 hgext.color=
 hgext.convert=
 hgext.fetch=
 hgext.graphlog=
-hgext.hgshelve=
 hgext.mq=
 hgext.pager=
+hgext.purge=
+hgext.rebase=
 hgext.record=
+hgext.shelve=
 hgext.transplant=
 
 [pager]
 attend = annotate, cat, diff, export, glog, grep, tags, qdiff
 
+[mq]
+git = auto
+
 [hooks]
 commit        = touch `hg root`/.hg/unpushed
 post-push     = rm -f `hg root`/.hg/unpushed