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

ui.prompt: Show prompt and selection in non-interactive mode ui.prompt was completely silent in non-interactive mode, unless in verbose mode. It is fine that it chooses the default automatically, but it is confusing that the message and prompt shown interactively can't be found in scripted tests. The prompt and selection is now .write'ed instead of .note'ed.

keyword: make kwdemo more translation friendly

commands: wrap short descriptions in 'hg help' The code for wrapping a single line of text with a hanging indent was duplicated in commands and help -- it's now moved to a new function called wrap in util. The function defaults to a line width is 78 chars, and this un-wraps some command line flag descriptions, hence the test output changes.

commands: add "--" to command line flag in branches docstring

change wiki/bts URLs to point to new hostname

extensions: change descriptions for hook-providing extensions Thanks to timeless and Dave Townsend for advice!

extensions: change descriptions for extensions providing a few commands