Jannis Leidel avatar Jannis Leidel committed 11c0b55

Added latest changes

Comments (0)

Files changed (3)

 [tree1]
 root = .
-revision = 740bfc251e5d9a7a2d7e58ad6cc7dd43a8a412d5
+revision = fd74739ae8a90cb91ef414e8ee3a6f5c92f51ae9
 path.default = ssh://hg@bitbucket.org/jezdez/hgstuff/
 
 [tree2]
 secret.txt
 myproject.db
 dev.db
-local_settings.py
+local_settings.py
+pip-log.txt
 username = Jannis Leidel <jannis@leidel.info>
 ssh = ssh -C
 ignore = ~/.hgstuff/.hgignore
+editor = mate
 
 [extensions]
+mq =
+gpg =
 color =
 alias =
+churn =
 fetch =
 purge =
 rebase =
-hgext.mq =
-hgext.gpg =
-hgext.churn =
-hgext.convert =
-hgext.extdiff =
-hgext.graphlog = 
-hgext.bookmarks =
-hgext.highlight = 
-hgext.patchbomb =
+record =
+convert =
+extdiff =
+graphlog = 
+bookmarks =
+highlight = 
+patchbomb =
 
 svn = ~/.hgstuff/hgsubversion
 info = ~/.hgstuff/info.py
 localbranch = ~/.hgstuff/localbranch/localbranch.py
 bitbucketrepo = ~/.hgstuff/bitbucketextension/bitbucketrepo
 
+[alias]
+blame = annotate -u -n
+stat = status -mardc
+llog = log --limit 10
+yyxyslog = log --template '{date|shortdate} [{rev}:{node|short}] {author|person}: {desc|firstline}\n' -l 10
+sin = incoming --template '{date|shortdate} [{rev}:{node|short}] {author|person}: {desc|firstline}\n'
+sout = outgoing --template '{date|shortdate} [{rev}:{node|short}] {author|person}: {desc|firstline}\n'
+sheads = heads --template '{date|shortdate} [{rev}:{node|short}] {author|person}: {desc|firstline}\n'
+sglog = glog --template '[{rev}:{node|short}] by {author|person} \n{desc|fill68}\n\n'
+
 [extdiff]
 cmd.chdiff =
 opts.chdiff = --wait
 # for Changes.app
 changes.executable = chdiff
 changes.args = --wait $local $other
+
+[web]
+allow_archive=bz2,gz,zip
+encoding=UTF-8
+style = monoblue
+
+[diff]
+nodates=1
+showfunc=1
+ignorews=1
+ignorewsamount=1
+ignoreblanklines=1
+
+[convert]
+hg.usebranchnames=0
+hg.clonebranches=1
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.