mercurial-scm/hg: mercurial/copies.py comparison

comparison mercurial/copies.py @ 46158:1fcfff09cac5

copies: avoid early return in _combine_changeset_copies We have to change how we deal with matching (see next changeset) and that processing is common. So we shuffle things around before doing the semantic change for clarity. Differential Revision: https://phab.mercurial-scm.org/D9584

author	Pierre-Yves David <pierre-yves.david@octobus.net>
date	Sun, 13 Dec 2020 20:26:27 +0100
parents	a132aa5979ec
children	929054848d6c

comparison

equal deleted inserted replaced

-:021925827c60
+:1fcfff09cac5
 """
 alwaysmatch = match.always()
 if rustmod is not None and alwaysmatch:
-return rustmod.combine_changeset_copies(
+final_copies = rustmod.combine_changeset_copies(
 list(revs), children_count, targetrev, revinfo, isancestor
 )
+else:
 isancestor = cached_is_ancestor(isancestor)
 all_copies = {}
 # iterate over all the "children" side of copy tracing "edge"
 for current_rev in revs:
 p1, p2, changes = revinfo(current_rev)
 current_copies = None
+# iterate over all parents to chain the existing data with the
-# iterate over all parents to chain the existing data with the
+# data from the parent → child edge.
-# data from the parent → child edge.
+for parent, parent_rev in ((1, p1), (2, p2)):
-for parent, parent_rev in ((1, p1), (2, p2)):
+if parent_rev == nullrev:
-if parent_rev == nullrev:
+continue
-continue
+remaining_children = children_count.get(parent_rev)
-remaining_children = children_count.get(parent_rev)
+if remaining_children is None:
-if remaining_children is None:
+continue
-continue
+remaining_children -= 1
-remaining_children -= 1
+children_count[parent_rev] = remaining_children
-children_count[parent_rev] = remaining_children
+if remaining_children:
-if remaining_children:
+copies = all_copies.get(parent_rev, None)
-copies = all_copies.get(parent_rev, None)
+else:
-else:
+copies = all_copies.pop(parent_rev, None)
-copies = all_copies.pop(parent_rev, None)
+if copies is None:
-if copies is None:
+# this is a root
-# this is a root
+copies = {}
-copies = {}
+newcopies = copies
-newcopies = copies
+# chain the data in the edge with the existing data
-# chain the data in the edge with the existing data
+if changes is not None:
-if changes is not None:
+childcopies = {}
-childcopies = {}
+if parent == 1:
-if parent == 1:
+childcopies = changes.copied_from_p1
-childcopies = changes.copied_from_p1
+elif parent == 2:
-elif parent == 2:
+childcopies = changes.copied_from_p2
-childcopies = changes.copied_from_p2
+if not alwaysmatch:
-if not alwaysmatch:
+childcopies = {
-childcopies = {
+dst: src
-dst: src
+for dst, src in childcopies.items()
-for dst, src in childcopies.items()
+if match(dst)
-if match(dst)
+}
-}
+if childcopies:
-if childcopies:
-newcopies = copies.copy()
-for dest, source in pycompat.iteritems(childcopies):
-prev = copies.get(source)
-if prev is not None and prev[1] is not None:
-source = prev[1]
-newcopies[dest] = (current_rev, source)
-assert newcopies is not copies
-if changes.removed:
-if newcopies is copies:
 newcopies = copies.copy()
-for f in changes.removed:
+for dest, source in pycompat.iteritems(childcopies):
-if f in newcopies:
+prev = copies.get(source)
-if newcopies is copies:
+if prev is not None and prev[1] is not None:
-# copy on write to avoid affecting potential other
+source = prev[1]
-# branches.  when there are no other branches, this
+newcopies[dest] = (current_rev, source)
-# could be avoided.
+assert newcopies is not copies
-newcopies = copies.copy()
+if changes.removed:
-newcopies[f] = (current_rev, None)
+if newcopies is copies:
+newcopies = copies.copy()
-# check potential need to combine the data from another parent (for
+for f in changes.removed:
-# that child). See comment below for details.
+if f in newcopies:
-if current_copies is None:
+if newcopies is copies:
-current_copies = newcopies
+# copy on write to avoid affecting potential other
-elif current_copies is newcopies:
+# branches.  when there are no other branches, this
-# nothing to merge:
+# could be avoided.
-pass
+newcopies = copies.copy()
-else:
+newcopies[f] = (current_rev, None)
-# we are the second parent to work on c, we need to merge our
+# check potential need to combine the data from another parent (for
-# work with the other.
+# that child). See comment below for details.
-#
+if current_copies is None:
-# In case of conflict, parent 1 take precedence over parent 2.
+current_copies = newcopies
-# This is an arbitrary choice made anew when implementing
+elif current_copies is newcopies:
-# changeset based copies. It was made without regards with
+# nothing to merge:
-# potential filelog related behavior.
+pass
-assert parent == 2
+else:
-current_copies = _merge_copies_dict(
+# we are the second parent to work on c, we need to merge our
-newcopies, current_copies, isancestor, changes
+# work with the other.
-)
+#
-all_copies[current_rev] = current_copies
+# In case of conflict, parent 1 take precedence over parent 2.
+# This is an arbitrary choice made anew when implementing
-# filter out internal details and return a {dest: source mapping}
+# changeset based copies. It was made without regards with
-final_copies = {}
+# potential filelog related behavior.
-for dest, (tt, source) in all_copies[targetrev].items():
+assert parent == 2
-if source is not None:
+current_copies = _merge_copies_dict(
-final_copies[dest] = source
+newcopies, current_copies, isancestor, changes
+)
+all_copies[current_rev] = current_copies
+# filter out internal details and return a {dest: source mapping}
+final_copies = {}
+for dest, (tt, source) in all_copies[targetrev].items():
+if source is not None:
+final_copies[dest] = source
 return final_copies
 def _merge_copies_dict(minor, major, isancestor, changes):
 """merge two copies-mapping together, minor and major

Mercurial > public > mercurial-scm > hg

comparison mercurial/copies.py @ 46158:1fcfff09cac5