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
Martin Geisler <mg@lazybytes.net> [Sun, 13 Sep 2009 18:00:37 +0200] rev 9446
test-gendoc: test documentation generation
Martin Geisler <mg@lazybytes.net> [Sun, 13 Sep 2009 17:08:31 +0200] rev 9445
doc/Makefile: make rst2html and rst2man halt on warnings
Martin Geisler <mg@lazybytes.net> [Sun, 13 Sep 2009 17:05:38 +0200] rev 9444
doc/Makefile: do not create files in case of errors
When stdout is redirected to the target file directly, the file is
created as an empty file even when an error occurs. Since the file is
there, 'make' wont try to re-create it in subsequent runs.
This fix is similar to the one in a6747ba27d22, but it also takes care
of rst2html and gendoc.py.
Patrick Mezard <pmezard@gmail.com> [Sun, 13 Sep 2009 17:53:09 +0200] rev 9443
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Sun, 13 Sep 2009 17:23:47 +0200] rev 9442
zeroconf: fix hgweb published URLs (issue1819)
Shun-ichi GOTO <shunichi.goto@gmail.com> [Wed, 09 Sep 2009 18:38:39 +0900] rev 9441
win32mbcs: wrap util.pconvert, not windows.pconvert (issue1828)