diff --git a/mercurial/copies.py b/mercurial/copies.py --- a/mercurial/copies.py +++ b/mercurial/copies.py @@ -696,7 +696,11 @@ def _fullcopytracing(repo, c1, c2, base) for src, dsts in diverge.items(): for dst in dsts: fullcopy[dst] = src - if fullcopy and repo.ui.debugflag: + + if not fullcopy: + return copy, {}, diverge, renamedelete, {} + + if repo.ui.debugflag: repo.ui.debug(" all copies found (* = to merge, ! = divergent, " "% = renamed and deleted):\n") for f in sorted(fullcopy): @@ -711,9 +715,6 @@ def _fullcopytracing(repo, c1, c2, base) note)) del divergeset - if not fullcopy: - return copy, {}, diverge, renamedelete, {} - repo.ui.debug(" checking for directory renames\n") # generate a directory move map