Skip to content
Snippets Groups Projects
Commit 2c70dd03b743 authored by Denis Laxalde's avatar Denis Laxalde
Browse files

py3: fix sorting of obsolete markers during push

This fixes similar errors as in 01e8eefd9434:

  TypeError: '<' not supported between instances of 'NoneType' and 'tuple'
parent 48b9fbfb00b9
No related branches found
No related tags found
No related merge requests found
......@@ -1140,7 +1140,7 @@
return
pushop.stepsdone.add(b'obsmarkers')
if pushop.outobsmarkers:
markers = sorted(pushop.outobsmarkers)
markers = _sortedmarkers(pushop.outobsmarkers)
bundle2.buildobsmarkerspart(bundler, markers)
......@@ -1475,7 +1475,8 @@
if pushop.outobsmarkers:
pushop.ui.debug(b'try to push obsolete markers to remote\n')
rslts = []
remotedata = obsolete._pushkeyescape(sorted(pushop.outobsmarkers))
markers = _sortedmarkers(pushop.outobsmarkers)
remotedata = obsolete._pushkeyescape(markers)
for key in sorted(remotedata, reverse=True):
# reverse sort to ensure we end with dump0
data = remotedata[key]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment