X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=dot-files%2F_hgrc;h=d622fe69e7f63cb8fbe8686a6541ae278271d490;hb=ba3b44b5a3e1f1f775b99130246c5754dfd1fd54;hp=10c4440518aaa0479d9a708979afdf2fbbfd5e63;hpb=2139de592ae85c550babc55966dd7c20b15d5c31;p=sugar.git

diff --git a/dot-files/_hgrc b/dot-files/_hgrc
index 10c4440..d622fe6 100644
--- a/dot-files/_hgrc
+++ b/dot-files/_hgrc
@@ -1,22 +1,53 @@
+# -*- 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 = !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.mq =
-hgext.fetch =
-hgext.graphlog =
+hgext.color=
+hgext.convert=
+hgext.fetch=
+hgext.graphlog=
+hgext.mq=
+hgext.pager=
+hgext.purge=
+hgext.rebase=
 hgext.record=
-pager=
-color=
+hgext.shelve=
+hgext.transplant=
 
 [pager]
-attend = annotate, cat, diff, export, glog, qdiff
+attend = annotate, cat, diff, export, glog, grep, tags, qdiff
+
+[mq]
+git = auto
 
 [hooks]
 commit        = touch `hg root`/.hg/unpushed