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.

relink/progress: Adding progress for collecting stage

relink/progress: Adding progress for pruning stage

merge: when current branch has 1 or > 2 heads, actually abort. Currently merge just prints abort-like messages to stderr and then exits with a misleading status 0 (cleverly disguised as "False"). With this change it raises Abort, just like every other fatal error.

tags: remove inactive debugging code. It was left in just in case things went wrong with the tag cache in Mercurial 1.4, so we could easily crank up the verbosity with a one-line change. There have been no problems in 1.4 or 1.5, so it should be safe to drop this now.

tags: remove the old non-caching implementation of findglobaltags(). It was left behind just in case the tag cache blew up in Mercurial 1.4, so we could easily revert to the non-caching code. There have been no problems with the tag cache in 1.4 or 1.5, so it should be safe to get rid of this code now.

keyword: postpone manifest calculation in kwtemplater.overwrite We can check for file existence in the working directory (needed in case of recording) by simply using the given context and calculate the manifest only when there are in fact candidates for expansion/shrinking.

revset: fix call to ctx.extra() in closed()

p4: fix long line and bad spacing around %

Fix shell quoting on p4 conversion

tests: rename test-merge3 to test-add-remove. It tests that 'hg commit' does not crash if the user removes a newly added file, which has nothing to do with merging.

check-code: reformat long lines

dagparser: replace format with str

check-code: catch format(), introduced in Python 2.6

commands: get rid of generic exception in debugbuilddag

check-code: fix check for any/all function The old check would only detect any/all at the beginning of a line. The regexp was probably just modeled after the preceding regexp which (correctly) finds the 'with' keyword at the beginning of a line. We now complain about 'any(' and 'all(' anywhere in a line, unless it is preceded by 'def'. This allows us to define our own compatibility wrapper in util and use 'util.any(' in the code.

hgext/zeroconf/__init__.py: Separate relative and absolute imports. 2to3 complains when relative and absolute imports are mixed, this fix just separates them on the zeroconf extension. According to 2to3, the other modules are fine.

revset: improve filter argument handling

commands: format is a Python2.6 function