Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 13:11:52 -0500] rev 12410
tests: unify test-clone-cgi
Brodie Rao <brodie@bitheap.org> [Fri, 24 Sep 2010 15:50:57 -0500] rev 12409
test-ssh: test absolute paths in SSH URLs
Brodie Rao <brodie@bitheap.org> [Fri, 24 Sep 2010 15:36:53 -0500] rev 12408
revset: support raw string literals
This adds support for r'...' and r"..." as string literals. Strings
with the "r" prefix will not have their escape characters interpreted.
This is especially useful for grep(), where, with regular string
literals, \number is interpreted as an octal escape code, and \b is
interpreted as the backspace character (\x08).
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 13:11:31 -0500] rev 12407
tests: fold darcs test repository into a bundle
Mads Kiilerich <mads@kiilerich.com> [Sat, 25 Sep 2010 21:52:17 +0200] rev 12406
tests: avoid checking the exitcode of false
Solaris false returns 255 instead of 1, so we remove one unneeded instance and
replaces another with (exit 1) as suggested by Brodie Rao.
Mads Kiilerich <mads@kiilerich.com> [Sat, 25 Sep 2010 02:35:36 +0200] rev 12405
test-rename: accept solaris diff
Solaris diff gives
@@ -1,1 +1,1 @@
instead of
@@ -1 +1 @@
Mads Kiilerich <mads@kiilerich.com> [Sat, 25 Sep 2010 02:35:35 +0200] rev 12404
test-subrepo-svn: restore expr functionality for solaris
Cleanup in
22f3353bcc36 removed a syntactically incorrect and apparently
unnecessary escape of / for expr - but solaris needs it.
Mads Kiilerich <mads@kiilerich.com> [Sat, 25 Sep 2010 02:35:32 +0200] rev 12403
test-serve: fix test for binding to low named port on solaris
Solaris do not know the service called http, so we use echo instead.
Trying to define KILLQUIETLY when running the hgserve function didn't set the
value within the function. Now we set the variable before calling the function.
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Tue, 21 Sep 2010 23:55:32 +0200] rev 12402
templater: add a few comments.
Matt Mackall <mpm@selenic.com> [Fri, 24 Sep 2010 12:46:54 -0500] rev 12401
backout most of
4f8067c94729
Erik Zielke <ez@aragost.com> [Fri, 24 Sep 2010 12:00:55 +0200] rev 12400
incoming/outgoing: Fix recursion on sub repositories
Incoming and outgoing are fixed so they go through the whole three of
repositories instead of only visiting first level of sub repositories.
Martin Geisler <mg@aragost.com> [Fri, 24 Sep 2010 10:13:49 +0200] rev 12399
tests: added a short description to issue numbers
Many tests already had a short line to describe what IssueXXX is
about. I find that quite useful when reading a test.
Mads Kiilerich <mads@kiilerich.com> [Fri, 24 Sep 2010 03:04:14 +0200] rev 12398
merge with stable
Mads Kiilerich <mads@kiilerich.com> [Fri, 24 Sep 2010 02:57:15 +0200] rev 12397
test-gendoc: mute gendoc stderr
Solaris had problems with zh_CN and warned "couldn't set locale correctly" on
stderr. We don't care.
Mads Kiilerich <mads@kiilerich.com> [Fri, 24 Sep 2010 02:52:12 +0200] rev 12396
test-mq-symlinks: fix symlink handling on solaris
It seems like ln -s gets confused if an existing symlink is dangling:
$ rm -f a b; ln -s a b; ln -sf b b
ln: cannot create b: File exists
We now rely on rm instead of on ln -sf.
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.