| pulkit |
| hg-reviewers |
Let's get the argument into the right order, then call the function once.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| # we are the second parent to work on c, we need to merge our | # we are the second parent to work on c, we need to merge our | ||||
| # work with the other. | # work with the other. | ||||
| # | # | ||||
| # In case of conflict, parent 1 take precedence over parent 2. | # In case of conflict, parent 1 take precedence over parent 2. | ||||
| # This is an arbitrary choice made anew when implementing | # This is an arbitrary choice made anew when implementing | ||||
| # changeset based copies. It was made without regards with | # changeset based copies. It was made without regards with | ||||
| # potential filelog related behavior. | # potential filelog related behavior. | ||||
| if parent == 1: | if parent == 1: | ||||
| _merge_copies_dict( | minor, major = othercopies, newcopies | ||||
| othercopies, newcopies, isancestor, changes | |||||
| ) | |||||
| else: | else: | ||||
| _merge_copies_dict( | minor, major = newcopies, othercopies | ||||
| newcopies, othercopies, isancestor, changes | _merge_copies_dict(minor, major, isancestor, changes) | ||||
| ) | all_copies[c] = minor | ||||
| all_copies[c] = newcopies | |||||
| final_copies = {} | final_copies = {} | ||||
| for dest, (tt, source) in all_copies[targetrev].items(): | for dest, (tt, source) in all_copies[targetrev].items(): | ||||
| if source is not None: | if source is not None: | ||||
| final_copies[dest] = source | final_copies[dest] = source | ||||
| return final_copies | return final_copies | ||||