D6248: copies: move early return for "no copies" case a little earlier
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Tue Apr 16 17:17:57 UTC 2019
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
We can return before the block that prints debug messages. That block
will not be run anyway when there are no copies.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D6248
AFFECTED FILES
mercurial/copies.py
CHANGE DETAILS
diff --git a/mercurial/copies.py b/mercurial/copies.py
--- a/mercurial/copies.py
+++ b/mercurial/copies.py
@@ -696,7 +696,11 @@
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 @@
note))
del divergeset
- if not fullcopy:
- return copy, {}, diverge, renamedelete, {}
-
repo.ui.debug(" checking for directory renames\n")
# generate a directory move map
To: martinvonz, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list