Matt Mackall <mpm@selenic.com> [Mon, 15 Mar 2010 16:36:32 -0500] rev 10703
Merge with stable
Matt Mackall <mpm@selenic.com> [Fri, 12 Mar 2010 16:16:47 -0600] rev 10702
check-code: add check for any/all
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 15 Mar 2010 19:55:52 +0100] rev 10701
cvsps: fix traceback involving 'synthetic'
https://bugzilla.redhat.com/show_bug.cgi?id=573666
Reported by Sjoerd Mullender
Martin Geisler <mg@lazybytes.net> [Mon, 15 Mar 2010 18:40:00 +0100] rev 10700
progress: use a verb in present participle
Martin Geisler <mg@lazybytes.net> [Mon, 15 Mar 2010 18:36:11 +0100] rev 10699
Merge with stable
Martin Geisler <mg@lazybytes.net> [Mon, 15 Mar 2010 18:33:39 +0100] rev 10698
progress: use a verb (+noun) in present participle
Edouard Gomez <ed.gomez@free.fr> [Sun, 14 Mar 2010 00:28:10 +0100] rev 10697
subrepo: fix hgrc paths section during subrepo pulling
There are two bugs in current subrepo ctor:
- hgrc paths were using parent repo (ctx._repo) instead of self._repo
- it was joined with local extract path, not its source repo path
Fixed both bugs using _abssource on self once it is fully initialized.
It gets the job done perfectly for pull and push urls.
Patrick Mezard <pmezard@gmail.com> [Sun, 14 Mar 2010 23:18:50 +0100] rev 10696
Merge with crew-stable
Mathieu Clabaut <mathieu.clabaut@systerel.fr> [Tue, 09 Mar 2010 12:09:57 +0100] rev 10695
convert: teach cvsps to handle . repository (issue1649)
For a CVS repository checked out with "cvs co .", the prefix used to strip of
what we get from CVS was previously erroneously set to "repopath/.".
We now prevent the dot to be added.
Test folded in test-convert-cvs and simplified by Patrick Mézard
<pmezard@gmail.com>.
Martin Geisler <mg@lazybytes.net> [Sun, 14 Mar 2010 23:10:52 +0100] rev 10694
record: separate each hunk with a blank line
This makes it easier for the eye to find the beginning of a hunk when
scrolling up in the terminal.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 14 Mar 2010 22:17:10 +0100] rev 10693
mq: do not try to delete non-existent files (regression from e8e56d8377ab)
Martin Geisler <mg@lazybytes.net> [Sun, 14 Mar 2010 22:21:48 +0100] rev 10692
Merge with stable
Cédric Duval <cedricduval@free.fr> [Sun, 14 Mar 2010 18:46:38 +0100] rev 10691
mq: fix init with nonexistent or non-local repository
Cédric Duval <cedricduval@free.fr> [Sun, 14 Mar 2010 19:21:24 +0100] rev 10690
mq: no longer refer to deprecated qinit -c command
Cédric Duval <cedricduval@free.fr> [Sun, 14 Mar 2010 19:17:06 +0100] rev 10689
mq: don't mention qinit as a "common task"
Without -c, it is a no-op (the queue is implicitly initialized by all
relevant commands if needed), and queue repositories with -c are an
advanced usage of mq, and not otherwise required.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 14 Mar 2010 19:09:55 +0100] rev 10688
mq: don't use regexp when not necessary
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 14 Mar 2010 14:53:20 +0100] rev 10687
mq: use xrange/enumerate instead of += 1
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 14 Mar 2010 14:45:01 +0100] rev 10686
mq: don't use len(list) unless necessary
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 14 Mar 2010 12:08:14 +0100] rev 10685
mq: find_series() simplify and don't use regexps
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 14 Mar 2010 11:12:51 +0100] rev 10684
mq: fix coding style (missing space)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 14 Mar 2010 11:12:07 +0100] rev 10683
mq: qsave creates entries with the left part empty (':patchname')
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 14 Mar 2010 01:35:54 +0100] rev 10682
mq: simplify statusentry(), fix restore broken by ee48e5ef8753
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 14 Mar 2010 01:06:58 +0100] rev 10681
mq: use context API
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 14 Mar 2010 01:01:17 +0100] rev 10680
mq: simplify qparents calculation
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 14 Mar 2010 00:53:55 +0100] rev 10679
mq: simplify commit message generation
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 14 Mar 2010 00:36:10 +0100] rev 10678
mq: avoid many hex/bin conversions, keep the binary node when possible
Stefano Tortarolo <stefano.tortarolo@gmail.com> [Sun, 07 Feb 2010 17:12:41 +0100] rev 10677
rebase: add option to not commit after a collapsing
This option is useful when other extensions (e.g., pbranch) want to
use rebase --collapse and append other things before committing.
This is not intended to be used from command line.
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.