X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=dot-files%2F_hgrc;h=d622fe69e7f63cb8fbe8686a6541ae278271d490;hb=0e42b84c0d493327315b70a5dbce85b2d54b2357;hp=fe5784753cc5b3a82a358f99f2fe4b79f415ff25;hpb=ed2518340c6d73aef16ef3e5be1e9d8e9a53f822;p=sugar.git

diff --git a/dot-files/_hgrc b/dot-files/_hgrc
index fe57847..d622fe6 100644
--- a/dot-files/_hgrc
+++ b/dot-files/_hgrc
@@ -1,13 +1,16 @@
+# -*- conf -*-
+
 [defaults]
 annotate = -n -l -u
-diff = --subrepos
+diff     = --subrepos
 branches = -a
-commit = --subrepos
-in = --subrepos
-out = --subrepos
-pull = --rebase
-qseries = --summary
-revert = --no-backup
+commit   = --subrepos
+in       = --subrepos
+out      = --subrepos
+pull     = --rebase
+qseries  = --summary
+revert   = --no-backup
+status   = --subrepos
 
 [ui]
 username = PHO <pho@cielonegro.org>
@@ -19,12 +22,11 @@ username = PHO <pho@cielonegro.org>
 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
+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
-__st  = status
-st    = !$HG __st `$HG root` --subrepos $HG_ARGS
-qst   = status --rev -2:.
+qpst  = status --rev qparent:.
+qst   = status --rev '.^1:.'
 bm    = bookmark
 bms   = bookmarks
 
@@ -38,6 +40,7 @@ hgext.pager=
 hgext.purge=
 hgext.rebase=
 hgext.record=
+hgext.shelve=
 hgext.transplant=
 
 [pager]