##// END OF EJS Templates
obsolete: invalidate "volatile" set cache after merging marker...
marmoute -
r32314:99515353 stable
parent child Browse files
Show More
@@ -1631,6 +1631,7 b' def handleobsmarker(op, inpart):'
1631 op.repo.ui.debug('ignoring obsolescence markers, feature not enabled')
1631 op.repo.ui.debug('ignoring obsolescence markers, feature not enabled')
1632 return
1632 return
1633 new = op.repo.obsstore.mergemarkers(tr, markerdata)
1633 new = op.repo.obsstore.mergemarkers(tr, markerdata)
1634 op.repo.invalidatevolatilesets()
1634 if new:
1635 if new:
1635 op.repo.ui.status(_('%i new obsolescence markers\n') % new)
1636 op.repo.ui.status(_('%i new obsolescence markers\n') % new)
1636 op.records.add('obsmarkers', {'new': new})
1637 op.records.add('obsmarkers', {'new': new})
@@ -767,6 +767,7 b' def pushmarker(repo, key, old, new):'
767 tr = repo.transaction('pushkey: obsolete markers')
767 tr = repo.transaction('pushkey: obsolete markers')
768 try:
768 try:
769 repo.obsstore.mergemarkers(tr, data)
769 repo.obsstore.mergemarkers(tr, data)
770 repo.invalidatevolatilesets()
770 tr.close()
771 tr.close()
771 return 1
772 return 1
772 finally:
773 finally:
General Comments 0
You need to be logged in to leave comments. Login now