Mercurial > evolve
view debian/changelog @ 1209:fa35aeb64d32 stable
evolve: prevent a crash in httpclient_pushobsmarkers() when pushing
I've been running into a crash when pushing from my hg repo in a Fedora 16 VM to
Win7 running 'hg serve', even with extensions disabled on both sides:
../hg push -r . pc
pushing to http://192.168.1.4:8000/
searching for changes
no changes found
pushing 2 obsolescence markers (263 bytes)
** unknown exception encountered, please report by visiting
...
File "hg-evolve/hgext/evolve.py", line 2482, in _pushobsolete
remote.evoext_pushobsmarkers_0(obsdata)
File "hg-evolve/hgext/evolve.py", line 2522, in httpclient_pushobsmarkers
ret, output = self._call('evoext_pushobsmarkers_0', data=obsfile)
ValueError: too many values to unpack
I'm not sure how this repo differs from the one in the test suite, so I'm not
sure how to craft a test for this. The failure occurs even when there _are_
csets to push. There was no crash if no obsolete markers needed to be pushed.
At any rate, this code was stolen from httppeer._callpush(), where it calls
self._call(). The socket exception handling wasn't necessary to fix the crash,
but the calling code might as well be duplicated in its entirety.
A successful push with this patch looks like this. Note the final line is _not_
in the output of the http push in test-simple4server.t:
../hg push -r . pc
pushing to http://192.168.1.4:8000/
searching for changes
remote has heads on branch 'default' that are not known locally: 3af110194a0c
56000e3ae44d 57ac6e51d290 7da4355c21b8 and 8 others
remote: adding changesets
remote: adding manifests
remote: adding file changes
remote: added 1 changesets with 0 changes to 1 files (+1 heads)
pushing 4 obsolescence markers (525 bytes)
remote: 2 obsolescence markers added
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Thu, 05 Mar 2015 20:02:07 -0500 |
parents | dbd0733e5840 |
children | da96dc7ecb65 |
line wrap: on
line source
mercurial-evolve (5.0.2-1) unstable; urgency=medium * new upstream release -- Pierre-Yves David <pierre-yves.david@ens-lyon.org> Sun, 14 Dec 2014 12:43:28 -0800 mercurial-evolve (5.0.1-1) unstable; urgency=medium * New upstream release. -- Faheem Mitha <faheem@faheem.info> Wed, 12 Nov 2014 11:24:28 +0530 mercurial-evolve (4.1.0-1) unstable; urgency=medium * new upstream release -- Pierre-Yves David <pyd@marginatus.alto.octopoid.net> Fri, 08 Aug 2014 23:15:11 -0700 mercurial-evolve (4.0.1-1) unstable; urgency=medium * new upstream release -- Pierre-Yves David <pyd@marginatus.alto.octopoid.net> Fri, 08 Aug 2014 15:50:09 -0700 mercurial-evolve (4.0.0-1) unstable; urgency=low [ Julien Cristau ] * New upstream release. [ Pierre-Yves David ] * new upstream release -- Pierre-Yves David <pyd@marginatus.alto.octopoid.net> Fri, 08 Aug 2014 15:48:16 -0700 mercurial-evolve (3.1.0-1) UNRELEASED; urgency=low * New upstream release. -- Pierre-Yves David <pierre-yves.david@logilab.fr> Mon, 04 Mar 2013 18:02:15 +0100 mercurial-evolve (2.1.0-1) UNRELEASED; urgency=low * New upstream release -- Pierre-Yves David <pierre-yves.david@logilab.fr> Mon, 03 Dec 2012 15:19:19 +0100 mercurial-evolve (1.1.0-1) UNRELEASED; urgency=low * New upstream release. -- Pierre-Yves David <pierre-yves.david@logilab.fr> Tue, 20 Nov 2012 16:28:12 +0100 mercurial-evolve (1.0.2-1) UNRELEASED; urgency=low * New upstream Release -- Pierre-Yves David <pierre-yves.david@logilab.fr> Wed, 19 Sep 2012 17:38:47 +0200 mercurial-evolve (1.0.1-1) UNRELEASED; urgency=low * New bug fix release * remove conflicting __init__.py -- Pierre-Yves David <pierre-yves.david@logilab.fr> Fri, 31 Aug 2012 11:31:03 +0200 mercurial-evolve (1.0.0-1) UNRELEASED; urgency=low * Initial release. -- Julien Cristau <jcristau@debian.org> Fri, 24 Aug 2012 16:46:30 +0200