Mads Kiilerich <mads@kiilerich.com> [Fri, 24 Sep 2010 02:49:09 +0200] rev 12395
test-archive: fix touch datestamps
Backport 3acd5f7ab9d0 and 9581d5efb6a5 to stable.
Patrick Mezard <pmezard@gmail.com> [Fri, 24 Sep 2010 00:17:04 +0200] rev 12394
Merge with stable
Patrick Mezard <pmezard@gmail.com> [Fri, 24 Sep 2010 00:04:07 +0200] rev 12393
convert/darcs: improve unsupported format detection (issue2172)
Patrick Mezard <pmezard@gmail.com> [Fri, 24 Sep 2010 00:03:58 +0200] rev 12392
bookmarks: fix _bookmarks/lookup() reentrancy issue (issue2016)
_bookmarks is loaded lazily and calls super.lookup(). Unfortunately, branch and
tags caches initializations also recurse in lookup() and end up trying to
access _bookmarks again. Massive confusion ensues.
I considered fixing all branches and tags cache loading to avoid recursing in
lookup() but it would add complexity to otherwise working code provided lookups
are performed on nodes or revnums.
Alexandre Fayolle <alexandre.fayolle@logilab.fr> [Thu, 23 Sep 2010 11:41:27 +0200] rev 12391
Fix memory leak when using hg commands over http repositories
When using hg commands over an http repository in a long running process, a
httphandler instance is leaked for each command, because of a loop
handler.parent -> OpenerDirector and OpenerDirector.handlers -> handler which
is not handled by Python's gc. Discussion on #mercurial concluded that removing
the __del__ method solved the problem.
Christian Ebert <blacktrash@gmx.net> [Thu, 23 Sep 2010 16:31:38 +0200] rev 12390
Use more note admonitions in help texts
Erik Zielke <ez@aragost.com> [Wed, 22 Sep 2010 16:23:55 +0200] rev 12389
Use note admonition
Erik Zielke <ez@aragost.com> [Wed, 22 Sep 2010 15:51:59 +0200] rev 12388
minirst: Support for admonitions
The old asciidoc format supported something like this,
this is why there is NOTE: scattered here and there.
Brodie Rao <brodie@bitheap.org> [Thu, 23 Sep 2010 00:02:31 -0500] rev 12387
cleanup: use x in (a, b) instead of x == a or x == b
Martin Geisler <mg@aragost.com> [Thu, 23 Sep 2010 10:59:21 +0200] rev 12386
merge with stable
Brodie Rao <brodie@bitheap.org> [Wed, 22 Sep 2010 19:15:27 -0500] rev 12385
grep: only catch re.error when compiling regular expressions
Anthony Foiani <anthony.foiani@gmail.com> [Thu, 23 Sep 2010 00:27:04 -0600] rev 12384
doc: clarify smtp.password usage
Mads Kiilerich <mads@kiilerich.com> [Thu, 23 Sep 2010 01:59:02 +0200] rev 12383
merge with stable
Mads Kiilerich <mads@kiilerich.com> [Thu, 23 Sep 2010 01:23:16 +0200] rev 12382
log: include unmodified-in-merge files in log diff/stat (issue2383)
f786fc4b8764 assumed that walkchangerevs called prep with all relevant matched
filenames, but actually it only contains the names of files changed in the
relevant changeset. That meant that log diff/stat of merges missed the diff for
files only changed in the other branch.
This is a minimal fix for making sure we only use fns when we are following and
thus will have problems with merges anyway ...
Mads Kiilerich <mads@kiilerich.com> [Thu, 23 Sep 2010 01:51:17 +0200] rev 12381
tests: fix unzip -l variability fix
01-01-1980 slipped through the grep.
Matt Mackall <mpm@selenic.com> [Wed, 22 Sep 2010 18:29:41 -0500] rev 12380
merge with stable
Matt Mackall <mpm@selenic.com> [Wed, 22 Sep 2010 17:13:49 -0500] rev 12379
tests: fix unzip -l variability
Patrick Mezard <pmezard@gmail.com> [Wed, 22 Sep 2010 23:51:10 +0200] rev 12378
mq: always require --force when pushing patches (issue2363)
--force was not necessary when passing --rev since 55578a8d7e84, but this
behaviour is usually harmful when branch names are passed instead of explicit
revisions.
Matt Mackall <mpm@selenic.com> [Wed, 22 Sep 2010 18:20:47 -0500] rev 12377
tests: various fixes for new unified test pattern format
Brodie Rao <brodie@bitheap.org> [Wed, 22 Sep 2010 16:06:02 -0500] rev 12376
tests: add glob matching for unified tests
This adds a " (glob)" marker that works like a simpler version of
(re): "*" is converted to ".*", and "?" is converted to ".".
Both special characters can be escaped using "\", and the backslash
itself can be escaped as well.
Other glob-style syntax, like "**", "[chars]", or "[!chars]", isn't
supported.
Brodie Rao <brodie@bitheap.org> [Wed, 22 Sep 2010 16:06:00 -0500] rev 12375
tests: require regexes in unified tests to be marked with " (re)"
Consider this test:
$ hg glog --template '{rev}:{node|short} "{desc}"\n'
@ 2:20c4f79fd7ac "3"
|
| o 1:38f24201dcab "2"
|/
o 0:2a18120dc1c9 "1"
Because each line beginning with "|" can be compiled as a regular
expression (equivalent to ".*|"), they will match any output.
Similarly:
$ echo foo
The blank output line can be compiled as a regular expression and will
also match any output.
With this patch, none of the above output lines will be matched as
regular expressions. A line must end in " (re)" in order to be matched
as one.
Lines are still matched literally first, so the following will pass:
$ echo 'foo (re)'
foo (re)
Brodie Rao <brodie@bitheap.org> [Wed, 22 Sep 2010 16:05:59 -0500] rev 12374
tests: ensure regexes match to the end of the string
Regular expressions in the test suite are currently written assuming
that you need a trailing ".*" to avoid matching to the end.
Instead of matching regular expressions using "^pattern", this patch
makes matching more restrictive by matching "^pattern$".
Brodie Rao <brodie@bitheap.org> [Wed, 22 Sep 2010 16:05:59 -0500] rev 12373
tests: don't match blank output lines as regexes in unified tests
Currently, the following unified test will pass:
$ echo foo
A blank output line (a line containing just two spaces) will match any
output.
The patch modifies the unified test runner to ignore empty strings
strings when do regular expression matching.
Brodie Rao <brodie@bitheap.org> [Wed, 22 Sep 2010 16:05:58 -0500] rev 12372
tests: improve regexes in unified tests