convert/svn: fix broken symlink renames in svn sink

rename: do not overwrite existing broken symlinks

patch: do not overwrite broken untracked symlinks

patch: fix target when patching broken symlinks (issue2368)

tests: fixup tests using unzip -l

tests: add hack to avoid problem with graphlog in unified tests

bundle: encapsulate all bundle streams in unbundle class

bundle: move chunk parsing into unbundle class

bundle: get rid of chunkiter

bundle: refactor progress callback This lets us eliminate the chunk iterator so we can have the bundle class parse headers.

bundle: make getchunk() a method

bundlerepo: use bundle objects everywhere

bundlerepo: drop unused close() method

bundle: make unbundle object seekable This is only for uncompressed bundles used by bundlerepo.

bundle: push chunkbuffer down into decompress We replace the fixup iterator with a file-like object so that uncompressed file streams can be passed end to end through the stack.

tests: fix a bunch of pointless #s in unified tests

tests: exit 0 no longer needed on unified tests

tests: update debugcomplete output

merge with abuehl

tests: unify some of test-mq*

subrepo: add support for 'hg archive'

subrepo: introduce files and filedata methods for subrepo classes

merge with stable

revset: handle re.compile() errors in grep() Raise error.ParseError instead of allowing re.error to bubble up.

archive: set date to 1980 for very old zip files The zip file format stores the date using "MS-DOS format" which apparently means that they use 1980 as their epoch. Python's zipfile module emits deprecation warnings of this form /usr/lib/python2.6/zipfile.py:1108: DeprecationWarning: struct integer overflow masking is deprecated self.fp.write(zinfo.FileHeader()) /usr/lib/python2.6/zipfile.py:1108: DeprecationWarning: 'H' format requires 0 <= number <= 65535 self.fp.write(zinfo.FileHeader()) /home/mg/src/mercurial-crew/mercurial/archival.py:169: DeprecationWarning: struct integer overflow masking is deprecated self.z.close() /home/mg/src/mercurial-crew/mercurial/archival.py:169: DeprecationWarning: 'H' format requires 0 <= number <= 65535 self.z.close() when it is given such old timestamps. This fixes this by silently clamping the date to 1980.

Merge with stable

test-eol-update: record new results as correct Changeset 0852da25a31b changed the result of this test. The 'hg update 0' command, which causes a merge of modified a.txt, now leaves a.txt in the EOLN format specified by .hgeol as it was committed in revision 0. Previously, it used the .hgeol contents from the working directory before the update.

tests: add exit codes to unified tests

merge with stable

merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C' Without specifying the parent revision of the working copy, users will update to tip, which is most likely the other head they were trying to merge, not the revision they were at before the merge.

transplant: maintain list of transplants in dict

tests: unify test-hgignore

win32: update build instructions with correct CRT version As stated in http://msdn.microsoft.com/en-us/library/cc664727.aspx, when you compile an application with MSVC 2008 SP1 it is bound by default to the original CRT version (9.0.21022.8). This is the case for Python 2.6 up to 3.1. If the wrong CRT version is embedded in the Inno Setup installer, with a PC that does not have the MSVC 2008 redistributable package installed, hg will refuse to launch with an error: "the system cannot execute the specified program".

merge with crew

merge with crew

Merge with stable

eol: setup the repo.ui in reposetup() This fixes problems some have reported using the eol extension together with TortoiseHg. It ensures the ui associated with the repository has the preupdate.eol hook configured.

tests: unify test-hardlinks-safety

tests: unify test-extra-filelog-entry

tests: unify test-extdiff

tests: add test for bookmark push/pull

bookmarks: set VALUE in push/pull

tests: unify test-username-newline

tests: unify test-url-rev

tests: unify test-update-renames

tests: unify test-rename-merge1

merge with crew

clone: only use stream when we understand the revlog format This patch fixes issues with stream cloning in the presense of parentdelta, lwcopy and similar additions that change the interpretation of the revlog format, or the format itself. Currently, the stream capability is sent like this: stream=<version of changelog> But the client doesn't actually check the version number; also, it only checks the changelog and it doesn't capture the interpretation-changes and flag-changes in parentdelta and lwcopy. This patch removes the 'stream' capability whenever we use a non-basic revlog format, to prevent old clients from receiving incorrect data. In those cases, a new capability called 'streamreqs' is added instead. Instead of a revlog version, it comes with a list of revlog-format relevant requirements, which are a subset of the repository requirements, excluding things that are not relevant for stream. New clients use this to determine whether or not they can stream. Old clients only look for the 'stream' capability, as always. New servers will still send this when serving old repositories.

localrepo: factor out requirement application and write

merge with stable

merge with i18n

merge with i18n

l10n: starting to unify the old translations New status: 1525 messages complete with 135 fuzzies and 621 untranslated. Transmitted-via: Transifex (www.transifex.net).

l10n: translations: env. variables / templating system (DE) New status: 1517 messages complete with 134 fuzzies and 630 untranslated. Transmitted-via: Transifex (www.transifex.net).

l10n: added some new translations New status: 1443 messages complete with 130 fuzzies and 708 untranslated. Transmitted-via: Transifex (www.transifex.net).

i18n-pt_BR: synchronized with 0f6164806283

tests: unify test-default-push

tests: unify test-clone-update-order

tests: unify test-debugrename

tests: unify test-confused-revert

tests: unify test-command-template

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