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.
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
Greg Ward <greg-hg@gerg.ca> [Tue, 09 Mar 2010 21:53:16 -0500] rev 10646
rebase: improve help text
- add a paragraph about default dest/source changesets
- option help: say "changeset" not "revision"
- option help: explain -b/--base better
- clarify that -a/--abort and -c/--continue are different from the
other options
Martin Geisler <mg@lazybytes.net> [Thu, 11 Mar 2010 14:56:15 +0100] rev 10645
commands: remove extra indentation from list in help text
Dirkjan Ochtman <djc.ochtman@kentyde.com> [Thu, 11 Mar 2010 13:33:29 +0100] rev 10644
server: initialize wsgi app in command, then wrap server around it
Dirkjan Ochtman <djc.ochtman@kentyde.com> [Thu, 11 Mar 2010 13:32:43 +0100] rev 10643
server: unnest server classes into module namespace
Dirkjan Ochtman <djc.ochtman@kentyde.com> [Thu, 11 Mar 2010 13:32:26 +0100] rev 10642
server: pass wsgi application to server (no need for non-local var)
Dirkjan Ochtman <djc.ochtman@kentyde.com> [Thu, 11 Mar 2010 13:31:37 +0100] rev 10641
server: abstract setup of ipv6 vs. normal server
Dirkjan Ochtman <djc.ochtman@kentyde.com> [Thu, 11 Mar 2010 13:30:52 +0100] rev 10640
server: handle server-internal config setup inside server class
Dirkjan Ochtman <djc.ochtman@kentyde.com> [Thu, 11 Mar 2010 13:28:39 +0100] rev 10639
server: externalize and streamline mixin setup
Dirkjan Ochtman <djc.ochtman@kentyde.com> [Thu, 11 Mar 2010 11:21:48 +0100] rev 10638
server: externalize application creation
timeless <timeless@gmail.com> [Thu, 11 Mar 2010 10:06:01 +0200] rev 10637
commands: document and test hg clone update priority
Greg Ward <greg-hg@gerg.ca> [Tue, 09 Mar 2010 21:53:16 -0500] rev 10636
rebase: improve help text
- add a paragraph about default dest/source changesets
- option help: say "changeset" not "revision"
- option help: explain -b/--base better
- clarify that -a/--abort and -c/--continue are different from the
other options