Patchwork [6,of,8,v2] copies: guard debug section with ui.debugflag

login
register
mail settings
Submitter Mads Kiilerich
Date Feb. 25, 2014, 7:40 p.m.
Message ID <b0f2f46090caebdffabc.1393357228@mk-desktop>
Download mbox | patch
Permalink /patch/3767/
State Superseded
Commit d9e211a658eb4fb17e1d951bcd9438d4b2c8ddb2
Headers show

Comments

Mads Kiilerich - Feb. 25, 2014, 7:40 p.m.
# HG changeset patch
# User Mads Kiilerich <madski@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

Patch

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):