equal
deleted
inserted
replaced
4551 if inst.errno != errno.ENOENT: |
4551 if inst.errno != errno.ENOENT: |
4552 raise |
4552 raise |
4553 |
4553 |
4554 try: |
4554 try: |
4555 # preresolve file |
4555 # preresolve file |
4556 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), |
4556 overrides = {('ui', 'forcemerge'): opts.get('tool', '')} |
4557 'resolve') |
4557 with ui.configoverride(overrides, 'resolve'): |
4558 complete, r = ms.preresolve(f, wctx) |
4558 complete, r = ms.preresolve(f, wctx) |
4559 if not complete: |
4559 if not complete: |
4560 tocomplete.append(f) |
4560 tocomplete.append(f) |
4561 elif r: |
4561 elif r: |
4562 ret = 1 |
4562 ret = 1 |
4563 finally: |
4563 finally: |
4564 ui.setconfig('ui', 'forcemerge', '', 'resolve') |
|
4565 ms.commit() |
4564 ms.commit() |
4566 |
4565 |
4567 # replace filemerge's .orig file with our resolve file, but only |
4566 # replace filemerge's .orig file with our resolve file, but only |
4568 # for merges that are complete |
4567 # for merges that are complete |
4569 if complete: |
4568 if complete: |
4575 raise |
4574 raise |
4576 |
4575 |
4577 for f in tocomplete: |
4576 for f in tocomplete: |
4578 try: |
4577 try: |
4579 # resolve file |
4578 # resolve file |
4580 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), |
4579 overrides = {('ui', 'forcemerge'): opts.get('tool', '')} |
4581 'resolve') |
4580 with ui.configoverride(overrides, 'resolve'): |
4582 r = ms.resolve(f, wctx) |
4581 r = ms.resolve(f, wctx) |
4583 if r: |
4582 if r: |
4584 ret = 1 |
4583 ret = 1 |
4585 finally: |
4584 finally: |
4586 ui.setconfig('ui', 'forcemerge', '', 'resolve') |
|
4587 ms.commit() |
4585 ms.commit() |
4588 |
4586 |
4589 # replace filemerge's .orig file with our resolve file |
4587 # replace filemerge's .orig file with our resolve file |
4590 a = repo.wjoin(f) |
4588 a = repo.wjoin(f) |
4591 try: |
4589 try: |