Patchwork [8,of,8,ancestor-ish] copies: guard debug section with ui.debugflag

login
register
mail settings
Submitter Mads Kiilerich
Date April 7, 2014, 9:18 p.m.
Message ID <739476e625346731b59b.1396905504@mk-desktop>
Download mbox | patch
Permalink /patch/4263/
State Accepted
Commit d9e211a658eb4fb17e1d951bcd9438d4b2c8ddb2
Headers show

Comments

Mads Kiilerich - April 7, 2014, 9:18 p.m.
# HG changeset patch
# User Mads Kiilerich <madski@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
Matt Mackall - April 11, 2014, 9:54 p.m.
On Mon, 2014-04-07 at 23:18 +0200, Mads Kiilerich wrote:
> # HG changeset patch
> # User Mads Kiilerich <madski@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

These are queued for default, thanks.

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