equal
deleted
inserted
replaced
477 f.write('%d\n' % int(collapse)) |
477 f.write('%d\n' % int(collapse)) |
478 f.write('%d\n' % int(keep)) |
478 f.write('%d\n' % int(keep)) |
479 f.write('%d\n' % int(keepbranches)) |
479 f.write('%d\n' % int(keepbranches)) |
480 for d, v in state.iteritems(): |
480 for d, v in state.iteritems(): |
481 oldrev = repo[d].hex() |
481 oldrev = repo[d].hex() |
482 newrev = repo[v].hex() |
482 if v != nullmerge: |
|
483 newrev = repo[v].hex() |
|
484 else: |
|
485 newrev = v |
483 f.write("%s:%s\n" % (oldrev, newrev)) |
486 f.write("%s:%s\n" % (oldrev, newrev)) |
484 f.close() |
487 f.close() |
485 repo.ui.debug('rebase status stored\n') |
488 repo.ui.debug('rebase status stored\n') |
486 |
489 |
487 def clearstatus(repo): |
490 def clearstatus(repo): |
510 keep = bool(int(l)) |
513 keep = bool(int(l)) |
511 elif i == 5: |
514 elif i == 5: |
512 keepbranches = bool(int(l)) |
515 keepbranches = bool(int(l)) |
513 else: |
516 else: |
514 oldrev, newrev = l.split(':') |
517 oldrev, newrev = l.split(':') |
515 state[repo[oldrev].rev()] = repo[newrev].rev() |
518 if newrev != str(nullmerge): |
|
519 state[repo[oldrev].rev()] = repo[newrev].rev() |
|
520 else: |
|
521 state[repo[oldrev].rev()] = int(newrev) |
516 skipped = set() |
522 skipped = set() |
517 # recompute the set of skipped revs |
523 # recompute the set of skipped revs |
518 if not collapse: |
524 if not collapse: |
519 seen = set([target]) |
525 seen = set([target]) |
520 for old, new in sorted(state.items()): |
526 for old, new in sorted(state.items()): |