Merge with crew-stable

convert/bzr: handle files replaced by directories (issue1623)

convert/mtn: mtn does not record timezones, mark dates as UTC (issue1624)

convert/mtn: handle directory move into moved directory (issue1619/3)

convert/mtn: handle files moved in a moved directory (issue1619/2)

i18n: update Brazilian Portuguese translation - msgmerge with hg 18710802cd49 - most remaining messages translated

i18n: add Brazilian Portuguese translation

convert/svn: support more OS specific auth providers via svn 1.6 API

cmdutil: return boolean result directly in want function

util: return boolean result directly in util.binary

remove unnecessary outer parenthesis in if-statements

run-tests: fix error when timeout occurs

i18n-de: Help tests in commands.py done, still working on option description

i18n-de: More translations of commands.py (revert, status, unbundle, ...)

add a deprecation warning for gc based lock releasing

switch lock releasing in the extensions from gc to explicit

document the locking pattern in localrepo.status

switch dircleanup in mercurial.hg.clone from gc based to explicit

switch lock releasing in the core from gc to explicit

made repo locks recursive and deprecate refcounting based lock releasing all locks should use the explicit lock.release mercurial.lock.lock.__del__ handles unwrapping recursive locks localrepo.lock/wlock are still using weakref in order to keep backward compatibiltiy to releasing locks via garbage collection by ensuring the release on __del__

run-tests: fix -jN broken by 60a9e3cf0cf4

Merge with stable

Merge with crew-stable

Merge with crew-stable

Merge with crew

Merge with crew-stable

convert/mtn: handle subsecond commit dates (issue1616)

Merge with crew-stable

convert/mtn: handle new files in moved directories (issue1619) Reported and investigated by Paul Aurich <paul@darkrain42.org>

keyword: set overwrite message only once, not for each file

run-tests: removed some underscores (coding style)

run-tests: upper-case global PYTHON variable

run-tests: reduce global variables set by parse_args().

run-tests: factor out main(); reduce use of globals a bit.

run-tests: move bits of main program so it's all at the bottom.

run-tests: move _hgpath() up so it's not in the middle of the main program.

run-tests: factor out parse_args(). Clarify use of globals a bit.

patch, i18n: avoid parameterized plural

keyword, i18n: avoid untranslated strings as message parameters

commands, i18n: avoid untranslated strings as message parameters

bookmarks: fix typo

convert: fix typo

i18n: the message should not contain '\r' reported by bardy <bardiku@gmail.com>

Add comment about this test failing under bzr 1.13 due to a bug in bzr.

test-highlight: adapt output to latest pygments keeping backwards compatibility

merge with stable

issue1577: fix broken test by assuming less about CVS output. Specifically, output of "cvs ci" varies unpredictably across CVS versions, so any test that includes the output of "cvs ci" is doomed to fail some of the time. This fixes that by discarding the output of "cvs ci".

cvsps: make debugging easier by adding __repr__() methods.

cvsps: update docstring for changeset class.

merge with crew

manifest: improve error message about newlines in filenames Include the offending filenames in the error message. Now this error message is consistent with the same error issued by dirstate.py (although there is still duplicate code).

help texts: write command line switches as -a/--abc

Update qimport help explaining how to read a patch from stdin (Issue371)

convert: Improved svn source detection.

strip: make repair.strip transactional to avoid repository corruption Uses a transaction instance from the local repository to journal the truncation of revlog files, such that if a strip only partially completes, hg recover will be able to finish the truncate of all the files. The potential unbundling of changes that have been backed up to be restored later will, in case of an error, have to be unbundled manually. The difference is that it will be possible to recover the repository state so the unbundle can actually succeed.

transaction: support multiple, separate transactions Solves that committed (closed) transactions may linger and be returned on subsequent transaction calls, even though a new transaction should be made, rather than a new nested transaction. This also fixes a race condition with the use of weakref.

transaction: only delete journal on successful abort/commit This solves that the journal file was always deleted when the transaction was deleted, no matter whether the abort (rollback) succeeded or not. Thus, never supporting a hg recover. The journal file is now only deleted on close (commit) or a successful abort.

i18n-de: synchronised with hg.pot

inotify: Do not raise TypeError when client.query returns None When something went wrong in client.query, it returns None. If inotify.debug=True, we will attempt in this case a zip(A, None, B), which would raise a TypeError.

inotify: Simplifying init code simplifying retry = False try: try: doA() retry = True except X: doB() retry = True except: doC() pass if retry: doD() -- into -- try: try: doA() except X: doB() except: doC() pass else: doD()