[PATCH 6 of 8 v2] copies: guard debug section with ui.debugflag
Mads Kiilerich
mads at kiilerich.com
Tue Feb 25 13:40:28 CST 2014
# HG changeset patch
# User Mads Kiilerich <madski at unity3d.com>
# Date 1393356713 -3600
# Tue Feb 25 20:31:53 2014 +0100
# Node ID b0f2f46090caebdffabc0e981ab8f59187e4ced8
# Parent 817b7fc6d4249035c6988dbad35537217292fbee
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