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

equal deleted inserted replaced

-:7a757e893532
+:2693659c2b34
 )
 return cm
 def _revinfo_getter(repo):
-"""return a function that return multiple data given a <rev>"i
+"""returns a function that returns the following data given a <rev>"
 * p1: revision number of first parent
 * p2: revision number of first parent
-* p1copies: mapping of copies from p1
+* changes: a ChangingFiles object
-* p2copies: mapping of copies from p2
-* removed: a list of removed files
-* ismerged: a callback to know if file was merged in that revision
 """
 cl = repo.changelog
 parents = cl.parentrevs
-def get_ismerged(rev):
-ctx = repo[rev]
-def ismerged(path):
-if path not in ctx.files():
-return False
-fctx = ctx[path]
-parents = fctx._filelog.parents(fctx._filenode)
-nb_parents = 0
-for n in parents:
-if n != node.nullid:
-nb_parents += 1
-return nb_parents >= 2
-return ismerged
 changelogrevision = cl.changelogrevision
 # A small cache to avoid doing the work twice for merges
 #
 p1, p2 = parents(rev)
 value = None
 e = merge_caches.pop(rev, None)
 if e is not None:
 return e
-c = changelogrevision(rev)
+value = (p1, p2, changelogrevision(rev).changes)
-p1copies = c.p1copies
-p2copies = c.p2copies
-removed = c.filesremoved
 if p1 != node.nullrev and p2 != node.nullrev:
 # XXX some case we over cache, IGNORE
-value = merge_caches[rev] = (
+merge_caches[rev] = value
-p1,
-p2,
-p1copies,
-p2copies,
-removed,
-get_ismerged(rev),
-)
-if value is None:
-value = (p1, p2, p1copies, p2copies, removed, get_ismerged(rev))
 return value
 return revinfo
 copies = all_copies.pop(r, None)
 if copies is None:
 # this is a root
 copies = {}
 for i, c in enumerate(children[r]):
-p1, p2, p1copies, p2copies, removed, ismerged = revinfo(c)
+p1, p2, changes = revinfo(c)
 if r == p1:
 parent = 1
-childcopies = p1copies
+childcopies = changes.copied_from_p1
 else:
 assert r == p2
 parent = 2
-childcopies = p2copies
+childcopies = changes.copied_from_p2
 if not alwaysmatch:
 childcopies = {
 dst: src for dst, src in childcopies.items() if match(dst)
 }
 newcopies = copies
 prev = copies.get(source)
 if prev is not None and prev[1] is not None:
 source = prev[1]
 newcopies[dest] = (c, source)
 assert newcopies is not copies
-for f in removed:
+for f in changes.removed:
 if f in newcopies:
 if newcopies is copies:
 # copy on write to avoid affecting potential other
 # branches.  when there are no other branches, this
 # could be avoided.
 # This is an arbitrary choice made anew when implementing
 # changeset based copies. It was made without regards with
 # potential filelog related behavior.
 if parent == 1:
 _merge_copies_dict(
-othercopies, newcopies, isancestor, ismerged
+othercopies, newcopies, isancestor, changes
 )
 else:
 _merge_copies_dict(
-newcopies, othercopies, isancestor, ismerged
+newcopies, othercopies, isancestor, changes
 )
 all_copies[c] = newcopies
 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, ismerged):
+def _merge_copies_dict(minor, major, isancestor, changes):
 """merge two copies-mapping together, minor and major
 In case of conflict, value from "major" will be picked.
 - `isancestors(low_rev, high_rev)`: callable return True if `low_rev` is an
 # content from "major" wins, unless it is older
 # than the branch point or there is a merge
 if (
 new_tt == other_tt
 or not isancestor(new_tt, other_tt)
-or ismerged(dest)
+or dest in changes.merged
 ):
 minor[dest] = value
 def _revinfo_getter_extra(repo):

changeset 45640	2693659c2b34
parent 45639	7a757e893532
child 45670	a8fb29b05f92