tests/run-tests: avoid C:/ in arguments MSYS replaces C:/... in arguments with C;... as it interprets the C:/ as a colon separated POSIX path list. The colon is replaced with ; (path separator on Windows) according to http://www.mingw.org/wiki/Posix_path_conversion So we must not replace \ with / for neither $TESTTMP nor $TESTDIR, but we have to keep replacing \ with / for the Popen4 call of function hghave. If we don't do the latter, test-run-tests.t will fail with $ python run-tests.py --local test-run-tests.t --- C:\Users\adi\hgrepos\hg-main\tests\test-run-tests.t +++ C:\Users\adi\hgrepos\hg-main\tests\test-run-tests.t.err @@ -70,6 +70,7 @@ tested #else $ echo skipped + skipped #endif #if false An additional tweak in test-ssh.t is needed that globs away an encoded path, as it can't be translated back to $TESTTMP, because the backslashes in the output have been already encoded as %5C. This patch makes test-ssh.t pass in MSYS on Windows.

test-commit: remove extra cd .. This specific cd .. leaves the base directory of the test ($TESTTMP). Removing it avoids that test artifacts (e.g. files) are created outside of the base directory.

help: test keyword search in translated text. Tests that help keyword search is able to search the translated help text when using a non-English language.

test-mq-subrepo-svn: enable for Windows

test-convert-git: remove the read-only attribute of repository files Git object files are stored read-only in the filesystem. Trying to remove a read-only file on windows will fail with access denied, so we have to make them writeable before they can be removed.

test-convert: disable autocrlf for git Git might have autocrlf=true as a global or default setting, especially on windows. That is not expected in the tests and can cause + warning: LF will be replaced by CRLF in d/b. + The file will have its original line endings in your working directory. Explicitly setting it false will make the test pass in some setups - but still not out of the box.

tests/hghave: implement #if true / #if false For unconditionally testing / skipping a section. Useful for testing the test infrastructure in test-run-tests.t and for debugging/developing tests.

tests/run-tests: use $TMP on Windows (issue3490) This is just a short-term workaround for that issue. More work needs to be done on scmutil.canonpath & friends. $TMP on Windows is specified to be defined, and it has correct casing, so we can use that as the default dir for tempfile.mkdtemp on Windows.

test-import: enable for Windows

test-import: remove unneeded chmod call As pointed out by Mads, setting the x bit on dummypatch.py is unneeded, because it is called with 'python ../dummypatch.py'.

test-log: enable for Windows

test-revert: enable for Windows

merge heads

help: fix 'hg help -k' matching an extension without docs getattr is not needed, __doc__ always exists and defaults to None

revlog: zlib.error sent to the user (issue3424) Give the user the zlib error message instead of a backtrace when decompression fails.

statichttprepo: don't send Range header when requesting entire file When requesting files using statichttprepo.httprangereader, a request for the entire file is sent with a Range: bytes=0- header. This causes problems with web servers such as Cherokee that return an HTTP 416 when an empty file is requested in this way, which in turn cause some repository clone attempts to fail. This patch omits the Range header when the entire file is being requested, which fixes the problem.

merge with stable

merge with i18n

merge with i18n

i18n-ru: synchronized with 4cf41c333e74

update: fix help regarding update to ancestor As pointed out on the user mailing list, hg will update just as happily to an ancestor if there are uncommitted changes as to a descendant.

bugzilla: stop bugs always being marked as fixed in xmlrpc (issue3484) Bugs should only be marked fixed if the comment parser gives them the fixed state. xmlrpc+email got this right, xmlrpc screwed it up.

test-add: enable for Windows

test-addremove: remove bits about con.xml Windows reserved filename warnings are already enough tested in test-add.t. This enables the test for Windows.