[PATCH 8 of 8 ancestor-ish] copies: guard debug section with ui.debugflag
Mads Kiilerich
mads at kiilerich.com
Mon Apr 7 21:18:24 UTC 2014
# HG changeset patch
# User Mads Kiilerich <madski at unity3d.com>
# Date 1393356713 -3600
# Tue Feb 25 20:31:53 2014 +0100
# Node ID 739476e625346731b59be6c821779874f3205448
# Parent cc91230f0757ea07ea2370d084ba45fcd4fe7f91
copies: guard debug section with ui.debugflag
diff --git a/mercurial/copies.py b/mercurial/copies.py
--- a/mercurial/copies.py
+++ b/mercurial/copies.py
@@ -272,7 +272,7 @@ def mergecopies(repo, c1, c2, ca):
if len(fl) == 2 and fl[0] == fl[1]:
copy[fl[0]] = of # not actually divergent, just matching renames
- if fullcopy:
+ if fullcopy and repo.ui.debugflag:
repo.ui.debug(" all copies found (* = to merge, ! = divergent, "
"% = renamed and deleted):\n")
for f in sorted(fullcopy):
More information about the Mercurial-devel
mailing list