merge with crew-stable

url: fix use of non-int port in https connections (issue1725) Versions of Python before 2.6 cannot automatically convert a given port number to an integer, so we add a conversion to coerce the given input to an int.

doc/Makefile: let hg1.gendoc.txt depend on gendoc.py

keyword: use all caps for 'note:' in help string The diff, export, log, and status commands write it as 'NOTE:'.

notify: fix indentation in module docstring

notify: cleanup module docstring

convert: fix inconsistent indentation in help text The sort modes flags and convert.cvsps options were indented while the convert.hg, convert.svn, and convert.p4 options were not. I've now un-indented all of them.

Merge with stable

filectx: add a hex method

win32mbcs: also wrap windows.pconvert()

Use os.path.split() for MBCS with win32mbcs extension.

win32mbcs: look up modules using sys.modules (issue1729) globals()[module] doesn't work for modules inside of packages, such as os.path.

fix memory usage of revlog caches by limiting cache size [issue1639]

keyword: eliminate potential reference cycles from kwrepo - delete kwrepo.commitctx after using the tweaked version - prefer self.hook over repo.hook to avoid nesting Also pass arguments to commit as arbitrary list. Thanks to Simon Heimberg and Matt Mackall for guidance.

convert/cvs: improve error message on unexpected server output.

transaction: fix uncaught ENOENT (issue1724) The opener raises an IOError on errors where transaction expects an OSError.

branch heads: fix regression introduced in e67e5b60e55f (issue1726) For merge nodes it is not adequate to only check a single possible branch head for whether it is an ancestor of the latest head, but it needs to be done for each possible branch head.

subrepo: use hg.repository instead of creating localrepo directly this way, extensions' reposetup will be called, which allows for git subrepos to be handled by hg-git (and I believe the same goes for svn and hgsubversion)

ignore: separate pattern extraction from match compilation hgignore files have slightly different syntax from match objects, e.g. syntax: foo headers, regexp: forms, and re being relre. Put conversion from hgignore syntax into match syntax into a standalone function so that it is easier to validate hgignore hunks externally.

merge with crew-stable

util: remove unused bufsize argument Removed it correctly this time: the subprocess default is 0, not -1 and so we must pass -1 explicitly. Added a comment to that effect.

convert/cvs: improve error message on unexpected server output.

typos: "it's" -> "its"

convert: fixed typo in docstring

Merge OS X performance regression fix

Merge backed out change

Backed out changeset fce065538bcf: it caused a 5x performance regression on OS X

help: wrapped help strings at 78 characters

keyword: collect kwmaps using a generator expression Allowed for Python 2.4.

commands: avoid bad linebreak in addremove docstring