##// END OF EJS Templates
py3: fix sorting of obsolete markers during push...
Denis Laxalde -
r43572:2c70dd03 default
parent child Browse files
Show More
@@ -1140,7 +1140,7 b' def _pushb2obsmarkers(pushop, bundler):'
1140 return
1140 return
1141 pushop.stepsdone.add(b'obsmarkers')
1141 pushop.stepsdone.add(b'obsmarkers')
1142 if pushop.outobsmarkers:
1142 if pushop.outobsmarkers:
1143 markers = sorted(pushop.outobsmarkers)
1143 markers = _sortedmarkers(pushop.outobsmarkers)
1144 bundle2.buildobsmarkerspart(bundler, markers)
1144 bundle2.buildobsmarkerspart(bundler, markers)
1145
1145
1146
1146
@@ -1475,7 +1475,8 b' def _pushobsolete(pushop):'
1475 if pushop.outobsmarkers:
1475 if pushop.outobsmarkers:
1476 pushop.ui.debug(b'try to push obsolete markers to remote\n')
1476 pushop.ui.debug(b'try to push obsolete markers to remote\n')
1477 rslts = []
1477 rslts = []
1478 remotedata = obsolete._pushkeyescape(sorted(pushop.outobsmarkers))
1478 markers = _sortedmarkers(pushop.outobsmarkers)
1479 remotedata = obsolete._pushkeyescape(markers)
1479 for key in sorted(remotedata, reverse=True):
1480 for key in sorted(remotedata, reverse=True):
1480 # reverse sort to ensure we end with dump0
1481 # reverse sort to ensure we end with dump0
1481 data = remotedata[key]
1482 data = remotedata[key]
General Comments 0
You need to be logged in to leave comments. Login now