addremove: normalize some variable names

findrenames: drop unused argument defaults

zsh completion: update bisect for builtin syntax

zsh completion: add hg branch

zsh completion: add hg branches

zsh completion: basic merge support

zsh completion: disable defaults and verbose output when completing If ui.verbose is set to True in hgrc, commands used to provide completions would yield bad results. For example, qpush completion would include the patch numbers and statuses as returned by qunapplied -v, instead of just the patch names. Defaults are also disabled when completing to prevent similar issues when an option is set that changes a command's output.

Merge with mpm

zsh completion: include guarded patches in qdelete

Merge with i18n

i18n-pt_BR: synchronized with eac360045ba4

i18n-fr: translation of the extensions help topic

i18n-fr: translation of help screen strings

i18n-fr: translation of the patchbomb extension

i18n-fr: add a glossary and recommendations

i18n: add French translation file

i18n-jp: translation update for 288ba6d6c5c7 this revision consists of contribution by: Muraoka Yusuke<yusuke.muraoka@gmail.com> Tadashi Jokagi <elf@elf.no-ip.org> UENISHI Kota <kuenishi@gmail.com> Yuki KODAMA <endflow.net@gmail.com> FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

i18n-da: translated 50% This change translates many of the strings from the convert, inotify, fetch, gpg, and transplant extensions.

convert: do not ask for translation of "%s %s"

i18n-da: translated cmdline help strings

i18n-da: translated log and some mq commands

i18n-da: change "arkiv" to "depot"

i18n-da: sync with 288ba6d6c5c7

i18n-zh: sync with 288ba6d6c5c7(2009-06-24 04:43:09+08:00)

extensions: catch OSError when hgext is not accessible (issue1708) Temporary workaround for issue1708: on win32 with py2exe, hgext is distributed inside a zipped file (which anyway does not contain the py files from which we ought to extract the documentation strings), which raises a WindowsError (subclasses OSError). This means that on such platforms the list of disabled extensions won't be available. Real fix postponed for after Mercurial 1.3.

color: wrap qdiff/qseries after all extensions are loaded

atom: use urlescape in filelog's file link

Relicense zsh completion script under zsh license. Steve agreed some time ago.

Merge with crew

Update test output for e67e5b60e55f

commands: improve bundle compression methods description

keyword: improve help for kwfiles - just use "files" instead of "filenames" (analogous to "hg status -h") - reference the extension help wrt pattern configuration Kudos to timeless for helpful suggestions.

keyword: lowercase status flags of untracked files in kwfile output Document the flags and their meanings in the command help (thanks to timeless for bringing this to my attention).

help: branch heads have no descendants, not no children

Branch heads should not include "heads" that are ancestors of other heads. For example, given 1 (branch a) -> 2 (branch b) -> 3 (branch a) I expect "hg heads a" to show only 3. Discovered by running hg heads HEAD on the mutt repo, where older clients committed default on top of HEAD.

inotify: server: remove wpath method Only called once. And can be simplified to an easy oneliner.

inotify: return version to client even when not matching Old clients are expecting a version string even in case of mismatch, otherwise they get stuck.

windows: fix use of undefined exception (issue1707) This fixes the implied reliance on pywin32 and the win32 module. This also fixes a regression in ae275ad46bd0 that made Mercurial unusable without pywin32.

keyword: improve help for kwfiles

highlight: remove author name from docstring I don't feel this should be part of the documentation. The name of the original author can of course still be found with 'hg log'.

mq: standardize qfinish cmdline help string

inotify: OPT -> OPTION in cmdline help string

hgk: standardize cmdline help strings

color: don't blow up if configured with unknown color (just warn).

bookmarks: Change references to "repo" by references to "self" (issue1611) Using "repo" instead of "self" inside bookmark_repo methods was causing a circular reference and, thus, a memory leak. It has been detected because the method bundlerepository.__del__ is never called, therefore leaving dangling uncompressed bundles inside .hg subdirectory.

run-tests: use os.path.realpath() to find hg's setup.py. Needed for running out-of-tree test suites without --with-hg/--local.

Make RPM spec in contrib more aligned with the one from Fedora This is mostly syntactical changes which make the real differences more obvious when looking at a diff. contrib/mergetools.rc is now also installed and enabled by default.

addremove: drop some silly variable assignments