tests: extend revset test

merge: sort arguments to stabilize the ancestor search

merge: improve merge with ancestor message

ui: ignore EIO in write_err Hgs signal handler will catch the signal for example if the terminal hg is running in is closed. That will make it try to warn that it was 'killed', but that might fail with EIO and cause hg to exit with an unhandled exception. Normally nobody cares, but system error handlers such as Fedoras abrt will notice and report https://bugzilla.redhat.com/show_bug.cgi?id=596594 .

http push: break infinite recursion on failure with Python 2.6.5 (issue2179) Python 2.6.5 will keep resetting the retry count on redirects, for example when the server returns 401 on failing auth (like google code currently does). We stop the endless recursion by not resetting the count. http://bugs.python.org/issue3819 introduced the regression with Python 2.6.5. http://bugs.python.org/issue8797 discusses a fix which might make it to 2.6.6 and 2.7.0.

pager: respect HGPLAIN Pager shouldn't be enabled for scripting use.

patchbomb: reduce number of opts.get calls Rename outgoing() function to getoutgoing() analogous to getbundle() etc. to avoid name conflict.

parser: improve infix error checking (spotted by timeless)

transplant: when reading journal, treat only lines starting with "# " special like patch.extract() does

revrange: fix up empty query again

revset: add some tests

Explain trust near hgrc in config help

test-import: test git patch import with strip Tests revision 0429d0d49f92

revset: fix up contains/getstring when no args passed

revrange: attempt to parse old-style queries as a first pass

revset: allow extended characters in symbols

i18n: fix translation of empty paragraphs

extensions: recommend against using wrapfunction for repo methods Instead, all extensions should use the "dynamic subclass" trick: subclass repo.__class__ and then replace repo.__class__ with your new subclass. This avoids conflicts that happen when one extension uses wrapfunction and another uses subclassing to extend the same method of localrepository.

i18n-zh_TW: split messages into paragraphs

i18n-zh_CN: split messages into paragraphs

i18n-sv: split messages into paragraphs

i18n-pt_BR: split messages into paragraphs

i18n-ja: split messages into paragraphs

i18n-it: split messages into paragraphs

i18n-fr: split messages into paragraphs

i18n-el: split messages into paragraphs

i18n-de: split messages into paragraphs

i18n-da: split messages into paragraphs

Merge with hg-i18n

i18n: translate each paragraph separately Makes translation work easier by reducing message sizes and avoiding invalidating whole messages on small changes or additions to the original text.

i18n: script for splitting large messages on .po/.pot files With fixes and heavy refactoring by Martin Geisler.

i18n: patch polib.unescape Patch submitted to upstream as rev b9174a342092 in http://bitbucket.org/mg/polib/

i18n: import polib 0.5.2 (rev b0ab301cfdcc)

i18n-da: remove spurious \n

revset: nicer exception for empty queries

commands: advertise "hg help revsets" in help for log

revset: all your error messages are belong to _

help: new revsets topic Based on a patch by timeless which in turn is based on http://selenic.com/pipermail/mercurial-devel/2010-June/021638.html

Merge with main

Ignore mercurial.egg-info build output

bookmarks: add support for push --bookmark to export bookmarks

bookmarks: add support for pull --bookmark to import remote bookmarks

patch: inline small, single-use 'write' function

patch: inline small, single-use 'close' function

mq: __str__ falls back to __repr__

bookmarks: update known bookmarks on the target on push

bookmarks: pull known bookmarks from server that are newer

bookmarks: add pushkey server-side support

pushkey: add debugpushkey command for testing

pushkey: add http support pushkey requires the same permissions as push listitems requires the same permissions as pull

pushkey: add ssh support

pushkey: add localrepo support

pushkey: add pushkey core

sshrepo: sort arguments All current commands have zero or one args. Future multi-arg commands will want args to appear in a deterministic order.

mq: make 'qdelete <patchidx>' work again. This just backs out 1abd9442727c (a minor code cleanup that accidentally broke qdelete) and adds a test.

bdiff.c: Added support for py3k. This patch adds support for py3k in bdiff.c. This is accomplished by including a header file responsible for abstracting the API differences between python 2 and python 3.

diffhelpers.c: Added support for py3k. This patch adds support for py3k in diffhelpers.c. This is accomplished by including a header file responsible for abstracting the API differences between python 2 and python 3.

base85.c: Added support for py3k. This patch adds support for py3k in base85.c. This is accomplished by including a header file responsible for abstracting the API differences between python 2 and python 3.

parsers.c: Added support for py3k. This patch adds support for py3k in parsers.c. This is accomplished by including a header file responsible for abstracting the API differences between python 2 and python 3.

mpatch.c: Added preliminary support for py3k. This is done by including the util.h header file, that defines appropriate macros according to the current python version.

osutil.c: Support for py3k added. This patch adds support for py3k in osutil.c. This is accomplished by including a header file responsible for abstracting the API differences between python 2 and python 3. listdir_stat_type is also changed in the following way: A previous call to PyObject_HEAD_INIT is substituted to a call to PyVarObject_HEAD_INIT, which makes the object buildable in both python 2.x and 3.x without weird warnings. After testing on windows, some modifications were also made in the posixfile function, as it calls PyFile_FromFile and PyFile_SetBufSize, which are gone in py3k. In py3k the PyFile_* API is, actually a wrapper over the io module, and code has been adapted accordingly to fit py3k.

util.h: Utility macros for handling different Python APIs. If we are in py3k, a IS_PY3K symbol is defined. Apart from that, byte strings use the API defined in Python 2.6+ (_?PyBytes_.*). For Python < 2.6, the bytes API is defined accordingly for mercurial usage (shameless copy from bytesobject.h from Python's code). Some macros were backported from 2.6, as inspired by rPath's pycompat.h.

relink: ensure deterministic directory walk in collect

help: add "glossary" topic Joint work with Vishakh Harikumar, Pradeepkumar Gayam, David Champion, Mark Booth, timeless, Matt Mackall, Heinrik Stuart, Greg Ward, and Martin Geisler.