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.