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.