mq/qqueue: --list does not print (active) with --quiet For scripting purposes, it can be convenient to get a simple listing of available queues, without indication of the active one. --quiet documentation change removed by Patrick Mézard.

Merge with stable

templatefilters: make json filter handle multibyte characters correctly It aims to fix javascript error of hgweb's graph view in Japanese 'cp932' encoding. 'cp932' contains multibyte characters ending with '\x5c' (backslash), e.g. '\x94\x5c' for Japanese Kanji 'Noh'. Due to json filter escapes '\' to '\\', multibyte string ending with '\x5c' is translated to "xxx\", resulting javascript parse error on a web browser. This patch changes json() to pass unicode to jsonescape(). Unicode decoding error handler changed to 'replace' by Patrick Mézard.

check-code: added a check for calls to the builtin cmp function

manifest: removed usage of the global cmp function Py3k doesn't have a global cmp() function, making this call problematic in the py3k port. Also, calling cmp() here is not necessary, since we only want to know if the two values are equal. A check for equality perfect in this case and this patch does that.

tests: run check-code.py on working directory files If we insist on Mercurial sources to pass check-code.py, let automate the process and make it part of the tests. Objections?

minor style fix: hgext/rebase.py:157 -- line too long found by a run of check-code

zsh completions: add qpush --move option

Merge with stable

chunkbuffer: use += rather than cStringIO to reduce memory footprint This significantly refactors the read() loop to use a queue of chunks. The queue is alternately filled to at least 256k and then emptied by concatenating onto the output buffer. For very large read sizes, += uses less memory because it can resize the target string in place.

httprepo: decompress stream incrementally to reduce memory usage

verify: initialize rp variable in case we hit out of memory

merge: drop reference to file contents after write This reduces memory usage on large consecutive gets.

revlog: drop cache after use to save memory footprint If we reconstruct back to back large versions, we need to drop the cache first to avoid doubling memory usage.

verify: reduce memory footprint when unpacking files By never holding a reference to the unpacked string, we avoid holding two consecutive large files in memory.