mq: rename strip --nobackup option to --no-backup (issue2377) Same option name as for hg revert --no-backup. Deprecate strip --nobackup.

mq: consistently use opts.get() to prevent potential KeyError

tests: remove exec bit from .t files

combine tests

merge with stable

color: add win32 support for non-black background This complicates the code a bit, since attributes need to be masked together correctly before they are applied. Perhaps the code should be redesigned at some point, but this works well for now.

i18n: unmark untranslatable string

test-subrepo-recursion: test missing subrepo

incoming: recurse into subrepositories with --subrepos/-S flag As with push and outgoing, the optional source path is ignored for the subrepositories. Fixing this is Issue1852.

incoming: move code from commands to cmdutil This makes it easier to reuse it in a recursive fashion for subrepos.

outgoing: recurse into subrepositories with --subrepos/-S flag As with push, the optional destination path is ignored for the subrepositories, i.e., they are always compared with their default push path. Fixing this is Issue1852.

outgoing: move code from commands to cmdutil This makes it easier to reuse it in a recursive fashion for subrepos.

add: recurse into subrepositories with --subrepos/-S flag

add: move main part to cmdutil to make it easier to reuse

narrowmatcher: propagate bad method The full path is propagated to the original match object since this is often used directly for printing an error to the user.

narrowmatcher: fix broken rel method

patch: break import cycle with cmdutil The patch module imported cmdutil but used it only in updatedir.

patchbomb: show progress when sending emails or writing mbox

patchbomb: consistent code style in getaddrs()

win32: 64-bit Inno Setup installer

win32: update Inno Setup build instructions with up-to-date software

merge with stable

tests: unify test-merge-remove

tests: unify test-merge-prompt

tests: unify test-merge-local

tests: unify test-merge-internal-tools-pattern

tests: unify test-merge-force

tests: unify test-merge-default

tests: unify test-merge-commit

tests: unify test-manifest*

convert/darcs: handle non-ASCII metadata in darcs changelog (issue2354) Given a commit author or message with non-ASCII characters in a darcs repo, convert would raise a UnicodeEncodeError when adding changesets to the hg changelog. This happened because etree returns back unicode objects for any text it can't encode into ASCII. convert was passing these objects to changelog.add(), which would then attempt encoding.fromlocal() on them. This patch ensures converter_source.recode() is called on each piece of commit data returned by etree. (Also note that darcs is currently encoding agnostic and will print out whatever is in a patch's metadata byte-for-byte, even in the XML changelog.)

merge with crew

tests: fix incompatibility with python-2.4 in test-hgweb Thanks to lcantey for catching it.

merge with stable

merge with i18n-default

merge with i18n-stable

i18n-pt_BR: fix a couple of typos

i18n-pt_BR: added messages from crew stable up to 26d86a6cf2af

i18n-ro: merged default

i18n-ro: ongoing translation

i18n: merged in strings from hg cset ce818cf215dc

i18n-ro: ongoing translation

i18n-ro: ongoing translation

i18n-ro: ongoing translation

i18n-ro: ongoing translation

i18n-ro: ongoing translation

i18n-ro: ongoing translation

Continued translation