Yuya Nishihara <yuya@tcha.org> [Thu, 01 Apr 2010 00:35:12 +0900] rev 11061
log: add --stat for diffstat output
log --stat shows diffstat in place of patch output.
David Greenaway <hg-dev@davidgreenaway.com> [Sat, 03 Apr 2010 11:58:16 +1100] rev 11060
findrenames: Optimise "addremove -s100" by matching files by their SHA1 hashes.
We speed up 'findrenames' for the usecase when a user specifies they
want a similarity of 100% by matching files by their exact SHA1 hash
value. This reduces the number of comparisons required to find exact
matches from O(n^2) to O(n).
While it would be nice if we could just use mercurial's pre-calculated
SHA1 hash for existing files, this hash includes the file's ancestor
information making it unsuitable for our purposes. Instead, we calculate
the hash of old content from scratch.
The following benchmarks were taken on the current head of crew:
addremove 100% similarity:
rm -rf *; hg up -C; mv tests tests.new
hg --time addremove -s100 --dry-run
before: real 176.350 secs (user 128.890+0.000 sys 47.430+0.000)
after: real 2.130 secs (user 1.890+0.000 sys 0.240+0.000)
addremove 75% similarity:
rm -rf *; hg up -C; mv tests tests.new; \
for i in tests.new/*; do echo x >> $i; done
hg --time addremove -s75 --dry-run
before: real 264.560 secs (user 215.130+0.000 sys 49.410+0.000)
after: real 218.710 secs (user 172.790+0.000 sys 45.870+0.000)
David Greenaway <hg-dev@davidgreenaway.com> [Sat, 03 Apr 2010 11:58:16 +1100] rev 11059
Move 'findrenames' code into its own file.
The next few patches will increase the size of the "findrenames"
functionality. This patch simply moves the function into its own
file to avoid clutter building up in 'cmdutil.py'.
Martin Geisler <mg@lazybytes.net> [Sat, 01 May 2010 14:32:50 +0200] rev 11058
acl: cleanup module docstring
- removed implementation detail about how the group information is
obtained
- fixed some language, better consistency
- fixed bad comment in hgrc example
Martin Geisler <mg@lazybytes.net> [Sat, 01 May 2010 14:20:17 +0200] rev 11057
acl: fix ReST syntax in docstring
Martin Geisler <mg@lazybytes.net> [Sat, 01 May 2010 16:15:55 +0200] rev 11056
relink: removed unneeded local variable
Martin Geisler <mg@lazybytes.net> [Sat, 01 May 2010 16:35:27 +0200] rev 11055
test-acl: grep for $HGTMP, not /tmp/
Martin Geisler <mg@lazybytes.net> [Sat, 01 May 2010 16:15:27 +0200] rev 11054
Merge with stable
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Fri, 30 Apr 2010 18:11:56 +0200] rev 11053
dispatch: don't mangle ImportError abort messages
Previously, Mercurial assumed that the last word of the string
representation was the name of the moduled that was imported. This
assmption is incorrect, despite being true for the common case of an
exception raised by the Python VM.
For example, hgsubversion raises an ImportError with a helpful message
if the Subversion bindings were not found. The final word of this
message is not meaningful on its own, and is never the name of a
module.
This patch changes the output printed to be a simple stringification
of the exception instance. In most cases, this will be `abort: No
module named X!' rather than `abort: could not import module X!'.
No functionality change; all tests pass.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 01 May 2010 14:36:48 +0200] rev 11052
relink/progress: correctly handle the no file to relink case
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
Elifarley Callado Coelho Cruz <elifarley@gmail.com> [Mon, 26 Apr 2010 10:55:57 -0300] rev 11041
acl: add support for OS-level groups using @group syntax
Matt Mackall <mpm@selenic.com> [Thu, 29 Apr 2010 22:04:05 -0500] rev 11040
run-tests: add --view switch to use external diff viewer
Matt Mackall <mpm@selenic.com> [Thu, 29 Apr 2010 18:25:45 -0500] rev 11039
run-tests: sort options
Matt Mackall <mpm@selenic.com> [Thu, 29 Apr 2010 18:25:45 -0500] rev 11038
run-tests: add -l short option for --local