##// END OF EJS Templates
copies: move early return for "no copies" case a little earlier...
Martin von Zweigbergk -
r42342:85f59340 default
parent child Browse files
Show More
@@ -696,7 +696,11 b' def _fullcopytracing(repo, c1, c2, base)'
696 for src, dsts in diverge.items():
696 for src, dsts in diverge.items():
697 for dst in dsts:
697 for dst in dsts:
698 fullcopy[dst] = src
698 fullcopy[dst] = src
699 if fullcopy and repo.ui.debugflag:
699
700 if not fullcopy:
701 return copy, {}, diverge, renamedelete, {}
702
703 if repo.ui.debugflag:
700 repo.ui.debug(" all copies found (* = to merge, ! = divergent, "
704 repo.ui.debug(" all copies found (* = to merge, ! = divergent, "
701 "% = renamed and deleted):\n")
705 "% = renamed and deleted):\n")
702 for f in sorted(fullcopy):
706 for f in sorted(fullcopy):
@@ -711,9 +715,6 b' def _fullcopytracing(repo, c1, c2, base)'
711 note))
715 note))
712 del divergeset
716 del divergeset
713
717
714 if not fullcopy:
715 return copy, {}, diverge, renamedelete, {}
716
717 repo.ui.debug(" checking for directory renames\n")
718 repo.ui.debug(" checking for directory renames\n")
718
719
719 # generate a directory move map
720 # generate a directory move map
General Comments 0
You need to be logged in to leave comments. Login now