--- a/.hgtags Wed Feb 01 15:02:59 2017 +0100
+++ b/.hgtags Wed Feb 01 16:17:09 2017 +0100
@@ -42,3 +42,4 @@
b21ce82e6f7640c2b38506545968650227d67e9b 5.4.0
2ad40d972a740a613c4c559104166a015b37cac2 5.4.1
727c7211c810d304ebf92b32db7ecf697ce46ac6 5.5.0
+99ede2d775458a236a46ad25a93aca473b676eee 5.6.0
--- a/README Wed Feb 01 15:02:59 2017 +0100
+++ b/README Wed Feb 01 16:17:09 2017 +0100
@@ -56,14 +56,11 @@
Changelog
=========
-5.6.0 --
+5.6.0 -- 2016-10-30
- compatibility with Mercurial 4.1.
- improvement of prune error message.
- fold: require --from flag for folding revisions to working copy
-
-5.5.1 --
-
- fix crash when trying to fold an empty revision set (issue5453)
- uncommit: preserve copy information of remaining files (issue5403)
--- a/debian/changelog Wed Feb 01 15:02:59 2017 +0100
+++ b/debian/changelog Wed Feb 01 16:17:09 2017 +0100
@@ -1,4 +1,10 @@
-mercurial-evolve (5.5.0) unstable; urgency=medium
+mercurial-evolve (5.6.0-1) UNRELEASED; urgency=medium
+
+ * New Upstream Release
+
+ -- Pierre-Yves David <marmoute@nodosa.octopoid.net> Wed, 01 Feb 2017 15:06:21 +0100
+
+mercurial-evolve (5.5.0-1) unstable; urgency=medium
* new upstream release
--- a/hgext/evolve.py Wed Feb 01 15:02:59 2017 +0100
+++ b/hgext/evolve.py Wed Feb 01 16:17:09 2017 +0100
@@ -19,8 +19,8 @@
- improves some aspect of the early implementation in Mercurial core
'''
-__version__ = '5.5.0'
-testedwith = '3.4.3 3.5.2 3.6.2 3.7.3 3.8.1 3.9 4.0'
+__version__ = '5.6.0'
+testedwith = '3.4.3 3.5.2 3.6.2 3.7.3 3.8.1 3.9 4.0 4.1'
buglink = 'https://bz.mercurial-scm.org/'
@@ -3856,11 +3856,11 @@
if util.safehasattr(wireproto.abstractserverproto, 'groupchunks'):
# We need to handle chunking and compression directly
def streamres(d, proto):
- wireproto.streamres(proto.groupchunks(d))
+ return wireproto.streamres(proto.groupchunks(d))
else:
# Leave chunking and compression to streamres
def streamres(d, proto):
- wireproto.streamres(reader=d, v1compressible=True)
+ return wireproto.streamres(reader=d, v1compressible=True)
def srv_pullobsmarkers(repo, proto, others):
opts = wireproto.options('', ['heads', 'common'], others)