Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/merge.py @ 45310:1d1f112da75c
merge: filter actions before calling _resolvetrivial()
In d49e490a9e85252886fd43258803bcad4fc88edb I made _resolvetrivial() to be
called after upadting the sparse checkout.
Looking at the code now, it seems to that me there is no need to even run
_resolvetrivial() on actions which are filtered away.
So let's update the actions before passing them into _resolvetrivial().
Differential Revision: https://phab.mercurial-scm.org/D8827
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Fri, 24 Jul 2020 19:13:20 +0530 |
| parents | 3f5ac87ae10f |
| children | d70c972cec74 |
comparison
equal
deleted
inserted
replaced
| 45309:3f5ac87ae10f | 45310:1d1f112da75c |
|---|---|
| 1131 mresult.updateactions(fractions) | 1131 mresult.updateactions(fractions) |
| 1132 | 1132 |
| 1133 prunedactions = sparse.filterupdatesactions( | 1133 prunedactions = sparse.filterupdatesactions( |
| 1134 repo, wctx, mctx, branchmerge, mresult.actions | 1134 repo, wctx, mctx, branchmerge, mresult.actions |
| 1135 ) | 1135 ) |
| 1136 mresult.setactions(prunedactions) | |
| 1136 _resolvetrivial(repo, wctx, mctx, ancestors[0], mresult) | 1137 _resolvetrivial(repo, wctx, mctx, ancestors[0], mresult) |
| 1137 | 1138 |
| 1138 mresult.setactions(prunedactions) | |
| 1139 return mresult | 1139 return mresult |
| 1140 | 1140 |
| 1141 | 1141 |
| 1142 def _getcwd(): | 1142 def _getcwd(): |
| 1143 try: | 1143 try: |