Matt Mackall <mpm@selenic.com> [Thu, 29 Apr 2010 22:14:14 -0500] rev 11051
Merge with stable
Yuya Nishihara <yuya@tcha.org> [Wed, 07 Apr 2010 00:45:20 +0900] rev 11050
commands: refactor diff --stat and qdiff --stat
`opts['unified'] = '0'` can be replaced by `diffopts.context = 0`.
Yuya Nishihara <yuya@tcha.org> [Wed, 07 Apr 2010 00:10:54 +0900] rev 11049
mq: fix opts['unified'] = '0' to take effect when qdiff --stat
`opts['unified'] = '0'` tries to reduce the number of lines to be
processed by patch.diffstat, but here it does not affect diffopts,
thus it does not make sense.
Instead, we can change `diffopts.context` directly.
Added test case for qdiff --stat.
Mads Kiilerich <mads@kiilerich.com> [Mon, 26 Apr 2010 15:32:23 +0200] rev 11048
showconfig: show rc paths with --debug
Eric Eisner <ede@mit.edu> [Mon, 26 Apr 2010 15:58:36 -0400] rev 11047
tags: return tags in sorted order
This makes log and summary have less arbitrary tag ordering and also
groups similar tags together, such as the mq tags.
Christian Ebert <blacktrash@gmx.net> [Mon, 26 Apr 2010 04:01:13 +0200] rev 11046
keyword: test recording
Christian Ebert <blacktrash@gmx.net> [Mon, 26 Apr 2010 04:01:07 +0200] rev 11045
keyword: support (q)record
Monkeypatch hgext.dorecord to trigger keyword expansion.
Read data from working directory, not from filelog.
Prevent keyword expansion from within record's commitfunc,
thereby fixing a bug/inconsistency where files which are clean
after recording were overwritten twice.
Christian Ebert <blacktrash@gmx.net> [Mon, 26 Apr 2010 03:54:18 +0200] rev 11044
keyword: remove mq commands from restricted list
Monkeypatching patch.diff takes care of this since 911f5be5d159.
Test mq more thoroughly by loosening [keywordmaps] and comparing
the output of hg cat with keyword expansion enabled and disabled.
Elifarley Callado Coelho Cruz <elifarley@gmail.com> [Wed, 28 Apr 2010 11:10:58 -0300] rev 11043
acl: add tests for asterisk and for OS-level groups
Elifarley Callado Coelho Cruz <elifarley@gmail.com> [Tue, 27 Apr 2010 19:02:11 -0300] rev 11042
acl: updated doc string to reflect recent changes