Steven Stallion <sstallion@gmail.com> [Mon, 16 Apr 2012 22:41:03 -0700] rev 16457
transplant: remove extraneous whitespace
Matt Mackall <mpm@selenic.com> [Tue, 17 Apr 2012 11:13:38 -0500] rev 16456
journal: use tryread helper to backup files (issue3375)
Matt Mackall <mpm@selenic.com> [Tue, 17 Apr 2012 11:11:59 -0500] rev 16455
opener: introduce tryread helper
This makes it easier to follow the common pattern "read a file or give
an empty string if it's missing".
Angel Ezquerra <angel.ezquerra@gmail.com> [Tue, 17 Apr 2012 07:22:44 +0200] rev 16454
tests: add test for fileset 'subrepo' keyword
Patrick Mezard <patrick@mezard.eu> [Tue, 17 Apr 2012 10:33:47 +0200] rev 16453
revset: make matching() work on python 2.4
tuple.index() was apparently added to python 2.6:
http://bugs.python.org/issue1696444
Also remove a trailing comma to make check-code.py happy.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 17 Apr 2012 15:10:33 +0200] rev 16452
revset: use list instead of tuple for compatibility with python before 2.6
'string elements'.split() instead of explicitly typing a list of strings is
used. This is done in other parts of Mercurial code, too.
Matt Mackall <mpm@selenic.com> [Mon, 16 Apr 2012 16:50:25 -0500] rev 16451
merge with stable
Patrick Mezard <patrick@mezard.eu> [Mon, 16 Apr 2012 11:48:15 +0200] rev 16450
archive: make it work with svn subrepos (issue3308)
- _svncommand() in files() returns a tuple since 0ae98cd2a83f not a string.
- _svncommand() in filedata() returns a tuple not a string.
- "svn list" returns files but also directories.
- "svn list" is not recursive by default.
I have no idea what happens to svn:externals possibly embedded in the svn
subrepository.
Martin Geisler <mg@lazybytes.net> [Sun, 15 Apr 2012 16:05:57 +0200] rev 16449
largefiles: hide .hglf/ prefix for largefiles in hgweb
This makes the manifest view in hgweb match what you see in the
working copy and what you get when you download an archive in hgweb.
Martin Geisler <mg@lazybytes.net> [Sun, 15 Apr 2012 16:05:53 +0200] rev 16448
hgweb: add hook for remapping repository path into virtual paths
Extensions such as largefiles can use this to remap files so they
appear in the same location as they do in the user's working copy.
Angel Ezquerra <angel.ezquerra@gmail.com> [Sun, 15 Apr 2012 00:27:31 +0200] rev 16447
tests: add tests for matching keyword
This adds a couple of tests for the revset "matching" keyword:
1. Test that the 2nd parameter is optional
2. Test that all the 1st argument can be a revset and that all the supported
fields of the 2nd argument work.
Angel Ezquerra <angel.ezquerra@gmail.com> [Sat, 14 Apr 2012 01:41:03 +0200] rev 16446
revset: speedup matching() by first matching fields that take less time to
match
This patch sorts the fields that are passed to the matching function so that it
always starts by matching those fields that take less time to match.
Not all fields take the same amount of time to match. I've done several
measurements running the following command:
hg --time log -r "matching(1, field)"
on the mercurial repository, and where 'field' was each one of the fields
accepted by match. In order to avoid the print overhead (which could be
different for different fields, given the different number of matches) I used a
modified version of the matching() function which always returns no matches.
These tests showed that different fields take wildly different amounts of time
to match. Particulary the substate field takes up to 25 seconds to match on my
machine, compared to the 0.3 seconds that takes to match the phase field or the
2 seconds (approx) that takes to match most fields. With this patch, matching
both the phase and the substate of a revision takes the same amount of time as
matching the phase.
The field match order introduced by this patch is as follows:
phase, parents, user, date, branch, summary, files, description, substate
An extra nice thing about this patch is that it makes the match time stable.
Angel Ezquerra <angel.ezquerra@gmail.com> [Fri, 13 Apr 2012 13:46:49 +0200] rev 16445
revset: speedup matching() by stopping the match early if a field does not match
Rather than getting all the fields that are being matches from every revision
and then comparing them to those of the target revision, compare each field one
by one and stop the match as soon as there is a match failure.
This can greatly reduce the match time when matching multiple fields.
The impact on match time when matching a single field seems negligible
(according to my measurements).
Angel Ezquerra <angel.ezquerra@gmail.com> [Fri, 13 Apr 2012 13:35:45 +0200] rev 16444
revset: make matching keyword not match summary when matching for description