convert should use default value when CVS_RSH is not set, that value being 'ssh'.

hgk: display branch name in diff header

Display debugstate dates as '%Y-%m-%d %H:%M:%S'

merge: add a bit more sanity to divergent copy checks

keyword: test that expansion is done filewise Checks issue fixed in 2a66138c5e7e.

Solaris compatibility fixes for test-keyword: - do not use /bin/false (yields 255 instead of 1) - do not use "cd -", simply use "cd .." instead.

convert: separate trunk detection from branch layout detection In some subversion repositories, trunk is present but no branches are used. The current code is assuming that both trunk and branches must exist before adding trunk's head to the heads list. It's just better to separate the branch layout stuff from the trunk one.

Merge with crew-stable

patch: handle empty vs no file in git patches (issue906)

patch: remove CRLF when parsing file names

Merge with crew-stable

Document --base null in bundle help

Merge with mpm

util_win32: implement posixfile_nt.writelines() Used by the keyword extension.

New extension to support problematic MBCS on Windows. The aim of this extension is to clear the problem related to having 0x5c in 2nd byte of encoded bytes. So this extension is usefull for: * Japanese Windows user shift_jis encoding. * Chinese Windows user using big5 encoding. To use this extension, simply enable it without any customization. Note that some important python built-in functions and mercurial functions are altered for this extension to convert argument if need to handle MBCS.

Fix not to use os.sep directly. This change is intended for MBCS support.

Add util.splitpath() and use it instead of using os.sep directly. This change is intended to allow hooking splitpath() by win32mbcs extension for MBCS support.

Add endswithsep() and use it instead of using os.sep and os.altsep directly. This change is intended to allow hooking endswithsep() by win32mbcs extension for MBCS support.

Use util.normpath() instead of direct path string operation. This change is intended to allow hooking normpath() by win32mbcs extension for MBCS support.

svn: fix copy exception

posixfile_nt: set closed early Exceptions in __init__ may leave us with close undefined in __del__

Don't use the -i option with sed This patch fixes test-keyword on platforms without GNU sed (like OpenBSD).

convert: respect hg.tagsbranch setting

Issue #880: Simple misspelling ('occured') in web error message.

Tweak finddate to pass date directly. Previous implementation was passing (date + "to" + date), which fails when "<" and friends are prepended to the date specifier. Signed-off-by: Mark Williamson <mark.williamson@cl.cam.ac.uk>

adding "prefix" option to "hg serve" (command line and [web] section) allows "hg serve" to serve from a different path than '/' (server root)

Fix XHTML validation error on file diff page. Replaces <div>, a block level element, with <span>, it's inline counterpart, in <pre>, which is also an inline element.

hook: redirect stdout to stderr for ssh and http servers

convert: add commandline.xargs(), use it in svn_sink class Introduce commandline.xargs() to limit argument list with respect to ARG_MAX bytes. If no ARG_MAX information available - use POSIX required minimum of 4096 bytes. Under Windows, while actual argument list length is limited to 32k, shells impose their own limits on command line length, down to 2047 bytes for cmd.exe under Windows NT/2k and about 2500 bytes for older 4nt.exe. See http://support.microsoft.com/kb/830473 for details about cmd.exe limitations. Since ARG_MAX is limit for argument list and environment, we reserve half of it and one byte for environment variables. This way with default ARG_MAX (4096 bytes) we get value 2047 bytes which is OK for Windows too.

keyword: fix some doc strings; update copyright