convert: Make P4 conversion cope with keywords, binary files and symbolic links. Convert now handles errors from p4 during conversion more gracefully. If keyword expansion is enabled in a P4 file then keywords will be unexpanded in hg. Added testcase for p4 filetypes and keyword (un)expansion. This testcase ignores UTF and Apple files to avoid binary data. Edited by pmezard: fixed collation issue on OSX

i18n-zh_TW: Traditional Chinese translation

patchbomb: update test output to match 2aff285b902f

patchbomb: do not assume the presence of angle brackets around msg-id RFC 5322 states: "Semantically, the angle bracket characters are not part of the msg-id; the msg-id is what is contained between the two angle bracket characters." Hence it should be correct to pass a message Id with no angle brackets to --in-reply-to. Adding them if missing.

keyword: concise help title

interhg: upgrade comments to online help and improve them Some inspiration taken from the wiki page of the extension.

churn: improve description Thanks to Martin Geisler and timeless for the suggested improvements.

doc: fix regexp for determining the man page section Preceding a .* pattern with an other dot serves little purpose, better anchor the regexp to the start of the file name.

Fix test-convert-cvsnt-mergepoints so it works reliably. Specifically, always run 'cvs commit' with -f option to force commit; add one strategic sleep which seems to be necessary for post-merge clobber-and-commit (-f doesn't force a commit there?).

test-convert-cvsnt-mergepoints: make it work on OS X. - don't create file 'cvs' where directory 'CVS' already exists

test-convert-cvsnt-mergepoints: ignore differences between CVS 1.11 and 1.12. - factor out cvsci function (similar to other test-convert-cvs* scripts) - add filterpath function (also similar to other scripts) - generally munge the output of CVS - add lots of output to make it easier to follow when things go wrong This doesn't make the test pass reliably under CVS 1.11; it just makes it behave the same as under CVS 1.12, i.e. sometimes it passes and sometimes it fails. Failure is more frequent with faster hardware.

Rename CVSNT "mergepoints" test and make it executable. - rename test-convert-cvs-builtincvsps-cvsnt-mergepoints (and related files) to test-convert-cvsnt-mergepoints - this ensures that the test will be run, but does NOT make it pass: in particularly, it fails regularly for me due to the inconsistent behaviour of CVS itself - expect "Branchpoints:" in debugcvsps output

Fixed patch.eol bug that truncated all patched lines to one character Also updated the import-eol test to test with lines longer than one character, and also empty lines.

subrepo: add a test

subrepo: basic push support

subrepo: add update/merge logic

commit: recurse into subrepositories

subrepo: introduce basic state parsing

Make mq, record and transplant honor patch.eol

Add patch.eol to ignore EOLs when patching (issue1019) The intent is to fix many issues involving patching when win32ext is enabled. With win32ext, the working directory and repository files EOLs are not the same which means that patches made on a non-win32ext host do not apply cleanly because of EOLs discrepancies. A theorically correct approach would be transform either the patched file or the patch content with the encoding/decoding filters used by win32ext. This solution is tricky to implement and invasive, instead we prefer to address the win32ext case, by offering a way to ignore input EOLs when patching and rewriting them when saving the patched result.

gpg: add test

gpg: unbreak 02a12835b17e. We need a test.

share: allow dest to default to the basename of source

Merge with crew

bisect: improve --command output - Display tested revisions without --verbose - Display revision number

dirstate: fix typo introduced by 3507f6c7715c

test-bisect: test --command option

bisect: fix traceback when command executable is not found

share: add experimental share extension

add helper function to create shared repos