merge: add -S/--show option to review revisions without merging

inotify: Abstract the layer format and sizes to a inotify.common dictionary Instead of having a single possible request format, introduce a dictionary of possible messages in inotify.common

inotify: Coding Style: name classes in lowercase.

inotify: dic.setdefault(k, d) ; v = dic[k] --> v = dic.setdefault(k, d) dict.setdefault sets a default value, but also returns the dict.get result. Getting the value on the next instruction was redundant.

inotify: make mask a class variable since it's instance-independant

inotify: RepoWatcher.updatestatus: document & use meaningful parameter names

inotify: server.walk(): use yield instead of for iterate on subdir when the directory is found, not once all the directories are found, since yield order doesn't matter

context: replace pseudo-set by real set

highlight: updated changed test output It was changed in 783c8c78db86, but I forgot to update it.

byterange: fix import error We must import the module as email.Utils on case-sensitive filesystems.

convert: adding branchmap functionality to convert extension

spartan: break long lines in map file

monoblue: break long lines in map file

gitweb: break long lines in map file

coal: break long lines in map file

paper: break long lines in map file

hgwebdir: refresh configuration periodically The old default behaviour of hgwebdir was to maintain a list of repositories permanently. This interacted badly with persistent application hosting software such as WSGI containers. If a new repository was published, it would potentially never appear in the top-level list of repositories. This change causes the hgwebdir configuration and list of repositories served to be refreshed periodically (at most every 20 seconds).

allow toggling when the cursor is on the correct line instead of just the filename text in hg-commit-toggle-file

coal/paper: Wrap diff in <pre/> In text-mode browsers the diff is otherwise rendered as just one long line per file. Other styles do the same.

cmdutil: replace pseudo-set by real set

i18n-da: fixed unfortunate translation The Danish word "fjern" means both "remote" and "remove".

some modernization cleanups, forward compatibility

Makefile: fix grammar in comment

windows: avoid deleting non-empty reparse points If a hg repository including working directory is a reparse point (directory symlinked or a junction point), then using os.removedirs will remove the reparse point erroneously. This is fixed by only removing directories if they are empty.