Nicolas Dumazet <nicdumz.commits@gmail.com> [Tue, 17 Nov 2009 18:50:39 +0900] rev 9958
run-tests: add --inotify option to test runner
Activate inotify extension when running tests.
Sune Foldager <cryo@cyanite.org> [Mon, 30 Nov 2009 19:52:03 +0100] rev 9957
merge with stable
Sune Foldager <cryo@cyanite.org> [Mon, 30 Nov 2009 19:37:38 +0100] rev 9956
extdiff: respect --option in command aliases (issue949)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 30 Nov 2009 16:53:05 +0100] rev 9955
merge with stable
Sune Foldager <cryo@cyanite.org> [Mon, 30 Nov 2009 14:58:52 +0100] rev 9954
fix bug in prepush logic involving merge changesets
When creating new branches and merging them into existing ones, you would
sometimes be able to push some changesets (the existing branches) without using
--force, even when that creates a new head on the remote.
A test which triggers the error has been added.
Martin Geisler <mg@lazybytes.net> [Sat, 28 Nov 2009 23:58:03 +0100] rev 9953
Merge with stable
timeless@mozdev.org [Sat, 28 Nov 2009 23:44:18 +0100] rev 9952
commands: add missing options in command line help
Martin Geisler <mg@lazybytes.net> [Sat, 28 Nov 2009 23:23:16 +0100] rev 9951
commands: mark strings for translation
timeless [Fri, 27 Nov 2009 18:26:25 +0000] rev 9950
keyword: clarify object of backwards compatibility
Greg Ward <greg-hg@gerg.ca> [Fri, 27 Nov 2009 11:50:52 -0500] rev 9949
commit: write last-message.txt with no content modifications.
This assumes the user will use either a sane editor (anything but
Notepad) or the same editor again: even Notepad should be able to read
what it previously wrote.
Marti Raudsepp <marti@juffo.org> [Thu, 26 Nov 2009 10:47:39 +0200] rev 9948
mail: add parseaddrlist() function for parsing many addresses at once
Adds a new function addrlistencode() to mercurial.mail, like addressencode(),
but accepts a list of addresses as input, and returns a list of formatted
addresses. This will be used by patchbomb.
The difference is that each element in the input list can contain multiple
addresses (comma separated or otherwise), and are split using Python's
email.Utils.getaddresses().
Marti Raudsepp <marti@juffo.org> [Thu, 26 Nov 2009 12:23:28 +0200] rev 9947
patchbomb: fix parsing of multiple addresses, allow multiple addrs in --to/cc/bcc
Instead of using custom code to split apart addresses, we now use
mail.parseaddrlist() which always does the Right Thing as it relies on Python's
email.Utils.getaddresses().
Previously, 'hg email --to=foo,bar' only respected foo and discarded bar. Also,
commas in names were not allowed in hgrc or the interactive prompt; specifying
'"Lastname, Firstname" <foo>' would confuse patchbomb.
The testcase uses '-m tmp.mbox' because -n (like in other tests) would disable
address mangling.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 27 Nov 2009 13:53:27 +0100] rev 9946
templates: add raw templates for tags/branches pages
Martin Geisler <mg@lazybytes.net> [Thu, 26 Nov 2009 23:10:59 +0100] rev 9945
extdiff: wrap long lines in docstring and comments
Gettext wraps lines in the messages when it writes them to the hg.pot
file and that makes long lines look odd in the resulting .po file.
Martin Geisler <mg@lazybytes.net> [Thu, 26 Nov 2009 20:59:35 +0100] rev 9944
Merge with stable
Christian Ebert <blacktrash@gmx.net> [Thu, 26 Nov 2009 10:51:17 +0100] rev 9943
keyword: the CVS keyword is $RCSfile$, not $RCSFile$
http://cvsbook.red-bean.com/cvsbook.html#List%20Of%20Keywords
Fix default keyword map accordingly.
Keep $RCSFile$ for Mercurial backwards compatibility.
Martin Geisler <mg@lazybytes.net> [Thu, 26 Nov 2009 20:50:16 +0100] rev 9942
keyword: sort demo output to ensure deterministic output
Martin Geisler <mg@lazybytes.net> [Thu, 26 Nov 2009 20:06:45 +0100] rev 9941
extdiff: prevent exception on double-translation
The docstring is translated twice: once when used as a format string,
and once on display. The second translation fails when the first
translation introduces non-ASCII characters in the string.
The problem is that the gettext module calls unicode(message) on the
string, i.e., it decodes it to a Unicode string using the ASCII
encoding (the default encoding). By translating it into a Unicode
string here, the unicode() call becomes a noop.
Matt Mackall <mpm@selenic.com> [Wed, 25 Nov 2009 21:54:47 -0600] rev 9940
Merge with stable again
Matt Mackall <mpm@selenic.com> [Wed, 25 Nov 2009 21:54:18 -0600] rev 9939
Merge stable heads
Matt Mackall <mpm@selenic.com> [Wed, 25 Nov 2009 21:52:39 -0600] rev 9938
Fix changelog test
Matt Mackall <mpm@selenic.com> [Wed, 25 Nov 2009 21:44:19 -0600] rev 9937
Merge with stable
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Mon, 01 Jun 2009 20:32:53 +0200] rev 9936
list branches in changelog template
Greg Ward <greg-hg@gerg.ca> [Tue, 24 Nov 2009 21:08:40 -0500] rev 9935
commit: if relevant, tell user their commit message was saved.
(issue1635)
Specifically, if:
1) the user edited the message (it didn't come straight from -m) and
2) the commit was aborted by an exception
then the saved commit message in .hg/last-message.txt could come in handy, so
mention it with a ui.write().
This doesn't help users who manually rollback to amend a changeset:
the fact that the message was saved to .hg/last-message.txt is
invisible in that case.
Greg Ward <greg-hg@gerg.ca> [Tue, 24 Nov 2009 21:08:39 -0500] rev 9934
commit: save commit message so it's not destroyed by rollback.
(issue1635)
Rationale: if a pretxncommit hook rejects this commit, the transaction
is rolled back and the user's commit message is irrevocably lost.
So save a copy in .hg/last-message.txt, just in case. Also handy if
the user deliberately rolls back a commit in order to amend it.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Fri, 14 Aug 2009 08:19:49 -0400] rev 9933
inotify: create a common, OS-independent server entry point
* rename server.py to linuxserver.py
* create server.py: it will contain OS-independent logic for servers, and will
import the right server depending on the OS
* old server.server class is renamed to linuxserver.socketlistener
Alexander Solovyov <piranha@piranha.org.ua> [Wed, 25 Nov 2009 00:02:02 +0200] rev 9932
perf.perflog: add option to follow renames
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 24 Nov 2009 13:55:13 -0200] rev 9931
run-tests: LANGUAGE may make tests fail
Bryan O'Sullivan <bos@serpentine.com> [Tue, 24 Nov 2009 14:45:29 -0800] rev 9930
Merge with mpm
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 24 Nov 2009 20:40:16 +0100] rev 9929
merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 24 Nov 2009 20:40:04 +0100] rev 9928
findrenames: improve coding-style
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 24 Nov 2009 18:21:47 +0100] rev 9927
findrenames: speedup exact match
benchmarked on crew repo with:
rm -rf * ; hg up -C ; for i in `find . -name "*.py"` ; do mv $i $i.new;done
followed by:
hg addremove -s 100
before: Time: real 28.890 secs (user 26.920+0.000 sys 1.450+0.000)
after : Time: real 6.790 secs (user 5.310+0.000 sys 1.350+0.000)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 24 Nov 2009 17:39:42 +0100] rev 9926
findrenames: refactor the score computation
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 24 Nov 2009 17:26:42 +0100] rev 9925
findrenames: first loop over the removed files, it's faster
Getting the file from the working dir is less expensive than getting it from
the repo history, hence the speedup.
benchmarked on crew repo with:
rm -rf * ; hg up -C ; for i in `find . -name "*.py"` ; do mv $i $i.new;done
followed by:
hg addremove -s 100
before: Time: real 68.760 secs (user 65.760+0.000 sys 2.490+0.000)
after : Time: real 28.890 secs (user 26.920+0.000 sys 1.450+0.000)
Alexander Solovyov <piranha@piranha.org.ua> [Tue, 24 Nov 2009 14:32:19 +0200] rev 9924
localrepo: support 'rev in repo' syntax
Brendan Cully <brendan@kublai.com> [Tue, 24 Nov 2009 11:20:25 -0800] rev 9923
zsh completion: add summary
Matt Mackall <mpm@selenic.com> [Tue, 24 Nov 2009 10:25:11 -0600] rev 9922
Merge with stable
Matt Mackall <mpm@selenic.com> [Tue, 24 Nov 2009 10:23:53 -0600] rev 9921
Merge with crew
Matt Mackall <mpm@selenic.com> [Tue, 24 Nov 2009 10:15:12 -0600] rev 9920
Merge with i18n
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 23 Nov 2009 15:15:54 -0200] rev 9919
merge with i18n stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 23 Nov 2009 15:15:01 -0200] rev 9918
i18n-pt_BR: synchronized with 5d748045c2ae
Matt Mackall <mpm@selenic.com> [Tue, 24 Nov 2009 10:14:27 -0600] rev 9917
Merge with crew
Alexander Solovyov <piranha@piranha.org.ua> [Tue, 24 Nov 2009 16:07:36 +0200] rev 9916
commands.log: getrenamed() cleanup
Sune Foldager <cryo@cyanite.org> [Tue, 24 Nov 2009 09:49:23 +0100] rev 9915
ancestor: improve docstring
The term "least common ancestor" is highly ambiguous.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 23 Nov 2009 23:04:44 +0100] rev 9914
merge with stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 23 Nov 2009 22:45:36 +0100] rev 9913
run-tests: always set $COLUMNS, fix running tests under emacs shell
fix tests failure reported by Neal Becker.
Patrick Mezard <pmezard@gmail.com> [Mon, 23 Nov 2009 22:46:48 +0100] rev 9912
Merge with crew-stable
Pascal Quantin <pascal.quantin@gmail.com> [Mon, 23 Nov 2009 22:08:59 +0100] rev 9911
Add help files to win32 installer (issue 1919)
Sune Foldager <cryo@cyanite.org> [Mon, 23 Nov 2009 11:03:55 +0100] rev 9910
hgweb: add support for extension-provided permission hooks
This allows extensions to hook into permission checking, providing both
authentication and authorization as needed. The existing authorization
function has been changed to a hook, which is added by default.
Matt Mackall <mpm@selenic.com> [Sun, 22 Nov 2009 15:36:22 -0600] rev 9909
Merge with i18n
Martin Geisler <mg@lazybytes.net> [Sun, 22 Nov 2009 21:34:12 +0100] rev 9908
i18n-da: synchronized with b5170b8b32a5
Jens Bäckman <jens.backman@gmail.com> [Sun, 22 Nov 2009 19:37:19 +0100] rev 9907
i18n-sv: translated seven commands
These commands has been translated:
addremove, archive, backout, config, unbundle, verify, version
Jens Bäckman <jens.backman@gmail.com> [Sun, 22 Nov 2009 19:12:39 +0100] rev 9906
i18n-sv: synchronized with b5170b8b32a5
Patrick Mezard <pmezard@gmail.com> [Sun, 22 Nov 2009 19:11:12 +0100] rev 9905
run-tests: work around a distutils bug triggered by 0a8a43b4ca75
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 22 Nov 2009 11:27:29 +0100] rev 9904
merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 22 Nov 2009 11:25:01 +0100] rev 9903
Do not overwrite motd attribute of hgwebdir instances on refresh.
This allows using
application = hgwebdir(...)
application.motd = (string or object with __str__ method)
in WSGI (like it is possible in CGI).
Changed web.motd in the config file is still read with this, because
hgwebdir.templater.motd() does not store the config value.
Martin Geisler <mg@lazybytes.net> [Sun, 22 Nov 2009 11:19:07 +0100] rev 9902
Merge with stable
Henri Wiechers <hwiechers@gmail.com> [Fri, 20 Nov 2009 14:11:05 +0200] rev 9901
commands: minor refactoring
Renamed local variable i to entry in helpcmd.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Thu, 19 Nov 2009 11:06:01 +0900] rev 9900
inotify: improve error messages
* prefix messages by inotify-(client|server)
* make sure that all warning and abort messages use the same format.
* in the case where inotify.sock is an old broken symlink, say so and abort
instead of trying to overwrite the already existing link
Greg Ward <greg@gerg.ca> [Wed, 18 Nov 2009 22:23:11 -0500] rev 9899
run-tests: give each child its own tmp dir (issue1911)
Fixes bug introduced by f8b4df4b033d (issue1911: --tmpdir plus parallel
mode = fail), and also fixes the long-standing quirk that parallel mode
created multiple /tmp/hgtests.XXXXXX directories. Now there is only one
/tmp/hgtests.XXXXXX, with child0, child1, etc. under it.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 20 Nov 2009 02:34:56 +0100] rev 9898
merge with stable
Nicolas Dumazet <nicdumz.commits@gmail.com> [Tue, 17 Nov 2009 15:36:09 +0900] rev 9897
inotify: add a inotify.pidfile configuration possibility
This will mainly help us in our tests to log pids of inotify servers
started implicitely, to make sure that unkilled inotify daemons do not clutter
the output of unrelated tests.
Also desactivate the workaround introduced in 951ec6c7d703
Nicolas Dumazet <nicdumz.commits@gmail.com> [Tue, 17 Nov 2009 15:00:00 +0900] rev 9896
cmdutil.service: do not _exit(0) in the parent process
The fact that a parent process spawns a daemon does not necessarily means that
it is the only think it has to do. This was forcing since 7c01599dd340 inotify
processes launched implicitely to exit prematurely:
when no inotify server was running, "hg st" for example would only launch a
inotify server, _exit(0) and thus would not return file statuses.
This changeset adds a test for implicitely launched inotify processes.
Change to output of test-inotify-1208 is correct: it reflects the normal
error message of "hg st" when not dying during "hg inserve" daemon creation.
Martin Geisler <mg@lazybytes.net> [Thu, 19 Nov 2009 23:39:30 +0100] rev 9895
Merge with stable
Faheem Mitha <faheem@email.unc.edu> [Thu, 19 Nov 2009 17:33:41 -0500] rev 9894
commands: improve help for "hg clone -r"
Martin Geisler <mg@lazybytes.net> [Thu, 19 Nov 2009 23:29:02 +0100] rev 9893
commands, dates: use real lists instead of literal blocks
Martin Geisler <mg@lazybytes.net> [Thu, 19 Nov 2009 23:27:11 +0100] rev 9892
commands: use field lists instead of literal blocks in docstrings
The literal blocks were mis-used for alignment, but this of course
changes the font of the entire block to a fixed width font in the HTML
version. Using a proper list solves this.
Martin Geisler <mg@lazybytes.net> [Thu, 19 Nov 2009 22:25:38 +0100] rev 9891
commands: do not indent list in clone help string
Greg Ward <greg@gerg.ca> [Wed, 18 Nov 2009 22:23:11 -0500] rev 9890
run-tests: give each child its own tmp dir (issue1911)
Fixes bug introduced by f8b4df4b033d (issue1911: --tmpdir plus parallel
mode = fail), and also fixes the long-standing quirk that parallel mode
created multiple /tmp/hgtests.XXXXXX directories. Now there is only one
/tmp/hgtests.XXXXXX, with child0, child1, etc. under it.
Martin Geisler <mg@lazybytes.net> [Thu, 19 Nov 2009 21:59:06 +0100] rev 9889
test-non-interactive-wsgi: make output deterministic
Henrik Stuart <hg@hstuart.dk> [Thu, 19 Nov 2009 15:54:57 +0100] rev 9888
hgweb: fix error in 38170eeed18c and introduce test for change
Sune Foldager <cryo@cyanite.org> [Thu, 19 Nov 2009 10:32:33 +0100] rev 9887
ui: add environ property to access os.environ or wsgirequest.environ
The property returns os.environ by default, and is propagated by ui.copy.
During hgweb processing, ui.environ is set to the proper WSGI-request
environment, as contained in wsgirequest.environ. For CGI, this is the
same as os.environ.
The property is meant to be read-only, as with os.environ (generally).
Martin Geisler <mg@lazybytes.net> [Sun, 08 Nov 2009 00:27:15 +0100] rev 9886
relink: wrap long lines in docstring
Patrick Mezard <pmezard@gmail.com> [Wed, 18 Nov 2009 21:58:49 +0100] rev 9885
test-convert-filemap: test improved filtering algorithm
Stefan Simek <simek@triaxis.sk> [Tue, 10 Nov 2009 13:04:03 +0100] rev 9884
convert: make filemap favor most specific filtering rule
A filemap like:
exclude "doc"
include "doc/foo.txt"
will now preserve doc/foo.txt and exclude everything else in doc/.
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Tue, 17 Nov 2009 13:24:58 +0100] rev 9883
run-tests: set --home when building with distutils
If home was set in ~/.pydistutils.cfg, the tests could not run. This
overrides any home setting by supplying --home="" on the command line.
Zhigang Wang <w1z2g3@gmail.com> [Wed, 18 Nov 2009 20:14:17 +0100] rev 9882
gitweb: add a latest link to the gitweb style
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Wed, 18 Nov 2009 12:47:58 +0100] rev 9881
httprepo: suppress the `real URL is...' message in safe, common cases.
When the actual and requested URL only differ by trailing slashes,
there is no need to warn. As an example, this easily happens when
accessing repositories on Bitbucket over HTTP(S).
As far as I could tell, there were no existing tests for this
behaviour.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 18 Nov 2009 17:09:00 +0100] rev 9880
merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 18 Nov 2009 16:47:20 +0100] rev 9879
Extend test-branchmap to test c51494c53841
(encoding fallback in branchmap to maintain compatibility with 1.3.x)
Sune Foldager <cryo@cyanite.org> [Wed, 18 Nov 2009 15:20:08 +0100] rev 9878
branchmap: fix defective fallback fix 0262bb59016f
The fix applied as 0262bb59016f doesn't work and is essentially a no-op.
This fix also adds a comment about the nature of the problem, and a test.
Martin Geisler <mg@lazybytes.net> [Wed, 18 Nov 2009 00:19:42 +0100] rev 9877
Merge with stable
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Wed, 11 Nov 2009 17:48:00 +0100] rev 9876
alias: improve help text for command aliases
Displays the line "alias for: hg ..." with the original command including options,
followed by the command's original help text.
Henri Wiechers <hwiechers@gmail.com> [Fri, 13 Nov 2009 16:38:27 +0200] rev 9875
dispatch: minor refactoring
Renamed local variable i to entry in _dispatch.
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Tue, 17 Nov 2009 22:16:41 +0100] rev 9874
qseries: don't truncate the patch name (issue1912)
Instead of truncating the entire output line of `qseries', only the
summary is truncated.
Matt Mackall <mpm@selenic.com> [Tue, 17 Nov 2009 16:23:05 -0600] rev 9873
summary: note non-default branches with -q
Matt Mackall <mpm@selenic.com> [Tue, 17 Nov 2009 16:22:17 -0600] rev 9872
Add stable branch
Matt Mackall <mpm@selenic.com> [Mon, 16 Nov 2009 14:50:30 -0600] rev 9871
Added signature for changeset 31ec469f9b55
Matt Mackall <mpm@selenic.com> [Mon, 16 Nov 2009 14:50:24 -0600] rev 9870
Added tag 1.4 for changeset 31ec469f9b55
Martin Geisler <mg@lazybytes.net> [Mon, 16 Nov 2009 21:25:36 +0100] rev 9869
i18n-ja: fixed bad indentation
Matt Mackall <mpm@selenic.com> [Mon, 16 Nov 2009 13:52:53 -0600] rev 9868
Merge with crew
Brendan Cully <brendan@kublai.com> [Mon, 16 Nov 2009 11:31:08 -0800] rev 9867
Allow import --no-commit over an applied MQ patch.
Since it only changes the working directory, it does not matter whether a patch is
applied. This change makes it easier to use hg import --no-commit instead of patch.
Matt Mackall <mpm@selenic.com> [Mon, 16 Nov 2009 12:51:00 -0600] rev 9866
Merge with i18n
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 16 Nov 2009 14:37:31 -0200] rev 9865
i18n-pt_BR: synchronized with crew 9c43089b372a
Fabian Kreutz <fabian.kreutz@starnet.fi> [Mon, 16 Nov 2009 09:58:45 +0200] rev 9864
i18n-de: messages for 9e7b2c49d25d and translation of patchbomb
Wagner Bruna <wbruna@yahoo.com> [Sun, 15 Nov 2009 21:57:02 -0200] rev 9863
i18n-pt_BR: messages for 9e7b2c49d25d and cleanup
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Fri, 13 Nov 2009 14:30:57 +0900] rev 9862
i18n-ja: synchronized with 004bf1d6e6af
Henrik Stuart <henrik.stuart@edlund.dk> [Mon, 16 Nov 2009 13:35:36 +0100] rev 9861
support encoding fallback in branchmap to maintain compatibility with 1.3.x
Patrick Mezard <pmezard@gmail.com> [Mon, 16 Nov 2009 14:09:31 +0100] rev 9860
convert/svn: fix warning when repo detection failed
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 16 Nov 2009 11:58:03 +0100] rev 9859
inotify: workaround test-inotify-dirty-dirstate failures
- disable inotify during clone
- record inotify daemon PID, in order to have them properly killed
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 16 Nov 2009 11:55:29 +0100] rev 9858
lock: the correct way to do a trylock() is to use a timeout of 0
Martin Geisler <mg@lazybytes.net> [Sat, 14 Nov 2009 14:21:53 +0100] rev 9857
diff: change --inverse to --reverse
This fixes an incompatibility with patch(1), which also uses --reverse
for reversed diffs. The --inverse flag was added in 3f522d2fa633. That
name was chosen over --reverse since it was thought that --reverse
would make --rev ambiguous.
It turns out that both flags can co-exist, with the cost that --rev
can no longer be shortened to --r and --re. Since one can always use
the short -r option, this is not a real problem.
Christian Boos <cboos@bct-technology.com> [Mon, 09 Nov 2009 17:41:21 +0100] rev 9856
setup: pass LD_LIBRARY_PATH to subprocess when determining version.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Wed, 11 Nov 2009 14:38:59 +0900] rev 9855
inotify: Do not access inotify when dirstate is dirty (issue1811)
Original patch was provided by Simon Heimberg
It delegates dirstate computation to dirstate.status when dirstate is dirty:
better be slow from time to time instead of using wrong data.
This solves issue1719. As the last component, issue1810, is still not solved,
test-inotify-dirty-dirstate will fail for now. It emphasizes a regression due
to 7c01599dd340:
changeset: 9515:7c01599dd340
user: Nicolas Dumazet <nicdumz.commits@gmail.com>
date: Sun Aug 16 11:11:37 2009 +0900
summary: inotify: use cmdutil.service instead of local daemonizing code
Ancestors of 7c01599dd30 are passing the test, when applied this patch.
Regression has to be investigated, but this patch is important since it affects
often mq operations.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Fri, 13 Nov 2009 08:31:10 +0900] rev 9854
inotify: mark directories visited during lookup (issue1844)
Emulate the match.dir calls that are made in dirstate.walk:
* first mark the visited directories on the server side
* then extend the transmitted response to include this directory list
* and lastly call match.dir on each directory
Henrik Stuart <hg@hstuart.dk> [Fri, 13 Nov 2009 06:36:26 +0100] rev 9853
Merge with crew-stable
Henrik Stuart <hg@hstuart.dk> [Fri, 13 Nov 2009 06:29:49 +0100] rev 9852
url: generalise HTTPS proxy handling to accomodate Python changes
Python 2.6.3 introduced HTTPS proxy tunnelling in a way that interferes with
the way HTTPS proxying is handled in Mercurial. This fix generalises it to work
on Python 2.4 to 2.6.
Bryan O'Sullivan <bos@serpentine.com> [Thu, 12 Nov 2009 14:05:52 -0800] rev 9851
Make it possible to debug failed hook imports via use of --traceback
Prior to this change, if a Python hook module failed to load (e.g. due
to an import error or path problem), it was impossible to figure out
why the error occurred, because the ImportErrors that got raised were
caught but never displayed.
If run with --traceback or ui.traceback=True, hg now prints tracebacks
of both of the ImportError instances that get raised before it bails.
Matt Mackall <mpm@selenic.com> [Thu, 12 Nov 2009 14:34:07 -0600] rev 9850
Merge with i18n
Wagner Bruna <wbruna@softwareexpress.com.br> [Thu, 12 Nov 2009 16:51:32 -0200] rev 9849
i18n-pt_BR: synchronized with crew d3dbdca92458
messages for a40ec11795c3 still included
Martin Geisler <mg@lazybytes.net> [Wed, 11 Nov 2009 22:55:44 +0100] rev 9848
i18n-da: translate parentrevspec and record
Martin Geisler <mg@lazybytes.net> [Wed, 11 Nov 2009 00:44:40 +0100] rev 9847
i18n-da: translations in color, graphlog, mq
Martin Geisler <mg@lazybytes.net> [Tue, 10 Nov 2009 20:51:11 +0100] rev 9846
i18n-da: synchronized with a40ec11795c3
Jens Bäckman <jens.backman@gmail.com> [Tue, 10 Nov 2009 20:07:32 +0100] rev 9845
i18n-sv: synchronized with a40ec11795c3
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 09 Nov 2009 19:46:08 -0200] rev 9844
i18n-pt_BR: synchronized with a40ec11795c3
Matt Mackall <mpm@selenic.com> [Thu, 12 Nov 2009 12:03:39 -0600] rev 9843
merge: fix changectx.ancestor(workingctx) (issue1327)
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 12 Nov 2009 16:39:11 +0100] rev 9842
hgweb: don't choke when an inexistent style is requested (issue1901)
Brodie Rao <me+hg@dackz.net> [Thu, 12 Nov 2009 10:29:40 -0500] rev 9841
pager: provide a default attend list
The default list includes commands which normally print large amounts of
text. This should be more user-friendly than paging all commands by default,
which can be confusing when the pager swallows input prompts (with, e.g.,
record, merge, HTTP/SSH authentication, etc.)
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 12 Nov 2009 12:46:00 +0100] rev 9840
Add missing bash_completion for qfinish
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 12 Nov 2009 13:43:36 +0100] rev 9839
help: don't show extension list on extension help
Patrick Mezard <pmezard@gmail.com> [Thu, 12 Nov 2009 12:05:43 +0100] rev 9838
convert/svn: fix HTTP detection bug introduced by 1b2516a547d4
The probe expected response is a 404 with content, and while urllib returns the
response body in this case, urllib2 raises an HTTP error.
Martin Geisler <mg@lazybytes.net> [Wed, 11 Nov 2009 22:53:01 +0100] rev 9837
record: handle translated prompt correctly
The prompt function would return 'y' or 'n' untranslated. This should
therefore not be compared to _('y') and _('n'). However, it turns out
that prompt could just as well return a good old Boolean.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Wed, 11 Nov 2009 21:52:02 +0100] rev 9836
doc/style: add orange border color to notes
Martin Geisler <mg@lazybytes.net> [Wed, 11 Nov 2009 21:45:13 +0100] rev 9835
hgrc.5: mark some words as inline literals
Martin Geisler <mg@lazybytes.net> [Wed, 11 Nov 2009 21:29:35 +0100] rev 9834
hgignore.5: fix typo
Martin Geisler <mg@lazybytes.net> [Wed, 11 Nov 2009 21:16:20 +0100] rev 9833
doc/style: fix typo in comment (by timeless)
Yuya Nishihara <yuya@tcha.org> [Tue, 10 Nov 2009 21:48:10 +0900] rev 9832
doc/style: use default font color specified by user
* it's bad to specify only foreground color:
http://www.w3.org/QA/Tips/color
* some people prefer dark background
* `color: #111' is mostly the same as `color: black',
which is the default of almost all popular browsers.
so it's preferable to delete `color: #111', rather than adding
`background-color: white'.
Stuart W Marks <smarks@smarks.org> [Tue, 10 Nov 2009 22:27:31 -0800] rev 9831
help: improve wording of update help text
Martin Geisler <mg@lazybytes.net> [Wed, 11 Nov 2009 20:08:26 +0100] rev 9830
hgrc.5: oft-requested "hg update" hook example
Patrick Mezard <pmezard@gmail.com> [Wed, 11 Nov 2009 19:45:00 +0100] rev 9829
convert/svn: delegate to svn bindings if HTTP probe fails
convert extension tries to guess the remote repository type with HTTP probes.
Unfortunately, it does not handle authentication or HTTPS handshakes, so regular
svn repositories may be excluded. Instead, when a non-404 error is retrieved,
we keep trying with the svn bindings. The drawback is missing svn bindings will
make the conversion to fail even for non-svn targets. This can be avoided with
--source.
Patrick Mezard <pmezard@gmail.com> [Wed, 11 Nov 2009 18:32:56 +0100] rev 9828
test-rebase-newancestor: make executable
Patrick Mezard <pmezard@gmail.com> [Wed, 11 Nov 2009 18:31:42 +0100] rev 9827
mdiff: fix diff -b/B/w on mixed whitespace hunks (issue127)
Previous code was computing hunks then checking if these hunks could be ignored
when taking whitespace/blank-lines options in accounts. This approach is simple
but fails with hunks containing both whitespace and non-whitespace changes, the
whole hunk is emitted while it can be mostly made of whitespace. The new
version normalize the whitespaces before hunk generation, and test for
blank-lines afterwards.
Patrick Mezard <pmezard@gmail.com> [Wed, 11 Nov 2009 17:02:00 +0100] rev 9826
contrib/perf: profile diff of working directory changes
Bill Schroeder <bschroeder@allstontrading.com> [Wed, 04 Nov 2009 13:44:15 -0600] rev 9825
dispatch: better error message for --config option
Martin Geisler <mg@lazybytes.net> [Wed, 11 Nov 2009 00:05:12 +0100] rev 9824
mq: fix literal blocks in docstrings
Patrick Mezard <pmezard@gmail.com> [Tue, 10 Nov 2009 23:45:24 +0100] rev 9823
convert/mtn: handle change in mtn 0.45 certs output
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 10 Nov 2009 22:42:13 +0100] rev 9822
merge with crew
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Sat, 07 Nov 2009 12:28:31 +0100] rev 9821
bundle: add test for Issue1704
Original version by Greg Ward.
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Sat, 07 Nov 2009 12:28:30 +0100] rev 9820
bundle: don't send too many changesets (Issue1704)
The fast path in changegroupsubset can send too many csets. This happens
because it uses the parents of all bases as common nodes and then goes
forward from this again. If a base has a parent that has another child,
which is -not- a base, then this other child will nevertheless end up in
the changegroup.
The fix is to not use findmissing(), but use nodesbetween() instead, as
do the slow path and incoming/outgoing.
The change to test-notify.out is correct, because it actually hits this
bug, as can be seen by glog'ing the two repos:
@ 22c88
|\
| o 0a184
| |
o | 0647d
|/
o cb9a9
and
o 0647d
|
@ cb9a9
It used to pull 0647d again, which is unnecessary.
Patrick Mezard <pmezard@gmail.com> [Tue, 10 Nov 2009 22:32:17 +0100] rev 9819
convert: reenable SVN support after license issue solved
Patrick Mezard <pmezard@gmail.com> [Sun, 08 Nov 2009 18:08:24 +0100] rev 9818
patchbomb: normalize date format in generated mboxes
mbox format should use time.asctime(). Unfortunately, this function writes
2-characters day of week on Windows while unix one writes a single character.
Normalize to Windows version since the other one can hardly be written with
strftime().
Patrick Mezard <pmezard@gmail.com> [Tue, 10 Nov 2009 11:57:03 +0100] rev 9817
hghave: be more tolerant to rst2html output
On Windows, rst2html.bat calls rst2html.py, printing something like:
"rst2html.py (Docutils"
(notice the extra ".py")
Patrick Mezard <pmezard@gmail.com> [Tue, 10 Nov 2009 21:55:59 +0100] rev 9816
test-convert-hg-svn: fix test output
Christian Boos <cboos@bct-technology.com> [Mon, 09 Nov 2009 20:15:49 +0100] rev 9815
rebase: make sure the newancestor is used during the whole update
(issue1561)
Before this change, newancestor was used only once as a replacement
for ancestor.ancestor, but merge.update calls ancestor.ancestor
several times, so it ends up with the "wrong" ancestor (the real
ancestor, but we want the parent of the rebased changeset for all but
the first rebased changeset).
Added a new test case for this: test-rebase-newancestor.
Also, in one scenario in test-rebase-collapse, there was a spurious
conflict caused by the same issue, so that test case was fixed by
removing the now unneeded conflict resolution and the output was
adapted accordingly.
Gilles Moris <gilles.moris@free.fr> [Fri, 06 Nov 2009 10:06:08 +0100] rev 9814
buildrpm: enhance changelog of the RPM file
Now the changelog is different depending if the parent is tagged:
- for tags, keep the previous content, i.e. changelog of the tags.
- for nightly build, changelog of the changesets since the latest tag
As RPM is expecting strictly descending dates, I have used a python
script to reorder the mercurial changelog.
Gilles Moris <gilles.moris@free.fr> [Fri, 06 Nov 2009 09:59:55 +0100] rev 9813
buildrpm: build full RPM package including sources
Gilles Moris <gilles.moris@free.fr> [Fri, 06 Nov 2009 09:53:23 +0100] rev 9812
buildrpm: cleanup script
Gilles Moris <gilles.moris@free.fr> [Fri, 06 Nov 2009 09:35:38 +0100] rev 9811
buildrpm: enable to start the script from anywhere
Previously the script worked only from the hg root.
Gilles Moris <gilles.moris@free.fr> [Fri, 06 Nov 2009 09:30:18 +0100] rev 9810
buildrpm: warn if there is outstanding uncommitted changes
Gilles Moris <gilles.moris@free.fr> [Fri, 06 Nov 2009 09:26:29 +0100] rev 9809
buildrpm: build from working dir parent and use hg version for RPM versioning
Previous, RPMs was always built from tip, and the release number did not match
the 'hg version' put in place for 1.4.
This will enable also to this script to be able to build official tag and not
only nightly build.
Martin Geisler <mg@lazybytes.net> [Mon, 09 Nov 2009 23:47:24 +0100] rev 9808
doc: fix language in CSS comments (by timeless)
Christian Boos <cboos@bct-technology.com> [Mon, 09 Nov 2009 17:33:16 +0100] rev 9807
setup: fix f51d1822d6fd refactoring, propagate env to runcmd
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 09 Nov 2009 17:28:40 -0200] rev 9806
clone: simplify help text
Martin Geisler <mg@lazybytes.net> [Mon, 09 Nov 2009 20:43:06 +0100] rev 9805
Merge with main
Dongsheng Song <dongsheng.song@gmail.com> [Mon, 09 Nov 2009 20:39:58 +0100] rev 9804
i18n-zh: updated Chinese translation
Martin Geisler <mg@lazybytes.net> [Sun, 08 Nov 2009 00:41:54 +0100] rev 9803
i18n-da: synchronized with 6cb1808e5ae7
Mads Kiilerich <mads@kiilerich.com> [Sun, 08 Nov 2009 18:50:39 +0100] rev 9802
test-extension: Solaris grep don't know [[:digit:]]
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 08 Nov 2009 18:18:46 +0100] rev 9801
merge with hg-stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 08 Nov 2009 18:05:56 +0100] rev 9800
fix test-patchbomb on solaris
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 08 Nov 2009 17:59:36 +0100] rev 9799
fix test-diffstat on solaris
Martin Geisler <mg@lazybytes.net> [Sun, 08 Nov 2009 17:27:01 +0100] rev 9798
doc: uppercase first letter in HTML man pages
Matt Mackall <mpm@selenic.com> [Sun, 08 Nov 2009 10:40:51 -0600] rev 9797
Merge with crew
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 08 Nov 2009 17:09:28 +0100] rev 9796
merge with crew
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 08 Nov 2009 17:03:24 +0100] rev 9795
merge with stable
Yuya Nishihara <yuya@tcha.org> [Mon, 09 Nov 2009 00:00:47 +0900] rev 9794
doc: styles for man page, which suit with the mercurial website
designed loosely based on:
http://mercurial.selenic.com/css/styles.css
with some modifications by intention:
* visited links are colored differently
* no fixed size
* works without typeface.js
we keep most styles, which is from docutils, untouched.
tested with:
* MSIE 6.0 on Windows
* Firefox 3.5 on Linux
Martin Geisler <mg@lazybytes.net> [Sun, 08 Nov 2009 16:16:21 +0100] rev 9793
rst2man: more robust uppercasing of section titles
This handles section titles with child elements such as emphasis or
inline literals.
Martin Geisler <mg@lazybytes.net> [Sun, 08 Nov 2009 11:46:38 +0100] rev 9792
doc: use titlecase in man page section titles
Martin Geisler <mg@lazybytes.net> [Sun, 08 Nov 2009 11:41:34 +0100] rev 9791
rst2man: automatically write sections in uppercase
Man pages have uppercased section titles but other formats do not.
Letting rst2man handle the tranformation allows better reuse of text
between man pages and other formats.
Martin Geisler <mg@lazybytes.net> [Sun, 08 Nov 2009 00:11:34 +0100] rev 9790
relink: do not translate format string with no text
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 07 Nov 2009 23:38:01 +0100] rev 9789
Use utf-8 encoding in test-branchmap's clone call
After 75520c24feda it is printed in local encoding, i.e. "C" if not set
otherwise.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 07 Nov 2009 23:35:46 +0100] rev 9788
Branch name printed since a3d73b3e1f8a now in local encoding.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 07 Nov 2009 23:27:25 +0100] rev 9787
Make test-branchmap executable and adjust output after a3d73b3e1f8a
Martin Geisler <mg@lazybytes.net> [Sat, 07 Nov 2009 22:13:09 +0100] rev 9786
ui: refer to "hg help config" when no username is set
Martin Geisler <mg@lazybytes.net> [Sat, 07 Nov 2009 22:12:50 +0100] rev 9785
help: add "hg help config" topic
This is a condensed version of the first two sections of hgrc.5.txt.
After a slight upgrade of minirst, we can move the whole of hgrc.5.txt
into the config help topic and just let the man page include it.
Martin Geisler <mg@lazybytes.net> [Sat, 07 Nov 2009 18:47:04 +0100] rev 9784
hgrc.5: do not mention "name: value" syntax
This was supported in versions prior to 1.3 where we used the standard
Python ConfigParser. The new config parser never supported it.
Matt Mackall <mpm@selenic.com> [Sun, 08 Nov 2009 10:29:52 -0600] rev 9783
submerge: properly deal with overwrites
also pull .hgsubstate check out of inner loop
Matt Mackall <mpm@selenic.com> [Sun, 08 Nov 2009 10:24:18 -0600] rev 9782
subrepo: add more debugging output, lose _ markers
Matt Mackall <mpm@selenic.com> [Sat, 07 Nov 2009 16:31:43 -0600] rev 9781
subrepo: do a linear update when appropriate
Matt Mackall <mpm@selenic.com> [Sat, 07 Nov 2009 16:30:42 -0600] rev 9780
subrepo: notice dirty subrepo states when merging
Matt Mackall <mpm@selenic.com> [Sat, 07 Nov 2009 16:29:49 -0600] rev 9779
subrepo: add some debug output to submerge
Matt Mackall <mpm@selenic.com> [Sat, 07 Nov 2009 14:13:15 -0600] rev 9778
Merge with i18n
Martin Geisler <mg@lazybytes.net> [Wed, 04 Nov 2009 22:14:26 +0100] rev 9777
i18n-sv: add missing newlines to translations
Jens Bäckman <jens.backman@gmail.com> [Wed, 04 Nov 2009 21:59:41 +0100] rev 9776
i18n-sv: simple translation fixes
Fixed the fuzzy translations. Also took care of a few really simple strings,
and translated the 'summary' command.
Fabian Kreutz <fabian.kreutz@starnet.fi> [Mon, 02 Nov 2009 17:25:43 +0200] rev 9775
i18n-de: Update msgids, remove .txt linespecs + few small translations
Wagner Bruna <wbruna@softwareexpress.com.br> [Wed, 28 Oct 2009 18:53:12 -0200] rev 9774
i18n-pt_BR: synchronized with d942e06d7b14
Martin Geisler <mg@lazybytes.net> [Wed, 28 Oct 2009 20:48:24 +0100] rev 9773
Merge with main
Martin Geisler <mg@lazybytes.net> [Mon, 26 Oct 2009 20:58:49 +0100] rev 9772
i18n-da: synchronized with e06c940d554d plus some new translations
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 26 Oct 2009 12:32:14 -0200] rev 9771
i18n-pt_BR: synchronized with e06c940d554d
Martin Geisler <mg@lazybytes.net> [Sun, 25 Oct 2009 12:50:30 +0100] rev 9770
i18n-zh_TW: synchronized with e06c940d554d
Martin Geisler <mg@lazybytes.net> [Sun, 25 Oct 2009 12:50:12 +0100] rev 9769
i18n-zh_CN: synchronized with e06c940d554d
Martin Geisler <mg@lazybytes.net> [Sun, 25 Oct 2009 12:49:25 +0100] rev 9768
i18n-sv: synchronized with e06c940d554d
Martin Geisler <mg@lazybytes.net> [Sun, 25 Oct 2009 12:47:48 +0100] rev 9767
i18n-ja: synchronized with e06c940d554d
Martin Geisler <mg@lazybytes.net> [Sun, 25 Oct 2009 12:46:23 +0100] rev 9766
i18n-it: synchronized with e06c940d554d
Martin Geisler <mg@lazybytes.net> [Sun, 25 Oct 2009 12:44:57 +0100] rev 9765
i18n-fr: synchronized with e06c940d554d
Martin Geisler <mg@lazybytes.net> [Sun, 25 Oct 2009 12:44:22 +0100] rev 9764
i18n-el: synchronized with e06c940d554d
Martin Geisler <mg@lazybytes.net> [Sat, 24 Oct 2009 00:47:49 +0200] rev 9763
Merge with main
Martin Geisler <mg@lazybytes.net> [Sat, 24 Oct 2009 00:44:57 +0200] rev 9762
i18n-da: synchronized
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 20 Oct 2009 15:26:22 -0200] rev 9761
i18n-pt_BR: translate 'changeset' like 'revision'
On Mercurial, 'changeset' and 'revision' may be used
interchangeably, but the first is more or less
untranslatable to a single word.
Martin Geisler <mg@lazybytes.net> [Tue, 20 Oct 2009 18:24:56 +0200] rev 9760
i18n: merge de and pt_BR translations
Martin Geisler <mg@lazybytes.net> [Tue, 20 Oct 2009 18:11:21 +0200] rev 9759
i18n-de: fixed inline emphasis
The test-gendoc test said:
gendoc-de.txt:1385: (WARNING/2) Inline emphasis start-string without
end-string
Martin Geisler <mg@lazybytes.net> [Tue, 20 Oct 2009 18:23:33 +0200] rev 9758
i18n-pt_BR: fixed bullet list
The test-gendoc test said:
gendoc-pt_BR.txt:1475: (WARNING/2) Bullet list ends without a blank
line; unexpected unindent.
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 20 Oct 2009 13:09:47 -0200] rev 9757
i18n-pt_BR: synchronized with fc493cb90bb1
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 20 Oct 2009 13:07:26 -0200] rev 9756
i18n-pt_BR: synchronized with 5287de171d74
Fabian Kreutz <fabian.kreutz@starnet.fi> [Tue, 20 Oct 2009 17:31:09 +0300] rev 9755
i18n-de: Removed all fuzzies and translated small alphaend-extensions
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 28 Sep 2009 20:32:54 -0300] rev 9754
i18n-pt_BR: synchronized with 02c43e8e0835
Matt Mackall <mpm@selenic.com> [Sat, 07 Nov 2009 14:12:08 -0600] rev 9753
Fix up import test
Matt Mackall <mpm@selenic.com> [Sat, 07 Nov 2009 14:09:16 -0600] rev 9752
subrepo: more robust split for .hgsubstate parsing
Matt Mackall <mpm@selenic.com> [Sat, 07 Nov 2009 14:07:45 -0600] rev 9751
filectx: shortcut unrelated files in ancestor() (issue1327)
Matt Mackall <mpm@selenic.com> [Sat, 07 Nov 2009 14:07:45 -0600] rev 9750
merge: first part of fix for issue1327
When there are no renames involved, we shortcut to the changeset
ancestor. This resolves most cases.
Note that Mercurial's rename philosophy elsewhere is that a file's
name is signficant and rename data is only consulted when a file of
the same name is absent.
Jesse Glick <jesse.glick@sun.com> [Thu, 05 Nov 2009 16:40:48 -0500] rev 9749
Related to Issue919: ui.progress, apparently unused before now, is busted.
Jesse Glick <jesse.glick@sun.com> [Sat, 17 Oct 2009 14:00:41 -0400] rev 9748
Sometimes pushing to an HTTP repo fails with a useless message.
abort: 'https://.../.../' does not appear to be an hg repository!
Ought to produce a better diagnostics on the client. With patched 1.3.1,
observed to produce an Apache HTML error message (from cgitb) including the
vital text:
File ".../hgwebdir.cgi", line 70, in ?
wsgicgi.launch(application)
File "mercurial/hgweb/wsgicgi.py", line 68, in launch
File "mercurial/hgweb/hgwebdir_mod.py", line 91, in __call__
File "mercurial/hgweb/hgwebdir_mod.py", line 148, in run_wsgi
File "mercurial/hgweb/hgweb_mod.py", line 100, in run_wsgi
File "mercurial/hgweb/protocol.py", line 156, in unbundle
File "mercurial/localrepo.py", line 2031, in addchangegroup
File "mercurial/revlog.py", line 1204, in addgroup
LookupError: 00manifest.i@......: unknown parent
Might also be helpful if server's hgweb_mod.run_wsgi caught unexpected errors
and returned a well-formed error response including the stack trace. The client
patch would still be useful in this case, because it would let you diagnose
issues with HTTP proxy servers and so on.
timeless@mozdev.org [Mon, 26 Oct 2009 02:06:23 +0200] rev 9747
hg help resolve grossly mischaracterizes the --all switch
Martin Geisler <mg@lazybytes.net> [Sat, 07 Nov 2009 15:51:32 +0100] rev 9746
hgrc.5: mark more inline literals
Martin Geisler <mg@lazybytes.net> [Sat, 07 Nov 2009 14:41:03 +0100] rev 9745
hgrc.5: do not turn random URLs into links
URLs and email addresses are automatically turned into links. We don't
want that when talking about example links and addresses.
Martin Geisler <mg@lazybytes.net> [Sat, 07 Nov 2009 14:30:58 +0100] rev 9744
hgrc.5: use enumerated list for email charsets
Christian Ebert <blacktrash@gmx.net> [Sat, 07 Nov 2009 13:54:47 +0100] rev 9743
hgrc.5: order of email charsets is not a top level literal block
- it belongs under email charsets, not email in general
- enumerate order
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 07 Nov 2009 13:25:25 +0100] rev 9742
sshrepo: move mkstemp() out of the try block, we don't use the exception
simpler fix for 3b6f18851d87
Martin Geisler <mg@lazybytes.net> [Sat, 07 Nov 2009 03:22:03 +0100] rev 9741
minirst: update module docstring
Martin Geisler <mg@lazybytes.net> [Sat, 07 Nov 2009 03:16:23 +0100] rev 9740
commands: use enumerated lists in help texts
Martin Geisler <mg@lazybytes.net> [Sat, 07 Nov 2009 03:14:56 +0100] rev 9739
minirst: support enumerated lists
Martin Geisler <mg@lazybytes.net> [Sat, 07 Nov 2009 03:04:46 +0100] rev 9738
minirst: prepare for general types of bullet lists
The old code worked for '-' bullets only, but we can easily support
variable width bullets.
Martin Geisler <mg@lazybytes.net> [Fri, 06 Nov 2009 00:30:35 +0100] rev 9737
minirst: combine list parsing in one function
Bullet, option, field, and definition lists were parsed very similar
code. They are now parsed by a single function (splitparagraphs).
Some logic from the old parsing functions has been moved down to
formatblock. This simplifies the parsing while putting the logic where
it's really needed.
Martin Geisler <mg@lazybytes.net> [Thu, 05 Nov 2009 21:53:22 +0100] rev 9736
test-minirst: don't test on invalid reST input
Input such as
Only the
left-most line
(this line!)
is significant
for the indentation
is not valid reStructuredText: the first line starts a block quote,
but then the second line is not allowed to be unindented.
Martin Geisler <mg@lazybytes.net> [Thu, 05 Nov 2009 21:30:50 +0100] rev 9735
minirst: remove unnecessary "elif:" statements
Martin Geisler <mg@lazybytes.net> [Sat, 07 Nov 2009 01:46:27 +0100] rev 9734
commands: call ui.username carefully in debuginstall
After c63c336ee2f7, 'hg debuginstall' would abort halfway through if
no username was set. We now catch and display the exception instead.
Martin Geisler <mg@lazybytes.net> [Sat, 07 Nov 2009 00:13:05 +0100] rev 9733
mq: do not call ui.username unless it is necessary
After changeset c63c336ee2f7, ui.username will abort by default if no
username is set. It is therefore wrong to call ui.username when a
username was provided on the command line.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 06 Nov 2009 22:54:51 +0100] rev 9732
util: sort paths in walkrepos() (fixes test failures in test-hgwebdir)
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 06 Nov 2009 22:46:46 +0100] rev 9731
hgweb: treat rev as raw-rev if user agent is hg
Marti Raudsepp <marti@juffo.org> [Fri, 06 Nov 2009 13:48:17 +0200] rev 9730
patchbomb: fix 'echo -en' bashism in test-patchbomb
The echo command doesn't accept options in some shells.
printf is required by the SUSv2 (Single UNIX Specification v2).
Jesse Glick <jesse.glick@sun.com> [Thu, 05 Nov 2009 17:38:03 -0500] rev 9729
Issue919: add a standard extension to recreate hardlinks between repositories.
Having to run a standalone Python script from the contrib dir is a nuisance.
Also makes various improvements to locking, file discovery, etc.
Should also update: http://www.selenic.com/mercurial/wiki/index.cgi/RecreateHardlinksBetweenRepositories
Joel Rosdahl <joel@rosdahl.net> [Fri, 06 Nov 2009 08:28:45 +0100] rev 9728
tests: glog with style and file parameter (issue1896)
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 06 Nov 2009 08:27:17 +0100] rev 9727
graphlog: don't pass filectxs to the templater (issue1896)
Augie Fackler <durin42@gmail.com> [Mon, 02 Nov 2009 11:03:22 -0500] rev 9726
keepalive: handle broken pipes gracefully during large POSTs
Yannick Gingras <ygingras@ygingras.net> [Thu, 05 Nov 2009 15:18:56 +0100] rev 9725
diff: add --inverse option
Most of the time, one can reverse a diff by swapping the revisions passed with
-r but it happens that if you use the global -R, and diff against the tip of
the current repo, you can't swap the revisions. One use-case for that is
reviewing changes from a bundle before unbundling. One could also pipe the
output of `hg diff` to a command line filter that reverses the diff, but that
would remove the benefit from color diffs. Therefore, having an option in
`hg diff` to reverse a diff is a good thing.
The option flag selection was tricky. GNU patch uses -R/--reverse but -R is
already used as a global option and --reverse would make --rev ambiguous.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 05 Nov 2009 15:06:35 +0100] rev 9724
hgweb: keep original order from hgwebdir config files (issue1535)
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 05 Nov 2009 15:01:00 +0100] rev 9723
hgweb: use a tuple-list instead of dictionary for append-only store
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 05 Nov 2009 15:19:54 +0100] rev 9722
templater: readable dates older than 24 months revert to ISO8601 (issue1006)
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 05 Nov 2009 14:44:29 +0100] rev 9721
templater: put 'ago' inside the age template filter
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 05 Nov 2009 14:26:37 +0100] rev 9720
coal/paper: show link to latest file revision (issue1344)
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 05 Nov 2009 11:51:35 +0100] rev 9719
tests: fix hghave test for rst2html to not spew error output
Stuart W Marks <smarks@smarks.org> [Thu, 05 Nov 2009 10:59:33 +0100] rev 9718
help: describe new cross-branch behavior in update help text, plus cleanups
Stuart W Marks <smarks@smarks.org> [Thu, 05 Nov 2009 10:53:59 +0100] rev 9717
update: allow branch crossing without -c or -C, with no uncommitted changes
Update will now allow crossing branches within the same named branch,
when given a specific revision, if the working dir is clean, without
requiring the -c or -C option. Abort if no revision is given and
this would cross branches. Minor change to abort message if
uncommitted changes are found.
Modify test-update-branches and output to reflect the altered case. Modify
test-merge5.out to reflect the altered case. Modify
test-up-local-change.out with new message.
Stuart W Marks <smarks@smarks.org> [Thu, 05 Nov 2009 10:53:36 +0100] rev 9716
update: add comments and test cases for updating across branches
Add comment to merge.py:update() showing various cases of 'hg update': to a
descendant, crossing named branches, and crossing branches within a named
branch; with no option, -c or -C; with or without uncommitted changes; and
with or without a specific revision. Add tests for all of these cases.
Marti Raudsepp <marti@juffo.org> [Thu, 05 Nov 2009 10:49:28 +0100] rev 9715
patchbomb: fix handling of email addresses with Unicode domains (IDNA)
dom.encode('idna') requires dom to be a Unicode string.
Adrian Buehlmann <adrian@cadifra.com> [Thu, 05 Nov 2009 11:05:13 +0100] rev 9714
clone: add option -u/--updaterev
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 05 Nov 2009 11:07:01 +0100] rev 9713
hgweb/sshserver: extract capabilities for easier modification
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 05 Nov 2009 10:44:36 +0100] rev 9712
kill trailing whitespace
Martin Geisler <mg@lazybytes.net> [Thu, 05 Nov 2009 01:11:28 +0100] rev 9711
color: wrap qrecord
The qrecord command is registered in uisetup phase, so we do our
wrapping in extsetup phase.
Martin Geisler <mg@lazybytes.net> [Thu, 05 Nov 2009 01:10:43 +0100] rev 9710
record: use uisetup instead of extsetup to register qrecord
New commands should be registered in uisetup so that other extensions
have a change of wrapping them in extsetup.
Sune Foldager <cryo@cyanite.org> [Wed, 04 Nov 2009 15:18:19 +0100] rev 9709
merge: supply base node to merge tools in the environment
Merge tools will be able to exploit this to correctly merge backouts.
This won't work fully, though, until issue 1327 is solved, since the
node information is not necessarily correct.
Martin Geisler <mg@lazybytes.net> [Wed, 04 Nov 2009 09:34:04 +0100] rev 9708
test-bisect: normalize shell error message
Different shells on vary in their error messages. Here we're satisfied
if the shell mentions './foobar' at all.
Greg Ward <greg-hg@gerg.ca> [Mon, 02 Nov 2009 17:06:11 -0500] rev 9707
run-tests: add "debug" mode: don't capture child output, just show it.
In debug mode, we:
- don't try to diff expected vs actual output
- disallow --interactive
- disable timeouts (warn if user tried to supply one)
- don't try to parse hghave output, since we don't have the output
- don't try to save output to .err file
Greg Ward <greg-hg@gerg.ca> [Mon, 02 Nov 2009 17:06:10 -0500] rev 9706
run-tests: make --tmpdir option more useful.
- instead of creating HGTMP inside tmpdir, now HGTMP is tmpdir
(thus, fail if tmpdir already exists)
- passing --tmpdir automatically turns on --keep-tmpdir
Martin Geisler <mg@lazybytes.net> [Mon, 02 Nov 2009 21:55:59 +0100] rev 9705
hg.1: kill spurious backslash
I believe the backslash prevented asciidoc from automatically turning
"(C)" into a real copyright symbol. This replacement is not done in
reST in the first place.
Martin Geisler <mg@lazybytes.net> [Mon, 02 Nov 2009 21:47:03 +0100] rev 9704
help: markup email addresses as inline literals
Otherwise we get useless links to user@example.org in the HTML version
of the man pages.
Martin Geisler <mg@lazybytes.net> [Mon, 02 Nov 2009 21:38:42 +0100] rev 9703
doc/Makefile: add help/*.txt as a dependency
Martin Geisler <mg@lazybytes.net> [Mon, 02 Nov 2009 21:32:42 +0100] rev 9702
doc: add some internal links to man pages
Martin Geisler <mg@lazybytes.net> [Mon, 02 Nov 2009 21:08:33 +0100] rev 9701
hgrc.5: combined short paragraphs into one
Short and precise sentences are good, but we can have more than one
such sentence per paragraph.
Martin Geisler <mg@lazybytes.net> [Mon, 02 Nov 2009 21:02:56 +0100] rev 9700
doc: use reST note directive
The 'NOTE: bla bla' syntax was for asciidoc and is still present in a
couple of docstrings. The docstrings will be converted to reST format
when minirst knows how to handle it.
Martin Geisler <mg@lazybytes.net> [Mon, 02 Nov 2009 20:53:34 +0100] rev 9699
hgrc.5: capitalize True and False consistently
Martin Geisler <mg@lazybytes.net> [Mon, 02 Nov 2009 20:50:57 +0100] rev 9698
commands: slightly better help for --traceback
Martin Geisler <mg@lazybytes.net> [Mon, 02 Nov 2009 20:50:30 +0100] rev 9697
hgrc.5: document ui.traceback setting
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 02 Nov 2009 19:07:26 +0100] rev 9696
fix tests output changed by 8269fe2d48f6
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 02 Nov 2009 17:54:19 +0100] rev 9695
byterange: backport fix from upstream
Sune Foldager <cryo@cyanite.org> [Mon, 02 Nov 2009 10:20:04 +0100] rev 9694
hgweb: send proper error messages to the client
Fixes a bug in protocol which caused an exception during exception handling in
some cases on Windows. Also makes sure the server error message is correctly
propagated to the client, instead of being thrown away.
Sune Foldager <cryo@cyanite.org> [Mon, 02 Nov 2009 10:19:14 +0100] rev 9693
transaction: always remove empty journal on abort
When transactions without entries were aborted, the journal (of size 0) was not
unlinked, which prevents subsequent operations until hg recover is run on the
repository.
We also make sure the journal is unlinked when committing, even if the provided
hook doesn't do so.
Sune Foldager <cryo@cyanite.org> [Mon, 02 Nov 2009 10:18:43 +0100] rev 9692
test-bisect: fix shell-dependent output
Sune Foldager <cryo@cyanite.org> [Mon, 02 Nov 2009 10:17:20 +0100] rev 9691
change 'journal already exists' to 'abandoned transaction found'
Journal already exists is a pretty internal piece of information, which
doesn't necessarily mean much to people who are not familiar with the code.
The new text is a more well-known concept.
Sune Foldager <cryo@cyanite.org> [Mon, 02 Nov 2009 10:15:04 +0100] rev 9690
verify: report existence of journal
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 01 Nov 2009 03:26:10 +0100] rev 9689
bisect: no need to save the state if it wasn't changed
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 01 Nov 2009 02:57:11 +0100] rev 9688
record: get the right position (account for skipped files)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 01 Nov 2009 02:54:32 +0100] rev 9687
log --limit: break after a limited number of csets (broken by f3d60543924f)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 31 Oct 2009 18:17:59 +0100] rev 9686
transaction: more specific exceptions, os.unlink can raise OSError
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 31 Oct 2009 18:10:52 +0100] rev 9685
lock: catch specific exceptions
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 31 Oct 2009 18:02:34 +0100] rev 9684
patch: use the public ctx API instead of the internals
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 31 Oct 2009 18:02:13 +0100] rev 9683
patch: don't use mutable object as default argument
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 31 Oct 2009 18:01:08 +0100] rev 9682
patch: initialize all attributes of the hunk class
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 31 Oct 2009 18:00:05 +0100] rev 9681
patch: simplify logic
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 31 Oct 2009 17:07:12 +0100] rev 9680
lock: use '==' instead of 'is' for integer equality ('is' may not work)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 31 Oct 2009 17:04:46 +0100] rev 9679
pychecker: remove unused local variables
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 31 Oct 2009 16:56:58 +0100] rev 9678
remove unused imports
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 31 Oct 2009 16:49:27 +0100] rev 9677
changelog: do not use a mutable default value
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 31 Oct 2009 16:42:51 +0100] rev 9676
bundlerepo: keep the bundlerevlog interface in sync with revlog
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 31 Oct 2009 00:31:08 +0100] rev 9675
localrepo/branchcache: remove lbranchmap(), convert users to use utf-8 names
We don't need a "local-charset" aware branchmap() function, we can convert the
names when needed during the output.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 31 Oct 2009 00:27:50 +0100] rev 9674
localrepo/branchcache: kill unused localrepo.branchcache
The UTF-8 version of the branchcache is the master, always up-to-date, we can
rename it to localrepo._branchcache.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 31 Oct 2009 00:20:28 +0100] rev 9673
localrepo/branchcache: rebuild the "charset-aware" branchcache when needed
It's simpler and the two cache weren't always in sync otherwise:
localrepo.branchcache would not be updated after calling branchmap()
Alexander Solovyov <piranha@piranha.org.ua> [Fri, 30 Oct 2009 15:43:01 +0200] rev 9672
churn: fix --progress (broken by f3d60543924f)
Henrik Stuart <henrik.stuart@edlund.dk> [Mon, 26 Oct 2009 13:37:39 +0100] rev 9671
transfer branchmap branch names over the wire in utf-8
Alexander Solovyov <piranha@piranha.org.ua> [Fri, 30 Oct 2009 13:40:23 +0200] rev 9670
churn: fix changeset count (broken by 9b127e888640)
Alexander Solovyov <piranha@piranha.org.ua> [Thu, 29 Oct 2009 20:50:24 +0200] rev 9669
churn: ability to display added/removed lines separately
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 30 Oct 2009 09:54:39 +0100] rev 9668
cmdutil: fix bug in finddate() implementation
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 30 Oct 2009 09:53:39 +0100] rev 9667
merge changes from mpm
Steve Borho <steve@borho.org> [Wed, 28 Oct 2009 22:47:46 -0500] rev 9666
cmdutil: update finddate()
walkchangerevs() now returns contexts, does not take a cache func.
Matt Mackall <mpm@selenic.com> [Thu, 29 Oct 2009 19:03:16 -0500] rev 9665
walkchangerevs: drop ui arg
Matt Mackall <mpm@selenic.com> [Thu, 29 Oct 2009 19:03:13 -0500] rev 9664
walkchangerevs: reset cache between windows
Matt Mackall <mpm@selenic.com> [Thu, 29 Oct 2009 17:07:54 -0500] rev 9663
log: tidy up some filter tests
Matt Mackall <mpm@selenic.com> [Thu, 29 Oct 2009 17:07:51 -0500] rev 9662
walkchangerevs: move 'add' to callback
Now walkchangerevs is a simple iterator over contexts
Yuya Nishihara <yuya@tcha.org> [Wed, 28 Oct 2009 23:59:18 +0900] rev 9661
hgweb: added test case for extension loading phases (issue1824)
this checks the order of module loading phases of hgweb.
`4) reposetup' lines are duplicated because hgweb calls
hg.repository() twice, one by __init__, another by refresh.
Yuya Nishihara <yuya@tcha.org> [Wed, 28 Oct 2009 23:55:23 +0900] rev 9660
extensions: changed to call extsetup() from extensions.loadall()
previously uisetup() was invoked by extensions.loadall(), but
extsetup() was by _dispatch().
there's no need to split them because we have nothing to do
between uisetup() and extsetup().
this fixes issue1824 indirectly.
Adrian Buehlmann <adrian@cadifra.com> [Wed, 21 Oct 2009 13:40:55 +0200] rev 9659
hgrc.5.txt: mention hgrc categories with higher precedence first
Reordering the FILES section accordingly.
The previous ordering of categories might have been nice from the
viewpoint of a site admin doing an initial install, but presenting a
higher-precedence-first ordering is more relevant and natural for the
average end user, since he will most likely resort to editing rc files
in the order of their precedence, overriding whatever "sane" defaults
are coming from more general files.
Note that this patch does not change the texts, it just moves them.
So, whatever bugs, grammar errors, or typos may have been in the texts
before this patch: they are still there. On purpose. Because this patch
here does not want to reword texts while moving them.
Sune Foldager <cryo@cyanite.org> [Wed, 28 Oct 2009 21:35:57 +0100] rev 9658
hook: only redirect stdout if it and stderr are valid files
When using hgwebdir with WSGI via the IIS ISAPI-WSGI extension, both
stdout and stderr filenos are set to -2, which makes the os.dup call
in hook.py fail.
Matt Mackall <mpm@selenic.com> [Wed, 28 Oct 2009 13:17:03 -0500] rev 9657
verify: filter the candidate list for broken linkrevs
Matt Mackall <mpm@selenic.com> [Tue, 27 Oct 2009 17:14:19 -0500] rev 9656
Merge with crew
Matt Mackall <mpm@selenic.com> [Tue, 27 Oct 2009 17:01:32 -0500] rev 9655
walkchangerevs: internalize ctx caching
Matt Mackall <mpm@selenic.com> [Sun, 25 Oct 2009 18:43:59 -0500] rev 9654
walkchangerevs: yield contexts
Matt Mackall <mpm@selenic.com> [Sun, 25 Oct 2009 18:43:58 -0500] rev 9653
walkchangerevs: kill window step of iterator
Matt Mackall <mpm@selenic.com> [Sun, 25 Oct 2009 18:43:56 -0500] rev 9652
walkchangerevs: pull out matchfn
* * *
imported patch mercurial/commands.py
Yuya Nishihara <yuya@tcha.org> [Tue, 27 Oct 2009 21:59:44 +0900] rev 9651
diffstat: made test case work with POSIX sh and printf
* arithmetic expression ((...)), without $, is bashism.
* printf '\xXX' seems non-standard. '\0' is okay.
http://www.opengroup.org/onlinepubs/009695399/utilities/printf.html
tested with bash 4.0 and dash 0.5.5.1
Sune Foldager <cryo@cyanite.org> [Tue, 27 Oct 2009 10:33:41 +0100] rev 9650
bundlerepo: fix small bug in exception raising
timeless@mozdev.org [Sun, 25 Oct 2009 14:45:38 +0200] rev 9649
minor documentation improvements
Alexander Solovyov <piranha@piranha.org.ua> [Sun, 25 Oct 2009 14:28:02 +0100] rev 9648
patchbomb: accept default if it is empty string
This fixes Cc: prompt.
Martin Geisler <mg@lazybytes.net> [Sun, 25 Oct 2009 14:24:39 +0100] rev 9647
patchbomb: fix double-spaces in prompts
timeless <timeless@gmail.com> [Sun, 25 Oct 2009 13:27:54 +0100] rev 9646
commands: adding --no-status to resolve to match status
timeless@mozdev.org [Wed, 21 Oct 2009 12:41:28 +0300] rev 9645
commands: use rev from remote repo when updating as part of a pull
timeless@mozdev.org [Wed, 21 Oct 2009 12:03:14 +0300] rev 9644
commands: highlighting that rev is based on the remote repository
Alexander Solovyov <piranha@piranha.org.ua> [Sun, 25 Oct 2009 12:05:07 +0200] rev 9643
bookmarks: use API to determine if repo is local
Brodie Rao <me+hg@dackz.net> [Sun, 25 Oct 2009 02:53:33 +0200] rev 9642
diffstat: with --git, mark binary files with Bin
Normally, diffs without any text insertions or deletions are reported
as having 0 lines changed by stock diffstat. Compatibility is
preserved with stock diffstat in this case, but when using --git,
binary files are marked with Bin as a means of clarification.
git diff --stat does something similar, though it also includes the
old and new file sizes.
Brodie Rao <me+hg@dackz.net> [Sun, 25 Oct 2009 02:52:36 +0200] rev 9641
color: colorize diff --stat
Brodie Rao <me+hg@dackz.net> [Sun, 25 Oct 2009 02:52:35 +0200] rev 9640
diff: add --stat for diffstat output
diff/qdiff --stat invokes patch.diffstat() on the diff output.
When in interactive mode, the output's maximum width is determined by the
terminal's width.
Brodie Rao <me+hg@dackz.net> [Sun, 25 Oct 2009 02:35:35 +0200] rev 9639
diffstat: print 0 instead of nothing for 0 adds or removes
This is in line with how the stock diffstat behaves when processing a
single diff with no line modifications (like a binary diff).
Gilles Moris <gilles.moris@free.fr> [Sat, 24 Oct 2009 12:29:39 +0200] rev 9638
update tcsh_completion for the new forget and summary commands
Adrian Buehlmann <adrian@cadifra.com> [Sat, 24 Oct 2009 19:01:40 +0200] rev 9637
cmdutil: minor refactoring of changeset_printer._show
- use ctx.branch() instead of directly accessing the extra field "branch"
- move definitions of locals ('extra' and 'branch') down to where they
are used
Martin Geisler <mg@lazybytes.net> [Sat, 24 Oct 2009 00:29:25 +0200] rev 9636
commands: search for translated version of "DEPRECATED"
The option description is already translated at this point, so we must
search for a translation of "DEPRECATED".
Gilles Moris <gilles.moris@free.fr> [Fri, 23 Oct 2009 23:10:05 +0200] rev 9635
mercurial.spec: update requirements for the build
Martin Geisler <mg@lazybytes.net> [Fri, 23 Oct 2009 22:55:28 +0200] rev 9634
convert: document parent order in splicemap help (issue1764)
Pascal Quantin <pascal.quantin@gmail.com> [Thu, 22 Oct 2009 23:41:01 +0200] rev 9633
Add style.css file to Inno Setup script
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 21 Sep 2009 19:21:32 +0200] rev 9632
util: use sys.argv[0] if $HG is unset and 'hg' is not in PATH
This is necessary when the executable name is not 'hg'. For example,
if your system-wide mercurial is name 'hgs', sys.argv[0] is more
accurate than 'hg'.
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Wed, 21 Oct 2009 14:16:37 +0200] rev 9631
graphlog: hide internal state of ascii() from users
Adrian Buehlmann <adrian@cadifra.com> [Thu, 22 Oct 2009 00:46:54 +0200] rev 9630
doc/hgrc.5.txt: deprecate [defaults]
Quoting Matt:
"Defaults are a bad idea. They are deprecated. Don't use them. Don't
recommend them. Forget they existed. Use aliases."
in http://selenic.com/pipermail/mercurial-devel/2009-October/016095.html
Matt Mackall <mpm@selenic.com> [Wed, 21 Oct 2009 17:54:51 -0500] rev 9629
Merge with crew
Martin Geisler <mg@lazybytes.net> [Thu, 22 Oct 2009 00:30:24 +0200] rev 9628
rst2man: highlight inline literals in bold
The old code would switch to Courier, but that doesn't really help
much in a manpage.
Martin Geisler <mg@lazybytes.net> [Thu, 22 Oct 2009 00:27:08 +0200] rev 9627
rst2man: avoid italic for references
The links to other manpages used both italic and bold text nested
within each other. The \fP (select previous font) macro was used
incorrectly to "reset" the nested fonts resulting in:
<roman> text <italic> <bold> hg <italic> (1) <bold> more text
with no switch back to roman. This stops the bleeding and removes the
ugly italic (underline) from the manpage links.
Martin Geisler <mg@lazybytes.net> [Wed, 21 Oct 2009 23:40:01 +0200] rev 9626
doc: add a style sheet to the generated HTML pages
Matt Mackall <mpm@selenic.com> [Wed, 21 Oct 2009 17:42:22 -0500] rev 9625
summary: remove reference to -p
Martin Geisler <mg@lazybytes.net> [Tue, 20 Oct 2009 22:43:17 +0200] rev 9624
doc, help: stream-line use of inline-literals
Martin Geisler <mg@lazybytes.net> [Tue, 20 Oct 2009 22:16:27 +0200] rev 9623
minirst: convert ``foo`` into "foo" upon display
This lets us markup many more occurances of inline literals since they
no longer look strange in the terminal output.
Martin Geisler <mg@lazybytes.net> [Tue, 20 Oct 2009 22:42:49 +0200] rev 9622
gendoc: fix synopsis
The synopsis is used as an inline literal when generating the manpage.
There should not be any whitespace on the inside of the quotation
marks in inline literals.
Commands with an empty synopsis (such as tags) produces ``tags `` as
synopsis, which triggers a warning.
Martin Geisler <mg@lazybytes.net> [Tue, 20 Oct 2009 22:39:37 +0200] rev 9621
test-debugcomplete: update output to match a7ef354da662
Matt Mackall <mpm@selenic.com> [Tue, 20 Oct 2009 11:59:38 -0500] rev 9620
summary: add --remote
Matt Mackall <mpm@selenic.com> [Tue, 20 Oct 2009 11:58:09 -0500] rev 9619
summary: restore briefer commit status
Matt Mackall <mpm@selenic.com> [Tue, 20 Oct 2009 11:57:25 -0500] rev 9618
summary: add empty repository and no revision checked out hints
Matt Mackall <mpm@selenic.com> [Mon, 19 Oct 2009 23:53:25 -0500] rev 9617
Merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 20 Oct 2009 00:30:36 +0200] rev 9616
merge with crew
Gilles Moris <gilles.moris@free.fr> [Sun, 18 Oct 2009 14:35:36 +0200] rev 9615
setup: refactor the version string to a subset of tag+tagdist-hash+date
Here is an array summarizing the mercurial version string:
[A] [B] [C] [D]
[1] clone tag clean => tag
[2] clone hash clean => latesttag+latesttagdistance-hash
[3] clone tag dirty => tag+date
[4] clone hash dirty => latesttag+latesttagdistance-hash+date
[5] archive tag clean => tag
[6] archive hash clean => latesttag+latesttagdistance-hash
Column [A]: Mercurial built from an hg *archive* or hg *clone* working directory
Column [B]: revision built has a *tag* or else default to the SHA1 *hash*
Column [C]: working tree *clean* or *dirty*
Column [D]: Mercurial version string
Over the previous version:
- row [5] did return just the node hash, now it returns the tag
- prepend the latest tag and the distance to it to rows [2][4][6]
- append also the date to row [3]; previously, it was just the tag
- the version string is with an empty string to avoid possible TypeError
exceptions during string manipulations
- factorize the function to run hg commands; remove the error message as it is
no more specific to the function.
This scheme enables to have first part of the version strings that can be
compared, whether it has been built from a tagged or untagged revision.
The second part of the version adds a hash for untagged revisions and today's
date if the working tree has local modifications.
As the version string does not contain spaces or special characters, it should
not break script parsing the 'hg version' command and should be usable for use
in file names.
The new code also ensure that the version string has exactly the same version
string, whether it has been built from an archive or from a clone.
Gilles Moris <gilles.moris@free.fr> [Tue, 11 Aug 2009 09:04:02 +0200] rev 9614
archive: add branch and tag informations to the .hg_archival.txt file
Up to this changeset, only the repo (first node) and current node hash were
included. This adds also the named branch and tags.
So the additional lines to .hg_archival.txt are
branch: the named branch
tag: the global tags of this revision, one per line in case of multiple tags
latesttag: if the revision is untagged, the latest tag (most recent in
ancestors), again one per line if this ancestor has multiple tags.
latestagdistance: the longest distance (changesets) to this latest ancestor.
Martin Geisler <mg@lazybytes.net> [Tue, 20 Oct 2009 00:17:36 +0200] rev 9613
ui: only use "user@host" as username in noninteractive mode
We regularly see people on IRC ask how they can correct commits they
accidentally made without having configured a username. This change
will make Mercurial abort when a commit is made without a username.
If Mercurial is run without a TTY (from a cronjob or similar), a
username is constructed as usual. Schematically the changes are as
follows:
With ui.askusername=False:
old new
interactive user@host abort
noninteractive user@host user@host
With ui.askusername=True:
old new
interactive prompt prompt
noninteractive user@host user@host
Alexander Solovyov <piranha@piranha.org.ua> [Mon, 19 Oct 2009 23:27:20 +0300] rev 9612
fix patchbomb prompt when sending series of patches
Adrian Buehlmann <adrian@cadifra.com> [Fri, 16 Oct 2009 23:57:34 +0200] rev 9611
hg.clone: report branch name on update
Alexander Solovyov <piranha@piranha.org.ua> [Mon, 19 Oct 2009 22:19:28 +0300] rev 9610
make path expanding more consistent
This expands ~user and $FOO constructs in ui.ignore files, [defaults],
[paths], extension paths, and HGRCPATH files.
Henrik Stuart <hg@hstuart.dk> [Sat, 17 Oct 2009 15:40:34 +0200] rev 9609
tests: fix inadvertent use of existing test repository
David Soria Parra <dsp@php.net> [Mon, 19 Oct 2009 07:14:44 +0200] rev 9608
commands: clarify output for the commit summary
It is not clear what is meant with '2 modified, 3 unknown'. We clarify
this by writing '2 modified files, 3 unknown files' instead.
Martin Geisler <mg@lazybytes.net> [Mon, 19 Oct 2009 14:37:37 +0200] rev 9607
commands: do not split a translated string
Splitting the string after translation relies on the implicit
assumption that translators will always translate the English words
using single foreign words.
Also, when translating we want as much context as possible so I've
moved the string formatting into the translatable string.
Matt Mackall <mpm@selenic.com> [Mon, 19 Oct 2009 00:36:52 -0500] rev 9606
Remove parents from default help in favor of summary
Matt Mackall <mpm@selenic.com> [Mon, 19 Oct 2009 00:22:49 -0500] rev 9605
summary: quieter with -q
Matt Mackall <mpm@selenic.com> [Mon, 19 Oct 2009 00:21:06 -0500] rev 9604
commands: fix missing empty synopses
Matt Mackall <mpm@selenic.com> [Sun, 18 Oct 2009 22:31:05 -0500] rev 9603
Introduce summary command
Mads Kiilerich <mads@kiilerich.com> [Fri, 16 Oct 2009 11:19:39 +0200] rev 9602
Merge with redone c655432c2c24 (issue1860)
Mads Kiilerich <mads@kiilerich.com> [Fri, 16 Oct 2009 11:18:38 +0200] rev 9601
Dummy-merge with c655432c2c24 (issue1860)
Mads Kiilerich <mads@kiilerich.com> [Fri, 16 Oct 2009 11:16:42 +0200] rev 9600
Redo c655432c2c24 (issue1860)
Martin Geisler <mg@lazybytes.net> [Fri, 16 Oct 2009 00:45:18 +0200] rev 9599
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Fri, 16 Oct 2009 00:06:23 +0200] rev 9598
Merge with crew-stable
Bryan O'Sullivan <bos@serpentine.com> [Tue, 13 Oct 2009 13:43:55 -0700] rev 9597
Merge with mpm
Lee Cantey <lcantey@gmail.com> [Tue, 13 Oct 2009 12:27:50 -0700] rev 9596
README: revert accidental commit
Lee Cantey <lcantey@gmail.com> [Tue, 13 Oct 2009 12:23:23 -0700] rev 9595
test-gendoc: adjust output to account for Swedish translation
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sun, 11 Oct 2009 21:32:55 +0200] rev 9594
merge with mpm
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 10 Oct 2009 12:24:09 +0200] rev 9593
merge with crew-stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 10 Oct 2009 12:23:42 +0200] rev 9592
merge with mpm
Patrick Mezard <pmezard@gmail.com> [Fri, 09 Oct 2009 00:29:39 +0200] rev 9591
Merge with crew-stable
Benoit Allard <benoit@aeteurope.nl> [Fri, 16 Oct 2009 00:09:18 +0200] rev 9590
mq: fix traceback for qpush inexistant-patch with no patch applied
timeless@mozdev.org [Wed, 14 Oct 2009 20:55:39 +0300] rev 9589
rebase: change rebase help to talk about changesets and branch names
Stephen Rasku <mercurial@srasku.net> [Wed, 14 Oct 2009 21:21:09 -0700] rev 9588
mq: changed help for qpop -f to reflect actual behaviour
Patrick Mezard <pmezard@gmail.com> [Thu, 15 Oct 2009 23:15:30 +0200] rev 9587
convert/svn: better error when hg cannot call itself (issue1838)
Patrick Mezard <pmezard@gmail.com> [Thu, 15 Oct 2009 23:15:30 +0200] rev 9586
patch: handle symlink updates/replacements (issue1785)
Patrick Mezard <pmezard@gmail.com> [Thu, 15 Oct 2009 23:15:30 +0200] rev 9585
patch: handle symlinks without symlinkhunk
Symlink creations and deletions were handled with a special symlinkhunk object,
working like a binary hunk. However, this model does not support symlink
updates or replacements, so we teach regular hunks how to handle symlinks.
Matt Mackall <mpm@selenic.com> [Mon, 12 Oct 2009 18:25:46 -0500] rev 9584
bisect: use util.system and fix good/bad when using -c
The existing scheme using util.find_exe and subprocess.call meant we
couldn't use simple shell commands in tests. Fix that.
Also, it mistakenly used status from the system() call rather than
good from the bisect call in reporting results.
Matt Mackall <mpm@selenic.com> [Mon, 12 Oct 2009 14:59:28 -0500] rev 9583
bisect: limit considered set to descendants of first good rev
Matt Mackall <mpm@selenic.com> [Mon, 12 Oct 2009 14:52:53 -0500] rev 9582
tests: add -k to test scripts matching keywords
argument is a space-separated list of keywords that are searched for
in the name and body of each test. This makes it easy to run only
tests related to tags, hgweb, revert, etc. (eg -k "tag hgweb revert").
Raoul Bhatia [IPAX] <r.bhatia@ipax.at> [Fri, 09 Oct 2009 16:27:05 +0200] rev 9581
use short identifiers in atom feed
Matt Mackall <mpm@selenic.com> [Sun, 11 Oct 2009 13:58:53 -0500] rev 9580
run-tests: add --noskips option
Brodie Rao <me+hg@dackz.net> [Fri, 09 Oct 2009 03:53:24 -0400] rev 9579
color: add test for record support
Sune Foldager <cryo@cyanite.org> [Thu, 08 Oct 2009 10:39:43 +0200] rev 9578
rebase: return early when source is descendant of destination
This only happens when using --base (or no source selection options), as
rebase already aborts in this situation when using --source.
Without this change you get an abort from the underlying merge, and the
repository is in a different state than you started with (the working
dir parent is changed).
Sune Foldager <cryo@cyanite.org> [Thu, 08 Oct 2009 10:07:41 +0200] rev 9577
rebase: improve error and debug messages
Matt Mackall <mpm@selenic.com> [Sun, 11 Oct 2009 13:54:19 -0500] rev 9576
Merge with stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 10 Oct 2009 12:19:58 +0200] rev 9575
merge with hg-stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 10 Oct 2009 12:00:43 +0200] rev 9574
encoding: fix issue with non-standard UTF-8 CTYPE on OS X
Patrick Mezard <pmezard@gmail.com> [Thu, 08 Oct 2009 23:42:33 +0200] rev 9573
patch: do not swallow header-like patch first line (issue1859)
Current solution is hackish but looks like a good trade-off short of rewriting
patch.extract() significantly.
Patrick Mezard <pmezard@gmail.com> [Thu, 08 Oct 2009 23:32:36 +0200] rev 9572
windows: fix unlink() not dropping empty tree (issue1861)
Matt Mackall <mpm@selenic.com> [Thu, 08 Oct 2009 01:17:48 -0500] rev 9571
merge with stable
Matt Mackall <mpm@selenic.com> [Thu, 08 Oct 2009 01:17:24 -0500] rev 9570
merge with i18n-stable
Matt Mackall <mpm@selenic.com> [Thu, 08 Oct 2009 01:16:32 -0500] rev 9569
Merge with i18n
Fabian Kreutz <fabian.kreutz@starnet.fi> [Tue, 06 Oct 2009 11:18:58 +0300] rev 9568
i18n-de: Translate extdiff, gpg, graphlog and fix some fuzzies
Martin Geisler <mg@lazybytes.net> [Wed, 30 Sep 2009 21:14:24 +0200] rev 9567
Merge with hg-i18n-stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 28 Sep 2009 20:14:39 -0300] rev 9566
i18n-pt_BR: synchronized with a1ee850f49e3
Martin Geisler <mg@lazybytes.net> [Tue, 29 Sep 2009 00:54:15 +0200] rev 9565
Merge with hg-i18n-stable
Martin Geisler <mg@lazybytes.net> [Mon, 28 Sep 2009 00:45:47 +0200] rev 9564
Merge with hg-i18n-stable
Martin Geisler <mg@lazybytes.net> [Thu, 17 Sep 2009 00:43:25 +0200] rev 9563
i18n-da: synchronized with 812aaef40757
Martin Geisler <mg@lazybytes.net> [Wed, 16 Sep 2009 23:46:06 +0200] rev 9562
Merge with main
Martin Geisler <mg@lazybytes.net> [Wed, 16 Sep 2009 16:11:44 +0200] rev 9561
i18n-de: correct indentation of verbatim blocks
Martin Geisler <mg@lazybytes.net> [Wed, 16 Sep 2009 15:41:39 +0200] rev 9560
i18n-de: correct errors reported by msgfmt
Fabian Kreutz <fabian.kreutz@starnet.fi> [Wed, 16 Sep 2009 14:14:06 +0300] rev 9559
i18n-de: Translation of convert + more syntax fixes
Fabian Kreutz <fabian.kreutz@starnet.fi> [Mon, 14 Sep 2009 09:14:36 +0300] rev 9558
i18n-de: redid latest translations
Originally by Simon H., Tobias and myself.
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 08 Sep 2009 19:46:20 -0300] rev 9557
merge with i18n-stable
Jens Bäckman <jens.backman@gmail.com> [Tue, 18 Aug 2009 08:49:41 +0200] rev 9556
i18n-sv: Start Swedish translation
This is the starting point for the Swedish translation efforts. It
currently contains only the help of the first 17 basic commands.
Martin Geisler <mg@lazybytes.net> [Thu, 13 Aug 2009 20:12:34 +0200] rev 9555
i18n: merge with pt_BR
Wagner Bruna <wbruna@yahoo.com> [Wed, 12 Aug 2009 11:45:47 -0300] rev 9554
i18n-pt_BR: synchronized with 4e7149ed98e8
Wagner Bruna <wbruna@yahoo.com> [Wed, 12 Aug 2009 11:42:21 -0300] rev 9553
merge with i18n-stable
Matt Mackall <mpm@selenic.com> [Thu, 08 Oct 2009 00:59:46 -0500] rev 9552
Merge with -stable
Kevin Bullock <kbullock@ringworld.org> [Wed, 07 Oct 2009 14:01:20 -0500] rev 9551
color: allow multiple args to ui.write()
TK Soh <teekaysoh@gmail.com> [Thu, 08 Oct 2009 09:27:22 +0800] rev 9550
color: add support for record extension
Adrian Buehlmann <adrian@cadifra.com> [Wed, 07 Oct 2009 20:32:07 +0200] rev 9549
util: move rename into posix.py and windows.py
Adrian Buehlmann <adrian@cadifra.com> [Wed, 07 Oct 2009 20:16:43 +0200] rev 9548
util: state docstring of rename more precisely
Greg Ward <greg-hg@gerg.ca> [Mon, 05 Oct 2009 18:17:13 -0400] rev 9547
cmdutil: changeset_printer: use methods of filectx/changectx.
This allows extensions that modify changeset metadata (e.g.
description) by overriding methods of changectx to get consistent
behavior from all log-like commands, regardless of whether templates
or styles are used. Without this, overriding changectx methods works
if you use styles or templates, but not with default log format.
This meant adding filectx.extra() for consistency with changectx.
Patrick Mezard <pmezard@gmail.com> [Wed, 07 Oct 2009 22:50:20 +0200] rev 9546
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Tue, 06 Oct 2009 22:46:31 +0200] rev 9545
verify: detect file copy sources not in parents with --verbose
Steve Borho <steve@borho.org> [Tue, 06 Oct 2009 16:08:38 -0500] rev 9544
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Mon, 05 Oct 2009 22:57:15 +0200] rev 9543
convert/cvs: stop supporting external cvsps
Patrick Mezard <pmezard@gmail.com> [Mon, 05 Oct 2009 22:17:39 +0200] rev 9542
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Sun, 04 Oct 2009 23:16:54 +0200] rev 9541
Merge with crew-stable
Martin Geisler <mg@lazybytes.net> [Sun, 04 Oct 2009 12:18:43 +0200] rev 9540
help: un-indent help topics
The help topics are reused in the HTML documentation, and there it
looks odd that whole sections are indented. We now only indent it for
output on the terminal.
Martin Geisler <mg@lazybytes.net> [Sun, 04 Oct 2009 09:59:13 +0200] rev 9539
help: move help topics from mercurial/help.py to help/*.txt
The help topics are loaded on demand so we wont hit the disk unless we
really have to.
Martin Geisler <mg@lazybytes.net> [Sat, 03 Oct 2009 18:58:25 +0200] rev 9538
i18n: remove unnecessary os.path.normpath call
Martin Geisler <mg@lazybytes.net> [Sun, 04 Oct 2009 10:17:01 +0200] rev 9537
commands: simpler sort of help topic names
Mads Kiilerich <mads@kiilerich.com> [Sat, 03 Oct 2009 18:31:20 +0200] rev 9536
cmdutil: templating keywords latesttag and latesttagdistance
This can be used for referring to revisions in a reasonable
meaningful, stable and monotonically increasing way, suitable for
releases or builds directly from a repository.
The latest tag is found by searching through untagged ancestors and
finding the latest tagged ancestor based on tag date. The distance is
found from the length of the longest path to the tagged revision.
For example:
hg log -l1 --template '{latesttag}+{latesttagdistance}\n'
can return
1.3.1+197
This is mostly work by Gilles Moris <gilles.moris@free.fr>
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 03 Oct 2009 23:38:10 +0200] rev 9535
merge with mpm
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 03 Oct 2009 23:36:08 +0200] rev 9534
bdiff: gradually enable the popularity hack
Patch from Jason Orendorff
The lower the threshold, the stronger the popularity hack's
influence. So at 3999 lines, the hack is disabled; and at 4000 lines,
the hack is enabled at maximum strength (t=4).
No source file in mercurial/crew is over 4000 lines. But there are, oh,
a few such files in Mozilla. I can testify that this hack causes hg to
generate some correct but eyebrow-raising patches.
I think the hack should phase in gradually. The threshold should be high
for small files where we don't need it so much. Like this:
t = (bn < 31000) ? 1000000 / bn : bn / 1000;
That would leave the popularity hack disabled for small files, then
gradually phase it in:
bn < 1000 -- t > bn (popularity hack is completely disabled)
bn == 1000 -- t = 1000 (still effectively disabled)
bn == 2000 -- t = 500 (only hits unusual files)
bn == 10000 -- t = 100 (only hits especially common lines)
bn == 31000 -- t = 31 (hack is at maximum power)
bn == 32000 -- t = 32 (hack could backfire, ease off)
Matt Mackall <mpm@selenic.com> [Wed, 07 Oct 2009 23:45:30 -0500] rev 9533
Merge with -crew-stable
Patrick Mezard <pmezard@gmail.com> [Wed, 07 Oct 2009 18:52:01 +0200] rev 9532
convert/hg: handle bogus copy records (issue1843)
Patrick Mezard <pmezard@gmail.com> [Wed, 07 Oct 2009 10:13:04 +0200] rev 9531
convert/hg: make parents() return changectx, not nodes
Matt Mackall <mpm@selenic.com> [Wed, 07 Oct 2009 23:25:41 -0500] rev 9530
Merge with -crew-stable
Adrian Buehlmann <adrian@cadifra.com> [Tue, 06 Oct 2009 10:45:23 +0200] rev 9529
util.rename: do not abort if os.unlink fails (issue1840)
Patrick Mezard <pmezard@gmail.com> [Mon, 05 Oct 2009 22:01:08 +0200] rev 9528
convert: make mapfile handle LF and CRLF shamap (issue1846)
Patrick Mezard <pmezard@gmail.com> [Sun, 04 Oct 2009 23:06:14 +0200] rev 9527
convert/darcs: handle directory renaming
Patrick Mezard <pmezard@gmail.com> [Sun, 04 Oct 2009 22:23:11 +0200] rev 9526
convert/darcs: fix file renaming (issue1853)
Bryan O'Sullivan <bos@serpentine.com> [Thu, 06 Aug 2009 21:35:25 -0700] rev 9525
Fix failing darcs test
Matt Mackall <mpm@selenic.com> [Sat, 03 Oct 2009 15:57:48 -0500] rev 9524
Fix for issue1848
Matt Mackall <mpm@selenic.com> [Sat, 03 Oct 2009 14:39:57 -0500] rev 9523
Merge with -stable
Matt Mackall <mpm@selenic.com> [Sat, 03 Oct 2009 14:39:46 -0500] rev 9522
notify: update test
Grauw <laurens.hg@grauw.nl> [Fri, 07 Aug 2009 01:15:16 +0200] rev 9521
Fix issue 1782 don't do url2pathname conversion for urls
And only replace os-dependent path separators when necessary
Kevin Bullock <kbullock@ringworld.org> [Tue, 29 Sep 2009 23:49:42 -0500] rev 9520
color: allow multiple args to ui.write()
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Thu, 01 Oct 2009 08:50:10 +0200] rev 9519
extdiff: fix defaulting to "diff" if no --program is given
Greg Ward <greg-hg@gerg.ca> [Thu, 01 Oct 2009 15:36:45 -0400] rev 9518
dirstate: add/improve method docstrings.
- add doc to __init__(), _map(), status()
- enhance for __getitem__()
- fix inaccurate doc for walk() (described wrong return type)
Mads Kiilerich <mads@kiilerich.com> [Sun, 20 Sep 2009 22:19:18 +0200] rev 9517
util.system: Use subprocess instead of os.system
subprocess allows the environment and working directory to be specified
directly, so the hacks for making temporary changes while forking is no longer
necessary.
This also fixes failures on solaris where the temporary changes can't be undone
because there is no unsetenv.
David Champion <dgc@uchicago.edu> [Wed, 23 Sep 2009 02:31:09 -0500] rev 9516
notify: permit suppression of merge changeset notification
In some environments merges occur regularly but with no conflicts, and
committers find merge notifications more of a bother than a help.
By setting merge=False in [notify], merge notifications are suppressed.
This works both for incoming and for changegroup hooks.
Greg Ward <greg-hg@gerg.ca> [Thu, 27 Aug 2009 10:21:32 -0400] rev 9515
Add script to rewrite revlog to workaround lack of parent deltas.
Defaults to rewriting the manifest in the current repository.
Based on a patch to rewrite-log by Benoit Boissinot that I found here:
http://article.gmane.org/gmane.comp.version-control.mercurial.general/11908
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sun, 16 Aug 2009 11:11:37 +0900] rev 9514
inotify: use cmdutil.service instead of local daemonizing code
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sun, 16 Aug 2009 11:30:24 +0900] rev 9513
cmdutil: service: add an optional runargs argument to pass the command to run
This would be necessary for inotify launching its server: the initial command
is a standard 'hg st'/'hg ci'/... but the daemon to run is 'hg inserve'
Sune Foldager <cryo@cyanite.org> [Thu, 17 Sep 2009 21:12:32 +0200] rev 9512
extdiff: add 3-way diff for merge changesets
This adds 3-way diff for merge changesets (using -c) and for diffing
the working directory context against two parents. To enable it, use
the new magic value '$parent2' in the argument line. In order to work,
your differ must support that the second parent argument is left out;
this will happen in 2-way mode. Default arguments are as before, without
enabling 3-way mode, ensuring backwards compatibility.
This also fixes a problem when diffing a merge changeset with a single
file change. Extdiff would sometimes do the wrong thing in that situation.
Kevin Bullock <kbullock@ringworld.org> [Wed, 23 Sep 2009 21:29:47 -0500] rev 9511
bash_completion: add completions for shelve extension
Adrian Buehlmann <adrian@cadifra.com> [Thu, 01 Oct 2009 11:40:53 +0200] rev 9510
doc: clarify license footers
Mercurial is licensed under version 2 of the GPL
Adrian Buehlmann <adrian@cadifra.com> [Thu, 01 Oct 2009 17:17:52 +0200] rev 9509
dirstate: kill dirstate.granularity config option
The dirstate.granularity configuration parameter was never documented,
it only adds code complexity and it is unneeded.
Adding comments describing forced 'unset' entries.
Matt Mackall <mpm@selenic.com> [Wed, 30 Sep 2009 21:42:51 -0500] rev 9508
Merge with -stable
Matt Mackall <mpm@selenic.com> [Wed, 30 Sep 2009 18:47:33 -0500] rev 9507
subrepo: add auto-pull for merge
Greg Ward <greg-hg@gerg.ca> [Wed, 30 Sep 2009 16:08:11 -0400] rev 9506
streamclone: partially encode filename over the wire, not for local read (issue1847)
(Fixes issue1847, which was introduced by 810387f59696: stream clone
of a repo with directory named *.d failed: server raises exception
"IOError: [Errno 2] No such file or directory:
/tmp/test/.hg/store/data/foo.d.hg.hg/foo".)
Matt Mackall <mpm@selenic.com> [Wed, 30 Sep 2009 13:15:18 -0500] rev 9505
Merge with i18n-stable
Martin Geisler <mg@lazybytes.net> [Tue, 29 Sep 2009 00:42:14 +0200] rev 9504
i18n-da: random small strings, only 499 strings left
Martin Geisler <mg@lazybytes.net> [Tue, 29 Sep 2009 00:23:01 +0200] rev 9503
Merge with main
Greg Ward <greg-hg@gerg.ca> [Thu, 17 Sep 2009 18:12:53 -0400] rev 9502
commands: tweak help for 'heads'.
- prefer "changeset" over "revision" for internal consistency
- clarify explanation of branch heads
- add a line break
- tighten some wording
Martin Geisler <mg@lazybytes.net> [Mon, 28 Sep 2009 00:23:44 +0200] rev 9501
i18n-da: translate addremove, branch, and cat
Martin Geisler <mg@lazybytes.net> [Sun, 27 Sep 2009 23:56:27 +0200] rev 9500
i18n-da: synchronized with 744cb8e93936
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 08 Sep 2009 18:11:11 -0300] rev 9499
i18n-pt_BR: synchronized with f4f17d5695d2
Martin Geisler <mg@lazybytes.net> [Tue, 08 Sep 2009 22:58:28 +0200] rev 9498
Merge with stable
Martin Geisler <mg@lazybytes.net> [Thu, 13 Aug 2009 20:11:16 +0200] rev 9497
i18n: merge with pt_BR
Wagner Bruna <wbruna@yahoo.com> [Wed, 12 Aug 2009 10:26:17 -0300] rev 9496
i18n-pt_BR: synchronized with 73bec717b825
Martin Geisler <mg@lazybytes.net> [Tue, 29 Sep 2009 01:08:18 +0200] rev 9495
ui: guard against UnicodeDecodeErrors in ui.wrap
Christian Ebert <blacktrash@gmx.net> [Thu, 01 Oct 2009 00:00:18 +0200] rev 9494
keyword: uppercase short option for kwfiles --all, like hg status -A
Deprecate kwfiles -a.
Christian Ebert <blacktrash@gmx.net> [Wed, 30 Sep 2009 23:59:03 +0200] rev 9493
keyword: make kwfiles -u show untracked files only (like status)
Remove extra documentation of -u/--unknown, as this is covered in
the option help already.
Like commands.status the code now zips the status flags.
Add more kwfiles tests.
Christian Ebert <blacktrash@gmx.net> [Wed, 30 Sep 2009 23:59:03 +0200] rev 9492
keyword: make kwfiles --all show unknown files too
More consistent and similar to hg status.
Christian Ebert <blacktrash@gmx.net> [Wed, 30 Sep 2009 22:39:56 +0200] rev 9491
keyword: kwfiles --unknown instead of --untracked
Use the same option name as "hg status".
Retrieve option in _status().
Mark --untracked as deprecated.
Brendan Cully <brendan@kublai.com> [Wed, 30 Sep 2009 14:43:22 -0700] rev 9490
convert: unbreak non-svn engines
Alexander Solovyov <piranha@piranha.org.ua> [Sat, 26 Sep 2009 00:17:55 +0300] rev 9489
zeroconf: read actual description for repos in hgwebdir
Alexander Solovyov <piranha@piranha.org.ua> [Sat, 26 Sep 2009 00:17:02 +0300] rev 9488
zeroconf: code cleanup, fixing variable names to be meaningful
Bryan O'Sullivan <bos@serpentine.com> [Mon, 28 Sep 2009 13:21:41 -0700] rev 9487
Merge with crew
Bryan O'Sullivan <bos@serpentine.com> [Mon, 24 Aug 2009 16:30:42 -0700] rev 9486
notify: make it possible to pass extra info into templates
Martin Geisler <mg@lazybytes.net> [Sun, 27 Sep 2009 10:12:02 +0200] rev 9485
test-gendoc: add tests for all languages
This ensures that we catch errors in the reST syntax early and for all
languages. The only change needed in gendoc.py was to correct the
computation of section underlines for Asian languages.
Martin Geisler <mg@lazybytes.net> [Sun, 27 Sep 2009 10:04:51 +0200] rev 9484
gendoc: do not wrap encoded string
- it breaks multi-byte characters
- it is not needed since Docutils will take care of wrapping the
strings as necessary
Martin Geisler <mg@lazybytes.net> [Sun, 27 Sep 2009 09:39:57 +0200] rev 9483
test-encoding: make test output easier to follow
Martin Geisler <mg@lazybytes.net> [Sun, 27 Sep 2009 09:38:53 +0200] rev 9482
Merge with crew-stable
Martin Geisler <mg@lazybytes.net> [Sun, 27 Sep 2009 09:34:40 +0200] rev 9481
test-extension: update test output to match a4f6e4427b65
Martin Geisler <mg@lazybytes.net> [Sun, 27 Sep 2009 01:44:46 +0200] rev 9480
util: do not corrupt multi-byte characters in wrap
Sune Foldager <cryo@cyanite.org> [Wed, 23 Sep 2009 18:56:09 +0200] rev 9479
push: fix subtle bug in prepush logic
A test case demonstrating the bug has been added.
Contributed by Henrik Stuart and Sune Foldager.
Brodie Rao <me+hg@dackz.net> [Wed, 23 Sep 2009 15:58:07 +0200] rev 9478
color: mark --no-color as deprecated (--color=never has the same effect)
This should've been marked deprecated when --color was first introduced, but
it was something I overlooked.
Adrian Buehlmann <adrian@cadifra.com> [Wed, 23 Sep 2009 15:57:25 +0200] rev 9477
mention overlay bundle file in global --repository option
see http://mercurial.selenic.com/wiki/LookingIntoBundles
Drop mentioning symbolic path names for the sake of brevity. This is
a common feature of path options anyway.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 23 Sep 2009 15:54:43 +0200] rev 9476
merge with crew-stable
Sune Foldager <cryo@cyanite.org> [Wed, 23 Sep 2009 15:51:36 +0200] rev 9475
localrepo: fix bugs in branchheads and add docstring
- The call to reverse() reversed the list in place in the global branchmap.
- The nodesbetween function doesn't preserve ordering.
Peter Ingebretson <pingebre@yahoo.com> [Wed, 23 Sep 2009 15:36:51 +0200] rev 9474
convert: fix marshalling in P4 convert extension to use a binary stream
The Perforce convert extension uses the p4 -G command line option and
marshal.load to obtain information about the history of a Perforce depot.
The method marshal.load must be provided with a binary stream (mode='rb') in
order to function reliably. Certain changelist descriptions or other elements
in a depot history could trigger a premature EOFError, causing the conversion
process to fail.
This may resolve the issue discussed in the following thread:
http://www.selenic.com/pipermail/mercurial/2009-July/026813.html
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 23 Sep 2009 15:19:26 +0200] rev 9473
merge with mpm
Patrick Mezard <pmezard@gmail.com> [Tue, 22 Sep 2009 13:30:32 +0200] rev 9472
convert/cvs: update debugcvsps documentation
Martin Geisler <mg@lazybytes.net> [Sat, 19 Sep 2009 13:55:18 +0200] rev 9471
Merge with crew-stable
Martin Geisler <mg@lazybytes.net> [Sat, 19 Sep 2009 13:52:54 +0200] rev 9470
dispatch: catch ConfigError while constructing ui
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sat, 12 Sep 2009 11:17:07 +0200] rev 9469
config: abort on indented non-continuation lines (issue1829)
Previously, as soon as a continuation would be met, "cont" would stay
forever set to True, but "item" was set back to "None".
This caused the continuation code bits to run every time, until the next
"self.get(section, item) + '\n'" which would crash.
Stuart W Marks <smarks@smarks.org> [Thu, 17 Sep 2009 22:39:38 -0700] rev 9468
hg: say 'hg update' instead of 'hg up' in merge status message
Includes the change to the message itself, along with several test
output files that also had to change.
Martin Geisler <mg@lazybytes.net> [Sat, 19 Sep 2009 01:15:38 +0200] rev 9467
do not attempt to translate ui.debug output
Martin Geisler <mg@lazybytes.net> [Fri, 18 Sep 2009 17:37:51 +0200] rev 9466
Merge with crew-stable (again)
I had pulled 661bc51f09b7 into my local clone and accidentially
rebased it after pulling a new changeset from crew.
Shun-ichi GOTO <shunichi.goto@gmail.com> [Fri, 18 Sep 2009 21:25:47 +0900] rev 9465
win32mbcs: util.normpath should be wrapped.
It is because util.normpath() finally calls windows.pconvert()
which is not wrapped (by changeset:25c41ddb3978).
Martin Geisler <mg@lazybytes.net> [Fri, 18 Sep 2009 17:23:02 +0200] rev 9464
Merge with crew-stable
Shun-ichi GOTO <shunichi.goto@gmail.com> [Fri, 18 Sep 2009 21:25:47 +0900] rev 9463
win32mbcs: util.normpath should be wrapped.
It is because util.normpath() finally calls windows.pconvert()
which is not wrapped (by changeset:25c41ddb3978).
Christian Ebert <blacktrash@gmx.net> [Thu, 10 Sep 2009 23:15:37 +0200] rev 9462
test-keyword: run kwdemo before setting up [keyword] files
kwdemo would pass the test without uisetup otherwise.
Also no need to specify --default option.
timeless@mozdev.org [Sun, 13 Sep 2009 03:04:40 +0300] rev 9461
record: remove superfluous space
Steve Losh <steve@stevelosh.com> [Thu, 17 Sep 2009 22:30:45 -0400] rev 9460
contrib/bash_completion: add tab completion for some bookmark commands
Steve Losh <steve@stevelosh.com> [Thu, 17 Sep 2009 22:28:47 -0400] rev 9459
bookmarks: support --quiet
Steve Borho <steve@borho.org> [Thu, 17 Sep 2009 17:39:43 -0500] rev 9458
demandimport: blacklist gtk
Demandimport breaks gtk. You get a meaningless error about
'failed loading gobject\_gobject.pyd'. Mercurial does not use gtk,
but this trips up many extension writers.
Matt Mackall <mpm@selenic.com> [Wed, 23 Sep 2009 00:23:50 -0500] rev 9457
convert: disable SVN support due to library license incompatibility
Martin Geisler <mg@lazybytes.net> [Thu, 17 Sep 2009 21:52:08 +0200] rev 9456
Merge with crew-stable
Martin Geisler <mg@lazybytes.net> [Thu, 17 Sep 2009 21:51:55 +0200] rev 9455
Merge with main
Martin Geisler <mg@lazybytes.net> [Mon, 14 Sep 2009 23:48:25 +0200] rev 9454
hg: avoid combining translated strings
Combining translated string fragments into bigger strings is bad
practice because it removes context from the fragments. The translator
sees the fragments in isolation and might not jump back to the source
to see how a string like "%d files %s" is actually used.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Tue, 15 Sep 2009 18:26:05 +0200] rev 9453
merge with mpm (temporarily undo qprev/qnext/qtop removal)
Steve Borho <steve@borho.org> [Tue, 15 Sep 2009 11:18:12 -0500] rev 9452
Merge with crew-stable
Martin Geisler <mg@lazybytes.net> [Thu, 17 Sep 2009 21:50:12 +0200] rev 9451
commands: expand -c and -C in update error message
Stuart W Marks <smarks@smarks.org> [Thu, 17 Sep 2009 21:34:05 +0200] rev 9450
commands: forbid 'hg update --check --clean'
Matt Mackall <mpm@selenic.com> [Wed, 16 Sep 2009 16:01:37 -0500] rev 9449
Merge with stable
Steve Borho <steve@borho.org> [Mon, 14 Sep 2009 19:53:43 -0500] rev 9448
windows: provide filename in IOError exceptions
This brings the Windows posixfile errors in line with the errors
on other platforms.
Matt Mackall <mpm@selenic.com> [Mon, 14 Sep 2009 17:32:55 -0500] rev 9447
Merge with crew