Use the mercurial i18n infrastructure in the purge extension

Print relative names in the purge extension

Merge with crew

Break core of repo.tag into dirstate/hook-free repo._tag for convert-repo

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 stable

merge: fix renaming of subdirectories under renamed directories

Merge with crew

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

Merge with crew

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

Merge with crew

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.

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

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.

mq: propagate the return error of pop

util_win32.py: fix user_rcpath Fixes issue504.

Combined the two os_rcpath methods into a single one near rcpath in mercurial/util.py The os_rcpath method delegates to system_rcpath and user_rcpath from the different platform implementations.

merge with crew-stable

hgweb: catch util.Abort raised by addchangegroup Right now, if a pretxnchangegroup hook fails, we send some HTML error message to the client and the transaction is not rolled back (issue499). Catching util.Abort allows us to send a decent message to the client and for some reason makes the rollback complete. This patch is not perfect since it doesn't fix the reason why the transaction wasn't rolled back (maybe some circular references?). Also, the transaction is aborted only after we've sent the response back to the client and the "transaction aborted" message ends up in the logs of the web server.

notify: don't try to fix addresses if notify.domain is not set

mail.py: don't try to use TLS if python doesn't have SSL support This should hide the traceback from issue501.

git patches: handle renames of binary files

hgweb/server.py: use hg.repository to create a repo object

qclone: don't call reposetup manually