fetch: fix newheads calculation (issue2047)

Make annotate --follow an alias for -f/--file to behave like in older versions Since 98a0421b9e52 annotate follows copies/renames by default, but the output of e.g. "annotate --follow --number" should not change without some deprecation time.

win32/hgwebdir_wsgi: clarify copyright license

store: only add new entries to the fncache file Newly added fncache entries were not added to the in-memory cache, making it possible for 'hg convert' to cause duplicates in .hg/store/fncache. Duplicates in the fncache file are harmless, but excessive numbers of duplicates from large converted repositories may slow down execution speed considerably.

Updated test output of test-convert-baz after f2618cacb485

trailing spaces (and one stray tab)

Merge with default

Merge with stable

add wsgi script for Microsoft IIS with isapi-wsgi

doc/ja: remove old Japanese man page translations They were added way back in 2005 and haven't been updated since. They are no longer referenced by the Makefiles at upper levels and have not been shipped with a recent version of Mercurial.