Mercurial > hg
comparison mercurial/copies.py @ 42165:22c9ffdf8ef6
copies: fix up "fullcopy" with missing entries from "diverge"
Similar to the previous patch, but this doesn't even affect tests. It
does affect tests if you change them to turn on debug logging. I'm
fixing it here so reviewers of the later rewrite patch can hard-code
debug logging to be on and more easily compare test results.
Differential Revision: https://phab.mercurial-scm.org/D6247
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Mon, 15 Apr 2019 16:46:41 -0700 |
parents | 96bd75e67a94 |
children | 85f5934016f9 |
comparison
equal
deleted
inserted
replaced
42164:96bd75e67a94 | 42165:22c9ffdf8ef6 |
---|---|
689 del fullcopy[dst] | 689 del fullcopy[dst] |
690 # Sometimes we forget to add entries from "copy" to "fullcopy", so fix | 690 # Sometimes we forget to add entries from "copy" to "fullcopy", so fix |
691 # that up here | 691 # that up here |
692 for dst, src in copy.items(): | 692 for dst, src in copy.items(): |
693 fullcopy[dst] = src | 693 fullcopy[dst] = src |
694 # Sometimes we forget to add entries from "diverge" to "fullcopy", so fix | |
695 # that up here | |
696 for src, dsts in diverge.items(): | |
697 for dst in dsts: | |
698 fullcopy[dst] = src | |
694 if fullcopy and repo.ui.debugflag: | 699 if fullcopy and repo.ui.debugflag: |
695 repo.ui.debug(" all copies found (* = to merge, ! = divergent, " | 700 repo.ui.debug(" all copies found (* = to merge, ! = divergent, " |
696 "% = renamed and deleted):\n") | 701 "% = renamed and deleted):\n") |
697 for f in sorted(fullcopy): | 702 for f in sorted(fullcopy): |
698 note = "" | 703 note = "" |