Revert convert-repo changes

fix hgrc doc hook descriptions.

hooks: distinguish between locally committed and incoming changes. "commit" hook is now for locally committed changes only. "incoming" is for changes pulled, pushed, or unbundled into local repo.

Allow callers to pass in the dirstate lock in most localrepo.py funcs. This makes it possible to take the lock once and commit a large number of patches, without having to read and write the dirstate for each patch.

revlog.strip should clear the chunkcache The chunkcache isn't valid after a strip, it needs to be cleared out.

Show "(No help text available)" for commands without doc string. Currently this only occurs with "hg help qcommit" from mq extension.

Create default commit message in a more pythonic way.

Removed "HG: manifest hash" line from commit message.

Put the empty line in commit text above the branch merge line.

Run commit message editor in the repo root (like hooks). This makes the hgeditor script work with hg commit -R path/to/repo

add changenav at bottom of page if one reads through the changelog and wants to go to the previous or next page one needs the navigation links at the bottom, not at the top of the page

display revision numbers revision numbers are useful for orientation when browsing through the changelog

fix changenav for maxchanges != 10 for maxchanges = 25 the changelog navigation had a minimum stepsize of 30; try to calculate more useful navigation steps

add --mbox output to patchbomb add option to save generated mails in an mbox file for later processing with formail, instead of sending them directly

hgmerge: various cleanups Details: - put temporary file names into variables - make all temporary file names end with random part - cleanup FileMerge handling - do not use hardlinks in FileMerge change test (breaks on FAT) - try harder to keep file mtime unchanged in case of failed merge

hgmerge: add cleanup functions This patch adds functions cleanup, success and failure. The last two of these should be used instead of exit. Current code was changed to use them. It also moves $HGTMP to the top of the file (it's used in the cleanup function), changes the comment and removes now unneeded trap in the diff+patch merge.

hgmerge: add and use more tool variables This patch adds even more customisable variables with tool paths. Also moves $FILEMERGE where it belongs.

Update copyright notice

Merge with crew

Merge with Peter van Dijk

remove escaping from decriptions on repo index page

Added raw view for file annotate in hgweb.

hgweb/templates: remove unused vars from map-raw annotateline contains html and it is unused filenodelink is unused but should be defined

hgweb/templates: no need to escape the '<' '>' and '&' in raw templates

Removed executable bit from patchbomb extension.

Update version strings and add release notes to Windows specific files

Fall back to asciidoc6 html backend if html4 doesn't work. This reenables building documentation on Debian sarge, which broke after 9346a7fb3fe2.

Reverted name change (mercurial -> Mercurial) from dd5085897010.

merge with crew.

make stuff for macos x binary package. it is now easy to make prebuilt binary for macos x. i have no hosting space. i hope someone else can make binaries.