1716 mergestatemod.ACTION_DIR_RENAME_MOVE_LOCAL, |
1716 mergestatemod.ACTION_DIR_RENAME_MOVE_LOCAL, |
1717 ) |
1717 ) |
1718 ) |
1718 ) |
1719 |
1719 |
1720 try: |
1720 try: |
1721 # premerge |
|
1722 tocomplete = [] |
|
1723 for f, args, msg in mergeactions: |
1721 for f, args, msg in mergeactions: |
1724 repo.ui.debug(b" %s: %s -> m (premerge)\n" % (f, msg)) |
1722 repo.ui.debug(b" %s: %s -> m\n" % (f, msg)) |
1725 ms.addcommitinfo(f, {b'merged': b'yes'}) |
1723 ms.addcommitinfo(f, {b'merged': b'yes'}) |
1726 progress.increment(item=f) |
1724 progress.increment(item=f) |
1727 if f == b'.hgsubstate': # subrepo states need updating |
1725 if f == b'.hgsubstate': # subrepo states need updating |
1728 subrepoutil.submerge( |
1726 subrepoutil.submerge( |
1729 repo, wctx, mctx, wctx.ancestor(mctx), overwrite, labels |
1727 repo, wctx, mctx, wctx.ancestor(mctx), overwrite, labels |
1730 ) |
1728 ) |
1731 continue |
1729 continue |
1732 wctx[f].audit() |
1730 wctx[f].audit() |
1733 complete, r = ms.preresolve(f, wctx) |
|
1734 if not complete: |
|
1735 numupdates += 1 |
|
1736 tocomplete.append((f, args, msg)) |
|
1737 |
|
1738 # merge |
|
1739 for f, args, msg in tocomplete: |
|
1740 repo.ui.debug(b" %s: %s -> m (merge)\n" % (f, msg)) |
|
1741 ms.addcommitinfo(f, {b'merged': b'yes'}) |
|
1742 progress.increment(item=f, total=numupdates) |
|
1743 ms.resolve(f, wctx) |
1731 ms.resolve(f, wctx) |
1744 |
1732 |
1745 except error.InterventionRequired: |
1733 except error.InterventionRequired: |
1746 # If the user has merge.on-failure=halt, catch the error and close the |
1734 # If the user has merge.on-failure=halt, catch the error and close the |
1747 # merge state "properly". |
1735 # merge state "properly". |