Show More
@@ -558,6 +558,13 b' def manifestmerge(' | |||||
558 | branchmerge and force are as passed in to update |
|
558 | branchmerge and force are as passed in to update | |
559 | matcher = matcher to filter file lists |
|
559 | matcher = matcher to filter file lists | |
560 | acceptremote = accept the incoming changes without prompting |
|
560 | acceptremote = accept the incoming changes without prompting | |
|
561 | ||||
|
562 | Returns: | |||
|
563 | ||||
|
564 | actions: dict of filename as keys and action related info as values | |||
|
565 | diverge: mapping of source name -> list of dest name for divergent renames | |||
|
566 | renamedelete: mapping of source name -> list of destinations for files | |||
|
567 | deleted on one side and renamed on other. | |||
561 | """ |
|
568 | """ | |
562 | if matcher is not None and matcher.always(): |
|
569 | if matcher is not None and matcher.always(): | |
563 | matcher = None |
|
570 | matcher = None | |
@@ -875,7 +882,17 b' def calculateupdates(' | |||||
875 | matcher=None, |
|
882 | matcher=None, | |
876 | mergeforce=False, |
|
883 | mergeforce=False, | |
877 | ): |
|
884 | ): | |
878 | """Calculate the actions needed to merge mctx into wctx using ancestors""" |
|
885 | """ | |
|
886 | Calculate the actions needed to merge mctx into wctx using ancestors | |||
|
887 | ||||
|
888 | Uses manifestmerge() to merge manifest and get list of actions required to | |||
|
889 | perform for merging two manifests. If there are multiple ancestors, uses bid | |||
|
890 | merge if enabled. | |||
|
891 | ||||
|
892 | Also filters out actions which are unrequired if repository is sparse. | |||
|
893 | ||||
|
894 | Returns same 3 element tuple as manifestmerge(). | |||
|
895 | """ | |||
879 | # Avoid cycle. |
|
896 | # Avoid cycle. | |
880 | from . import sparse |
|
897 | from . import sparse | |
881 |
|
898 |
General Comments 0
You need to be logged in to leave comments.
Login now