equal
deleted
inserted
replaced
1155 _(b'\nauction for merging merge bids (%d ancestors)\n') |
1155 _(b'\nauction for merging merge bids (%d ancestors)\n') |
1156 % len(ancestors) |
1156 % len(ancestors) |
1157 ) |
1157 ) |
1158 mresult = mergeresult() |
1158 mresult = mergeresult() |
1159 for f, bids in sorted(fbids.items()): |
1159 for f, bids in sorted(fbids.items()): |
|
1160 if repo.ui.debugflag: |
|
1161 repo.ui.debug(b" list of bids for %s:\n" % f) |
|
1162 for m, l in sorted(bids.items()): |
|
1163 for _f, args, msg in l: |
|
1164 repo.ui.debug(b' %s -> %s\n' % (msg, m)) |
1160 # bids is a mapping from action method to list af actions |
1165 # bids is a mapping from action method to list af actions |
1161 # Consensus? |
1166 # Consensus? |
1162 if len(bids) == 1: # all bids are the same kind of method |
1167 if len(bids) == 1: # all bids are the same kind of method |
1163 m, l = list(bids.items())[0] |
1168 m, l = list(bids.items())[0] |
1164 if all(a == l[0] for a in l[1:]): # len(bids) is > 1 |
1169 if all(a == l[0] for a in l[1:]): # len(bids) is > 1 |