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