Patrick Mezard <pmezard@gmail.com> [Sat, 13 Mar 2010 20:02:46 +0100] rev 10676
Merge with crew-stable
Yuya Nishihara <yuya@tcha.org> [Thu, 11 Mar 2010 00:28:31 +0900] rev 10675
hgweb: make code to join url path simpler
Now SCRIPT_NAME never contains http://host:port part,
we don't need to care about '://'.
Yuya Nishihara <yuya@tcha.org> [Thu, 11 Mar 2010 00:28:27 +0900] rev 10674
hgweb: fix broken URLs of RSS/Atom feeds (issue1772)
This fixes doubled URL, e.g. http://example.orghttp://example.org/...,
which appears on RSS/Atom feeds served by hgwebdir.
It splits baseurl to update SERVER_NAME, SERVER_PORT and SCRIPT_NAME,
according to RFC 3875.
Updated the test output since SCRIPT_NAME becomes not to contain
http://host:port part.
Yuya Nishihara <yuya@tcha.org> [Thu, 11 Mar 2010 00:25:46 +0900] rev 10673
hgweb: introduce helper method to update req.env
Greg Ward <greg-hg@gerg.ca> [Tue, 02 Mar 2010 15:08:43 -0500] rev 10672
rebase: always check if rebasing onto an applied mq patch.
Previously, it only checked for an mq patch if the user explicitly
passed -d/--dest. But rebasing onto an mq patch is a bad idea
regardless of how we determine the rebase destination.
Martin Geisler <mg@lazybytes.net> [Sat, 13 Mar 2010 19:57:52 +0100] rev 10671
subrepo: wrap long line
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 13 Mar 2010 17:02:41 +0100] rev 10670
merge with stable
Brodie Rao <me+hg@dackz.net> [Fri, 05 Mar 2010 17:38:02 -0500] rev 10669
test-extension: fix disabled extension tests for run-tests.py --local
One test that requires inserting a broken extension into hgext does this
by modifying PYTHONPATH. This doesn't work when run with --local because
the 'hg' script being used is in the same directory as the local hgext.
Instead of modifying PYTHONPATH, a secondary extension is enabled using
--config that inserts the dummy hgext at the beginning of sys.path,
before the script's path.
Edouard Gomez <ed.gomez@free.fr> [Fri, 12 Mar 2010 01:23:35 +0100] rev 10668
subrepo: print subrepo pulling URL
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 13 Mar 2010 16:44:52 +0100] rev 10667
merge with stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 12 Mar 2010 01:23:35 +0100] rev 10666
subrepo: keep ui and hgrc in sync when creating new repo
Edouard Gomez <ed.gomez@free.fr> [Fri, 12 Mar 2010 01:23:35 +0100] rev 10665
subrepo: forward the push to argument into _abssource
Greg Lindahl <greg@blekko.com> [Sat, 13 Mar 2010 16:19:28 +0100] rev 10664
mercurial.spec: remove reference to doc/ja
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 13 Mar 2010 12:57:20 +0100] rev 10663
mq: simplify and use context API
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 13 Mar 2010 00:08:06 +0100] rev 10662
mq: avoid a (potentially expensive) repo.status(unknown=True) call
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 13 Mar 2010 00:02:33 +0100] rev 10661
mq: all_files can be a set, remove dangerous default values
Martin Geisler <mg@lazybytes.net> [Fri, 12 Mar 2010 00:50:41 +0100] rev 10660
Merge with stable
Martin Geisler <mg@lazybytes.net> [Fri, 12 Mar 2010 00:45:27 +0100] rev 10659
rebase: remove unnecessary \" from help string
They are not needed inside triple-quoted strings and they confuse the
line number computation done in i18n/hggettext. The script tries to
find the docstring in the source file. When \" in the source is turned
into just " in the docstring, the docstring can no longer be found.
Mads Kiilerich <mads@kiilerich.com> [Mon, 08 Mar 2010 03:07:35 +0100] rev 10658
test-merge-default and check-code.py: No "export x=x" in sh
Martin Geisler <mg@lazybytes.net> [Fri, 12 Mar 2010 00:02:39 +0100] rev 10657
Merge with stable
Augie Fackler <durin42@gmail.com> [Thu, 11 Mar 2010 16:54:34 -0600] rev 10656
progress: document progress.disable config option
Martin Geisler <mg@lazybytes.net> [Thu, 11 Mar 2010 23:44:12 +0100] rev 10655
shrink-revlog: add missing whitespace in expression
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 11 Mar 2010 19:09:35 +0100] rev 10654
any is not available for python2.4
Christian Ebert <blacktrash@gmx.net> [Thu, 11 Mar 2010 18:49:41 +0100] rev 10653
keyword: update copyright
Christian Ebert <blacktrash@gmx.net> [Thu, 11 Mar 2010 18:49:14 +0100] rev 10652
keyword: remove deprecated options
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 11 Mar 2010 17:43:44 +0100] rev 10651
style: use consistent variable names (*mod) with imports which would shadow
David Wolever <david@wolever.net> [Thu, 11 Mar 2010 15:52:17 +0100] rev 10650
archive: autodetect archive type by extension (issue2058)
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 11 Mar 2010 15:38:35 +0100] rev 10649
merge with stable
Dirkjan Ochtman <djc.ochtman@kentyde.com> [Thu, 11 Mar 2010 15:32:24 +0100] rev 10648
tests: use external coverage, mandate newer version
This removes the option for including the stdlib in coverage reports.
Eric Eisner <ede@mit.edu> [Thu, 11 Mar 2010 09:11:01 -0500] rev 10647
churn: use ui.progress instead of --progress