Show More
@@ -944,10 +944,10 b' def pushmarker(repo, key, old, new):' | |||
|
944 | 944 | """Push markers over pushkey""" |
|
945 | 945 | if not key.startswith('dump'): |
|
946 | 946 | repo.ui.warn(_('unknown key: %r') % key) |
|
947 |
return |
|
|
947 | return False | |
|
948 | 948 | if old: |
|
949 | 949 | repo.ui.warn(_('unexpected old value for %r') % key) |
|
950 |
return |
|
|
950 | return False | |
|
951 | 951 | data = util.b85decode(new) |
|
952 | 952 | lock = repo.lock() |
|
953 | 953 | try: |
@@ -956,7 +956,7 b' def pushmarker(repo, key, old, new):' | |||
|
956 | 956 | repo.obsstore.mergemarkers(tr, data) |
|
957 | 957 | repo.invalidatevolatilesets() |
|
958 | 958 | tr.close() |
|
959 |
return |
|
|
959 | return True | |
|
960 | 960 | finally: |
|
961 | 961 | tr.release() |
|
962 | 962 | finally: |
@@ -423,12 +423,12 b' def pushphase(repo, nhex, oldphasestr, n' | |||
|
423 | 423 | if currentphase == oldphase and newphase < oldphase: |
|
424 | 424 | with repo.transaction('pushkey-phase') as tr: |
|
425 | 425 | advanceboundary(repo, tr, newphase, [bin(nhex)]) |
|
426 |
return |
|
|
426 | return True | |
|
427 | 427 | elif currentphase == newphase: |
|
428 | 428 | # raced, but got correct result |
|
429 |
return |
|
|
429 | return True | |
|
430 | 430 | else: |
|
431 |
return |
|
|
431 | return False | |
|
432 | 432 | |
|
433 | 433 | def analyzeremotephases(repo, subset, roots): |
|
434 | 434 | """Compute phases heads and root in a subset of node from root dict |
General Comments 0
You need to be logged in to leave comments.
Login now