Mercurial > public > mercurial-scm > hg

comparison mercurial/copies.py @ 42164:96bd75e67a94

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
copies: fix up "fullcopy" with missing entries from "copy" This is just a workaround similar to the previous one. It will make it easier to follow later patches. Differential Revision: https://phab.mercurial-scm.org/D6246
author Martin von Zweigbergk <martinvonz@google.com>
date Mon, 15 Apr 2019 16:41:43 -0700
parents 31abb9d713af
children 22c9ffdf8ef6
comparison
equal deleted inserted replaced
42163:beec7fc6adec 42164:96bd75e67a94
685 # Sometimes we get invalid copies here (the "and not remotebase" in 685 # Sometimes we get invalid copies here (the "and not remotebase" in
686 # _checkcopies() seems suspicious). Filter them out. 686 # _checkcopies() seems suspicious). Filter them out.
687 for dst, src in fullcopy.copy().items(): 687 for dst, src in fullcopy.copy().items():
688 if src not in mb: 688 if src not in mb:
689 del fullcopy[dst] 689 del fullcopy[dst]
690 # Sometimes we forget to add entries from "copy" to "fullcopy", so fix
691 # that up here
692 for dst, src in copy.items():
693 fullcopy[dst] = src
690 if fullcopy and repo.ui.debugflag: 694 if fullcopy and repo.ui.debugflag:
691 repo.ui.debug(" all copies found (* = to merge, ! = divergent, " 695 repo.ui.debug(" all copies found (* = to merge, ! = divergent, "
692 "% = renamed and deleted):\n") 696 "% = renamed and deleted):\n")
693 for f in sorted(fullcopy): 697 for f in sorted(fullcopy):
694 note = "" 698 note = ""