Mercurial > public > mercurial-scm > hg
comparison mercurial/merge.py @ 26787:64848559413a
merge.applyupdates: call driverconclude after performing merge actions
This will be a chance for the merge driver to finish resolving or generating
any driver-resolved files.
As before, having a separate error state from 'unresolved' is too big a
refactoring for now, so we hack around it by setting unresolved to a positive
value when necessary.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Thu, 15 Oct 2015 01:22:01 -0700 |
| parents | 121f80d14e4b |
| children | 27683c63f44c |
comparison
equal
deleted
inserted
replaced
| 26786:121f80d14e4b | 26787:64848559413a |
|---|---|
| 1000 updated += 1 | 1000 updated += 1 |
| 1001 else: | 1001 else: |
| 1002 merged += 1 | 1002 merged += 1 |
| 1003 | 1003 |
| 1004 ms.commit() | 1004 ms.commit() |
| 1005 | |
| 1006 if usemergedriver and not unresolved and ms.mdstate() != 's': | |
| 1007 if not driverconclude(repo, ms, wctx, labels=labels): | |
| 1008 # XXX setting unresolved to at least 1 is a hack to make sure we | |
| 1009 # error out | |
| 1010 return updated, merged, removed, max(unresolved, 1) | |
| 1011 | |
| 1012 ms.commit() | |
| 1013 | |
| 1005 progress(_updating, None, total=numupdates, unit=_files) | 1014 progress(_updating, None, total=numupdates, unit=_files) |
| 1006 | 1015 |
| 1007 return updated, merged, removed, unresolved | 1016 return updated, merged, removed, unresolved |
| 1008 | 1017 |
| 1009 def recordupdates(repo, actions, branchmerge): | 1018 def recordupdates(repo, actions, branchmerge): |