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
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)
Matt Mackall <mpm@selenic.com> [Mon, 14 Sep 2009 17:29:47 -0500] rev 9440
Merge qprev/qnext backout
Matt Mackall <mpm@selenic.com> [Mon, 14 Sep 2009 16:39:24 -0500] rev 9439
Backed out premature qprev/qnext removal
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 11 Sep 2009 16:58:19 +0200] rev 9438
Add new flag [-1] to synopsis of qapplied/qunapplied
Greg Ward <greg-hg@gerg.ca> [Tue, 08 Sep 2009 17:58:59 -0400] rev 9437
Improve some docstrings relating to changegroups and prepush().
Andrey Somov <py4fun@gmail.com> [Wed, 09 Sep 2009 11:12:36 +0200] rev 9436
improve code readability
Martin Geisler <mg@lazybytes.net> [Thu, 10 Sep 2009 10:31:12 +0200] rev 9435
Merge with crew-stable
Mads Kiilerich <mads@kiilerich.com> [Tue, 08 Sep 2009 01:26:15 +0200] rev 9434
test-convert-git: Use ~ instead of ^
Solaris sh interprets ^ as pipe symbol and the test thus failed in strange
ways. git can however use of HEAD~ instead of HEAD^.
Mads Kiilerich <mads@kiilerich.com> [Thu, 10 Sep 2009 01:56:25 +0200] rev 9433
transplant: Add trailing LF in tmp file for filtering
Transplant filtering used a tmp file ending with the (stripped) commit
message and thus no final LF. Text files not ending with LF is usually
not used on Unix and is thus wrong ;-)
The missing LF had bad consequences because Solaris sed chokes on
unterminated input lines, so
echo -n foo|sed 's,o,0,g'
doesn't output anything, and the filter used in tests/test-transplant
thus stripped the last (and only) line in the message away on solaris.
Patrick Mezard <pmezard@gmail.com> [Sun, 06 Sep 2009 15:32:16 +0200] rev 9432
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Sun, 06 Sep 2009 15:29:14 +0200] rev 9431
convert: fix history topology when using hg.tagsbranch
When using hg.tagsbranch, all conversions fail at
transcribing the source repo topology with conversion
scenarios interleaving:
- initial repo conversion,
- then upstream tag
- then later incremental conversion
The problem is caused by the usage of the last source
revid as source revid for the tagnode in the revision
map.
On a later incremental conversion, when resolving some
child commit of the true last source revid, convert
will parent the nodes to the tag node. If using
tagsbranch you get a bad topology where all incremental
commit nodes end up in the tag branch.
Analysis and test by Edouard Gomez <ed.gomez@free.fr>
Patrick Mezard <pmezard@gmail.com> [Sat, 05 Sep 2009 19:39:46 +0200] rev 9430
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Sat, 05 Sep 2009 18:56:51 +0200] rev 9429
merge: exclude common ancestor from --preview (issue1818)
Nicolas Dumazet <nicdumz.commits@gmail.com> [Thu, 27 Aug 2009 11:55:21 +0200] rev 9428
inotify: _inotify.c: bugfix: remove_watch has to return PyNone on success
We are not currently using that API function in inotify, hence the reason
for the "silent" bug. But returning NULL here causes the interpreter to crash.
Let's keep code clean for reusers :)
The whole "bail" logic was unneeded here.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Thu, 27 Aug 2009 14:15:04 +0200] rev 9427
parsers.c: parse_manifest: fixing refcount of flags
When flags was DECREF'ed, scope was referencing to the outer variable,
outside of the block.
It was in fact always NULL: the real Python object was never decref'ed.
Martin Geisler <mg@lazybytes.net> [Fri, 04 Sep 2009 23:45:13 +0200] rev 9426
test-highlight: remove redundant test
Changeset 799373ff2554 is testing how a EUC-JP encoded Japanese file
is treated in different encodings, so the ISO-8859-1 encoded German
file is no longer needed.
Martin Geisler <mg@lazybytes.net> [Fri, 04 Sep 2009 23:34:51 +0200] rev 9425
Merge with crew-stable
Yuya Nishihara <yuya@tcha.org> [Sat, 29 Aug 2009 15:24:15 +0900] rev 9424
highlight: fixes garbled text in non-UTF-8 environment
This patch treats all files inside repository as encoded by
locale's encoding when pygmentize.
We can assume that most files are written in locale's encoding,
but current implementation treats them as UTF-8.
So there's no way to specify the encoding of files.
Current implementation, db7557359636 (issue1341):
1. Convert original `text`, which is treated as UTF-8, to locale's encoding.
`encoding.tolocal()` is the method to convert from internal UTF-8 to local.
If original `text` is not UTF-8, e.g. Japanese EUC-JP, some characters
become garbled here.
2. pygmentize, with no UnicodeDecodeError.
This patch:
1. Convert original `text`, which is treated as locale's encoding, to unicode.
Pygments prefers unicode object than raw str. [1]_
If original `text` is not encoded by locale's encoding, some characters
become garbled here.
2. pygmentize, also with no UnicodeDecodeError :)
3. Convert unicode back to raw str, which is encoded by locale's.
.. [1] http://pygments.org/docs/unicode/
Matt Mackall <mpm@selenic.com> [Mon, 31 Aug 2009 10:58:33 -0500] rev 9423
Make distinct lookup error for localrepo.lookup
This allows clone/share to correctly distinguish lookup errors from
corruption errors and catch only the former.
Martin Geisler <mg@lazybytes.net> [Fri, 04 Sep 2009 22:26:57 +0200] rev 9422
doc: add TOC to hg.1.html and hgrc.5.html
Christian Ebert <blacktrash@gmx.net> [Fri, 04 Sep 2009 11:51:28 +0200] rev 9421
log: prevent negative date range from displaying entire log (issue1805)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 04 Sep 2009 10:47:55 +0200] rev 9420
manifest/revlog: do not let the revlog cache mutable objects
If a buffer of an mutable object is passed to revlog.addrevision(), the revlog
will happily store it in its cache. Later when the revlog reuses the cached
entry, if the manifest modified the object in-between, all kind of bugs
appears.
We fix it by:
- passing immutable objects to addrevision() if they are already available
- only storing the text in the cache if it's of str type
Then we can remove the conversion of the cache entry to str() during
retrieval. That was probably just there hiding the bug for the common cases
but not really fixing it.
Martin Geisler <mg@lazybytes.net> [Thu, 03 Sep 2009 21:40:45 +0200] rev 9419
doc/README: simplify instructions
Martin Geisler <mg@lazybytes.net> [Thu, 03 Sep 2009 21:36:44 +0200] rev 9418
doc: use our own rst2man.py script (issue1746)
The rst2man tool has not yet been part of an official Docutils
release, and it is not present in most distributions. This poses a
problem for people who want to install Mercurial from source, or who
want to create a Mercurial package for such a distribution -- how to
specify the build-dependencies?
By including the rst2man.py script with Mercurial people only need a
normal Docutils installation in order to install Mercurial.
Martin Geisler <mg@lazybytes.net> [Thu, 03 Sep 2009 21:07:06 +0200] rev 9417
util, minirst: do not crash with COLUMNS=0
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 03 Sep 2009 02:42:56 +0200] rev 9416
manifestdict: remove unnecessary dictionary copy
No need to copy the dict, dict.__init__() will do that for us.
It was responsible for a non-negligeable waste of time during a qpush of an
-mm queue on the kernel repo.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 02 Sep 2009 21:05:43 +0200] rev 9415
manifest.add(): cleanup worklist construction and iteration