##// END OF EJS Templates
pull: make a single call to obsstore.add (issue5006)...
Matt Mackall -
r27558:b5b54825 default
parent child Browse files
Show More
@@ -1399,10 +1399,14 b' def _pullobsolete(pullop):'
1399 remoteobs = pullop.remote.listkeys('obsolete')
1399 remoteobs = pullop.remote.listkeys('obsolete')
1400 if 'dump0' in remoteobs:
1400 if 'dump0' in remoteobs:
1401 tr = pullop.gettransaction()
1401 tr = pullop.gettransaction()
1402 markers = []
1402 for key in sorted(remoteobs, reverse=True):
1403 for key in sorted(remoteobs, reverse=True):
1403 if key.startswith('dump'):
1404 if key.startswith('dump'):
1404 data = base85.b85decode(remoteobs[key])
1405 data = base85.b85decode(remoteobs[key])
1405 pullop.repo.obsstore.mergemarkers(tr, data)
1406 version, newmarks = obsolete._readmarkers(data)
1407 markers += newmarks
1408 if markers:
1409 pullop.repo.obsstore.add(tr, markers)
1406 pullop.repo.invalidatevolatilesets()
1410 pullop.repo.invalidatevolatilesets()
1407 return tr
1411 return tr
1408
1412
General Comments 0
You need to be logged in to leave comments. Login now