check-code: add some basic support for unified tests

test-subrepo-recursion: sort archive output for portability

Merge with crew

Merge with stable

context: fix filectx.undelete() (issue2388)

tests: fix hgweb template change

Merge with crew

Restore lexists() changes lost in e0ee3e822a9a merge

tests: fix hgweb template change

merge with stable

merge with crew

hgweb: be consistent with the background highlighting on closed branches (Issue2386) The coal and paper web themes will highlight closed branches as a visual cue to the user. This patch makes the other two themes constistent. For users with difficulty differentiating colors, it would be better to split out closed branches to a new table or optionally hide them.

mq: fix the deprecation comment for qsave & qrestore. Changeset bcf90e712dc3 deprecated qsave and qrestore. In the deprecating comment, users were referred to 'rebase --mq' which -- at the time the message was written -- didn't exist. Currently, on the default branch, rebase *does* take a '--mq' option, but it probably doesn't do what Dirkjan expected it to do when he wrote the message. In the original, deprecating commit, little context was provided as to why this change was made. Based on my recollection, concensus at the Paris Sprint in February 2010 was that one of the problems with MQ was that it exposed far too many commands. Notable among these were qsave & qrestore: very few core developers understood what they did and even fewer (none, IIRC) actually used them. However, they couldn't be removed; not only do the usual backwards compatibility reasons apply, but the hg book refers to them.

revsets: reduce cost of outgoing in the optimizer

test-convert-hg-startrev: enable convert.hg.saverev.

transplant: fix var name conflict introduced by 2912881c2a98

bundle: fix shrink-revlog bundle usage

bundlerepo: restore close() method

tests: drop final true command from unified tests

Merge with stable

Use lexists() instead of exists() where appropriate

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