Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 16 Mar 2010 19:52:55 +0100] rev 10715
add a small test for contrib/check-code.py
This changeset adds a test file for contrib/check-code.py. This test runs
check-code.py against two small files. The first file should not raise any
check-code.py error while the second should. A line contains multiple errors to
verify the check-code.py behaviour: In the case of multiple errors at the same
line, the context line should only be displayed once.
Christian Ebert <blacktrash@gmx.net> [Tue, 16 Mar 2010 22:29:16 +0100] rev 10714
keyword: do not bother about detecting extension path in demo
Detecting and showing the path to a keyword extension in a
non-standard place only made sense while keyword.py was not
shipped with Mercurial.
The test output has changed because we do not have a spurious
space at eol anymore.
Christian Ebert <blacktrash@gmx.net> [Tue, 16 Mar 2010 22:28:58 +0100] rev 10713
keyword: make kwdemo less verbose
1) Set the branchname always silently with
dirstate.setbranch().
We create a branch so that testing the {branches} template
does not come up empty. But kwdemo is hardly the place to
inform the user by inference why {branches} is empty on the
default branch.
"demobranch" is ascii and cannot be changed, so using the
internal command instead of commands.branch() is safe.
2) Do not show full path to temporary directory
(distracting long lines on Mac OS X).
3) No special debug output. Output only related to keyword,
no internals like unsetting of commit hooks etc.
Christian Ebert <blacktrash@gmx.net> [Tue, 16 Mar 2010 22:28:23 +0100] rev 10712
keyword: 1 variable name for overwriting candidates
Christian Ebert <blacktrash@gmx.net> [Tue, 16 Mar 2010 22:27:22 +0100] rev 10711
keyword: do not customize ui.note() when overwriting
Behaviour change:
hg commit --verbose now prints out the names of the files
which are overwritten.
Cédric Duval <cedricduval@free.fr> [Mon, 15 Mar 2010 20:52:22 +0100] rev 10710
mq: test for init --mq with a destination argument
Adrian Buehlmann <adrian@cadifra.com> [Tue, 16 Mar 2010 17:39:12 +0100] rev 10709
contrib/wix: fix product name to include version
Without this, Mercurial is registered under the installed programs
on Windows as just 'Mercurial', which is unusual for a program to do
on Windows.
Including the version in the registered product name registers the
software in the Windows control panel of installed programs as, for
example, 'Mercurial 1.5' (for 1.5), or as
'Mercurial 1.5.1032' for a stable 1.5+32-35893dcfd40c
'Mercurial 1.5.5080' for a unstable 1.5+80-1ee60e82333c
when using http://bitbucket.org/tortoisehg/thg-winbuild to create
daily builds.
Furthermore, the install UI texts in the built installer database (MSI
file) are more clear on what the user is about to install, as, for example,
the text in the initial installer dialog now reads
"The Setup Wizard will install Mercurial 1.5 on your computer"
instead of just
"The Setup Wizard will install Mercurial on your computer"
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 16 Mar 2010 16:41:22 +0100] rev 10708
help: it's not necessary to escape quotes
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 16 Mar 2010 16:39:17 +0100] rev 10707
check-code: remove simple quotes first
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 16 Mar 2010 01:16:19 +0100] rev 10706
merge with stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 16 Mar 2010 01:16:04 +0100] rev 10705
filelog: no need to optimize an uncommon case, assume meta = {}
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 16 Mar 2010 01:12:46 +0100] rev 10704
filelog: text is stored modified when it starts with '\1\n'
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.
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