Use only integer part of mtime in workingfilectx.date(), fixes test-context.py Similar to what is done in dirstate.status() (changeset 882e703eaa94) and has to be removed when Mercurial switches to subsecond granularity.

Merge with crew

Merge with crew

Merge with crew

convert-repo: use .git/objects/ rather than .git/HEAD to detect git repos

Don't keep trailing white space in cvs tags

Change a bit cvsps arguments - Force updating the cache - Use internal cvs implementation, reducing overhead - Use quiet mode

Fixed workingfilectx.date() (found by Thomas Waldmann) with test.

merge with crew-stable

test-notify: adapt to sed shipped with MacOS MacOS X' sed does not have the \? repetition operator.

git binary patches: don't print the header for identical files

git binary patches: use hashes to detect identical files

add test for diffing identical binary files

Don't lie that "binary file has changed" Without -a option to "hg diff", mdiff.unidiff reported that "Binary file foo has changed" without even trying to compare things. Now it computes MD5 of old and new files, compares them and makes the conclusion.

add some tests for qpush/qpop error codes

Modify qpush/qpop idempotent operations to return success Modify qpush/qpop such that idempotent instances of the operations return success. That is, repeated qpush -a, qpop -a, qpush patch-name or qpop patch-name will return success. The end goal of each of these operations is to reach a particular state. Whether or not the patches were already applied does not affect that state or operation status. Likewise, be careful to retain the error status on a qpush/qpop without arguments when the end/beginning of the series has been reached.