Mercurial > public > mercurial-scm > hg

diff mercurial/exchange.py @ 43168:01e8eefd9434

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: fix sorting of obsolete markers when building bundle Last item of marker tuple (parents) is either None or tuple. Comparison thus fails on Python 3 with: TypeError: '<' not supported between instances of 'tuple' and 'NoneType' Fixing this by coercing None to the empty tuple when sorting markers in exchange._getbundleobsmarkerpart().
author Denis Laxalde <denis@laxalde.org>
date Thu, 10 Oct 2019 20:27:34 +0200
parents c17a63eb5d4c
children 48b9fbfb00b9
line wrap: on
line diff
--- a/mercurial/exchange.py	Thu Oct 10 04:34:58 2019 +0200
+++ b/mercurial/exchange.py	Thu Oct 10 20:27:34 2019 +0200
@@ -2567,7 +2567,8 @@
             heads = repo.heads()
         subset = [c.node() for c in repo.set(b'::%ln', heads)]
         markers = repo.obsstore.relevantmarkers(subset)
-        markers = sorted(markers)
+        # last item of marker tuple ('parents') may be None or a tuple
+        markers = sorted(markers, key=lambda m: m[:-1] + (m[-1] or (),))
         bundle2.buildobsmarkerspart(bundler, markers)