| marmoute |
| hg-reviewers |
During bid merge, it's not clear which commitinfo should be stored and which one
should not. This depends on which side the bid merge chooses for a file. For
this we will need to refactor bid merge code and commitinfo handling.
For now, we just blindly updates info since we hardly have any users of
commitinfo and this will help us in testing and clearing out further path.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| ) | ) | ||||
| # mapping filename to bids (action method to list af actions) | # mapping filename to bids (action method to list af actions) | ||||
| # {FILENAME1 : BID1, FILENAME2 : BID2} | # {FILENAME1 : BID1, FILENAME2 : BID2} | ||||
| # BID is another dictionary which contains | # BID is another dictionary which contains | ||||
| # mapping of following form: | # mapping of following form: | ||||
| # {ACTION_X : [info, ..], ACTION_Y : [info, ..]} | # {ACTION_X : [info, ..], ACTION_Y : [info, ..]} | ||||
| fbids = {} | fbids = {} | ||||
| mresult = mergeresult() | |||||
| diverge, renamedelete = None, None | diverge, renamedelete = None, None | ||||
| for ancestor in ancestors: | for ancestor in ancestors: | ||||
| repo.ui.note(_(b'\ncalculating bids for ancestor %s\n') % ancestor) | repo.ui.note(_(b'\ncalculating bids for ancestor %s\n') % ancestor) | ||||
| mresult1 = manifestmerge( | mresult1 = manifestmerge( | ||||
| repo, | repo, | ||||
| wctx, | wctx, | ||||
| mctx, | mctx, | ||||
| ancestor, | ancestor, | ||||
| # merge will correctly incorporate more information | # merge will correctly incorporate more information | ||||
| if diverge is None or len(mresult1.diverge) < len(diverge): | if diverge is None or len(mresult1.diverge) < len(diverge): | ||||
| diverge = mresult1.diverge | diverge = mresult1.diverge | ||||
| if renamedelete is None or len(renamedelete) < len( | if renamedelete is None or len(renamedelete) < len( | ||||
| mresult1.renamedelete | mresult1.renamedelete | ||||
| ): | ): | ||||
| renamedelete = mresult1.renamedelete | renamedelete = mresult1.renamedelete | ||||
| # blindly update final mergeresult commitinfo with what we get | |||||
| # from mergeresult object for each ancestor | |||||
| # TODO: some commitinfo depends on what bid merge choose and hence | |||||
| # we will need to make commitinfo also depend on bid merge logic | |||||
| mresult._commitinfo.update(mresult1._commitinfo) | |||||
| for f, a in mresult1.filemap(sort=True): | for f, a in mresult1.filemap(sort=True): | ||||
| m, args, msg = a | m, args, msg = a | ||||
| repo.ui.debug(b' %s: %s -> %s\n' % (f, msg, m)) | repo.ui.debug(b' %s: %s -> %s\n' % (f, msg, m)) | ||||
| if f in fbids: | if f in fbids: | ||||
| d = fbids[f] | d = fbids[f] | ||||
| if m in d: | if m in d: | ||||
| d[m].append(a) | d[m].append(a) | ||||
| else: | else: | ||||
| d[m] = [a] | d[m] = [a] | ||||
| else: | else: | ||||
| fbids[f] = {m: [a]} | fbids[f] = {m: [a]} | ||||
| # Call for bids | # Call for bids | ||||
| # Pick the best bid for each file | # Pick the best bid for each file | ||||
| repo.ui.note( | repo.ui.note( | ||||
| _(b'\nauction for merging merge bids (%d ancestors)\n') | _(b'\nauction for merging merge bids (%d ancestors)\n') | ||||
| % len(ancestors) | % len(ancestors) | ||||
| ) | ) | ||||
| mresult = mergeresult() | |||||
| for f, bids in sorted(fbids.items()): | for f, bids in sorted(fbids.items()): | ||||
| if repo.ui.debugflag: | if repo.ui.debugflag: | ||||
| repo.ui.debug(b" list of bids for %s:\n" % f) | repo.ui.debug(b" list of bids for %s:\n" % f) | ||||
| for m, l in sorted(bids.items()): | for m, l in sorted(bids.items()): | ||||
| for _f, args, msg in l: | for _f, args, msg in l: | ||||
| repo.ui.debug(b' %s -> %s\n' % (msg, m)) | repo.ui.debug(b' %s -> %s\n' % (msg, m)) | ||||
| # bids is a mapping from action method to list af actions | # bids is a mapping from action method to list af actions | ||||
| # Consensus? | # Consensus? | ||||