Patchwork blackbox: fix exception when logging commands with format characters

login
register
mail settings
Submitter Durham Goode
Date Feb. 28, 2013, 6:15 p.m.
Message ID <adbb2ebc035ecae18b8e.1362075330@dev350.prn1.facebook.com>
Download mbox | patch
Permalink /patch/1064/
State Superseded
Commit 6aca4d1c744ed8f6c1305525ded7590abaa72d06
Headers show

Comments

Durham Goode - Feb. 28, 2013, 6:15 p.m.
# HG changeset patch
# User Durham Goode <durham@fb.com>
# Date 1362075146 28800
#      Thu Feb 28 10:12:26 2013 -0800
# Node ID adbb2ebc035ecae18b8eaa1777363314d522728d
# Parent  4bfd54a664a497c3a51623c2dc8edba7bbd836a5
blackbox: fix exception when logging commands with format characters

When running commands like 'hg export -o mypatch-%N.patch', the blackbox
would throw an exception because it tried to format %N. This change
prevents it from trying to format the command string.

Patch

diff --git a/mercurial/dispatch.py b/mercurial/dispatch.py
--- a/mercurial/dispatch.py
+++ b/mercurial/dispatch.py
@@ -737,7 +737,7 @@ 
         ui.warn(_("warning: --repository ignored\n"))
 
     msg = ' '.join(' ' in a and repr(a) or a for a in fullargs)
-    ui.log("command", msg + "\n")
+    ui.log("command", '%s\n', msg)
     d = lambda: util.checksignature(func)(ui, *args, **cmdoptions)
     starttime = time.time()
     ret = None