Matt Mackall <mpm@selenic.com> [Sun, 19 Sep 2010 13:12:45 -0500] rev 12336
bundle: move chunk parsing into unbundle class
Matt Mackall <mpm@selenic.com> [Sun, 19 Sep 2010 12:51:54 -0500] rev 12335
bundle: get rid of chunkiter
Matt Mackall <mpm@selenic.com> [Sun, 19 Sep 2010 12:38:44 -0500] rev 12334
bundle: refactor progress callback
This lets us eliminate the chunk iterator so we can have the bundle class
parse headers.
Matt Mackall <mpm@selenic.com> [Sat, 18 Sep 2010 18:20:34 -0500] rev 12333
bundle: make getchunk() a method
Matt Mackall <mpm@selenic.com> [Fri, 17 Sep 2010 19:24:29 -0500] rev 12332
bundlerepo: use bundle objects everywhere
Matt Mackall <mpm@selenic.com> [Fri, 17 Sep 2010 19:03:13 -0500] rev 12331
bundlerepo: drop unused close() method
Matt Mackall <mpm@selenic.com> [Fri, 17 Sep 2010 19:02:32 -0500] rev 12330
bundle: make unbundle object seekable
This is only for uncompressed bundles used by bundlerepo.
Matt Mackall <mpm@selenic.com> [Fri, 17 Sep 2010 19:02:26 -0500] rev 12329
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.
Matt Mackall <mpm@selenic.com> [Fri, 17 Sep 2010 17:03:08 -0500] rev 12328
tests: fix a bunch of pointless #s in unified tests
Matt Mackall <mpm@selenic.com> [Fri, 17 Sep 2010 17:03:04 -0500] rev 12327
tests: exit 0 no longer needed on unified tests
Matt Mackall <mpm@selenic.com> [Mon, 20 Sep 2010 15:33:12 -0500] rev 12326
tests: update debugcomplete output
Matt Mackall <mpm@selenic.com> [Mon, 20 Sep 2010 15:31:48 -0500] rev 12325
merge with abuehl
Adrian Buehlmann <adrian@cadifra.com> [Sun, 19 Sep 2010 23:42:18 +0200] rev 12324
tests: unify some of test-mq*
Martin Geisler <mg@aragost.com> [Mon, 20 Sep 2010 15:46:17 +0200] rev 12323
subrepo: add support for 'hg archive'
Martin Geisler <mg@aragost.com> [Mon, 20 Sep 2010 15:44:30 +0200] rev 12322
subrepo: introduce files and filedata methods for subrepo classes
Martin Geisler <mg@aragost.com> [Mon, 20 Sep 2010 15:42:58 +0200] rev 12321
merge with stable
Brodie Rao <brodie@bitheap.org> [Fri, 17 Sep 2010 10:21:02 -0500] rev 12320
revset: handle re.compile() errors in grep()
Raise error.ParseError instead of allowing re.error to bubble up.
Martin Geisler <mg@aragost.com> [Mon, 20 Sep 2010 15:33:39 +0200] rev 12319
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.
Steve Borho <steve@borho.org> [Fri, 17 Sep 2010 12:45:13 -0500] rev 12318
Merge with stable
Steve Borho <steve@borho.org> [Fri, 17 Sep 2010 12:44:35 -0500] rev 12317
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.
Matt Mackall <mpm@selenic.com> [Thu, 16 Sep 2010 17:51:32 -0500] rev 12316
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com> [Thu, 16 Sep 2010 16:12:26 -0500] rev 12315
merge with stable
Brodie Rao <brodie@bitheap.org> [Sun, 12 Sep 2010 18:05:53 -0500] rev 12314
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.
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Thu, 16 Sep 2010 16:00:29 +0200] rev 12313
transplant: maintain list of transplants in dict
Adrian Buehlmann <adrian@cadifra.com> [Wed, 15 Sep 2010 22:18:46 +0200] rev 12312
tests: unify test-hgignore
Pascal Quantin <pascal.quantin@gmail.com> [Thu, 16 Sep 2010 11:36:38 +0200] rev 12311
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".
Matt Mackall <mpm@selenic.com> [Thu, 16 Sep 2010 16:07:22 -0500] rev 12310
merge with crew
Matt Mackall <mpm@selenic.com> [Thu, 16 Sep 2010 16:05:00 -0500] rev 12309
merge with crew
Steve Borho <steve@borho.org> [Wed, 15 Sep 2010 17:48:03 -0500] rev 12308
Merge with stable
Steve Borho <steve@borho.org> [Wed, 15 Sep 2010 17:46:51 -0500] rev 12307
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.