Show More
@@ -838,15 +838,10 b' def pushmarker(repo, key, old, new):' | |||||
838 | repo.ui.warn(_('unexpected old value for %r') % key) |
|
838 | repo.ui.warn(_('unexpected old value for %r') % key) | |
839 | return False |
|
839 | return False | |
840 | data = util.b85decode(new) |
|
840 | data = util.b85decode(new) | |
841 | with repo.lock(): |
|
841 | with repo.lock(), repo.transaction('pushkey: obsolete markers') as tr: | |
842 | tr = repo.transaction('pushkey: obsolete markers') |
|
842 | repo.obsstore.mergemarkers(tr, data) | |
843 | try: |
|
843 | repo.invalidatevolatilesets() | |
844 | repo.obsstore.mergemarkers(tr, data) |
|
844 | return True | |
845 | repo.invalidatevolatilesets() |
|
|||
846 | tr.close() |
|
|||
847 | return True |
|
|||
848 | finally: |
|
|||
849 | tr.release() |
|
|||
850 |
|
845 | |||
851 | # keep compatibility for the 4.3 cycle |
|
846 | # keep compatibility for the 4.3 cycle | |
852 | def allprecursors(obsstore, nodes, ignoreflags=0): |
|
847 | def allprecursors(obsstore, nodes, ignoreflags=0): |
General Comments 0
You need to be logged in to leave comments.
Login now