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()

inotify: files is always a list: 'files or []' is redundant files comes from match.files() : it always returns a list.

Merge with crew-stable

extdiff: preserve execute-bit across copies (issue1562) Bug report and test by Mads Kiilerich <mads@kiilerich.com>

extdiff: merge node and working dir snapshot modes

convert/p4: win32 fixes * cmd.exe does not know single quotes * win32 does not like trailing whitespace very much. Trade test coverage for maintenance time and drop the trailing whitespaces tests.

test-issue1438: make executable

context: fix workingctx.__contains__

run-tests: detect when hghave fails to check for a feature and fail test hghave exitcode != 0 might mean that hghave failed to check for feature avaibility. Detect those cases, and fail the test, instead of skipping it.

hghave: checking that all targets are Exception-free

Add Python 2.6 support to win32 installer With Python 2.6, win32 installer should try to package MSVC9.0 dlls instead of MSVC7.1 dlls

Bundle python dll in win32 installer if present in case hg.exe is generated with the py2exe '-b 2' option instead of '-b 1', python2?.dll is not included in library.zip file and must also be packaged. The file will be integrated in the installer only if it is present in the dist directory. Generating hg.exe with the '-b 2' option is mandatory to avoid a crash when pyreadline is installed.

Win32 installer: add hgrc.5.html and hgignore.5.html links to Start Menu folder

Merge with crew-stable

httprepo: hide password in debug traces too

hide passwords in httprepo error messages

convert/mtn: allow monotone database files as sources

Merge with crew-stable

convert/mtn: record changes from directory renames (issue1587) Bug report and initial path by Pavel Volkovitskiy <int@mtx.ru>

test-convert-svn-sink: rewrite output for svn compatibility Addition by Patrick Mezard <pmezard@gmail.com>: * drop 'kind=' lines from svn 1.6 output

convert/cvs: delay CVS log parsing after initialization (issue1581/2) Source and destination constructors should be fast so configurations issues are hit quickly, including authentication and filemap/authormap/splicemap issues. Delaying might be a problem if the remove side disconnects idle connections while the log is being read. It did not happen when converting openafs repository, where log retrieval took at least 10mn.

convert: better mapfile parsing errors (issue1581/1)

Merge with crew-stable

convert/bzr: fix file rename replaced by a dir case (issue1583) We were not checking entry types, and getting file content was working with directories instead of raising IOError.

purge: fix b777dd8f7836 (remove read-only files) - use try/except to avoid unnecessary work - edit only mode bits

purge: remove read-only files under Windows (issue583) Initial version by Benoit Boissinot <bboissin@gmail.com>