--- a/mercurial/cmdutil.py Wed Jan 14 14:24:16 2015 -0800
+++ b/mercurial/cmdutil.py Tue Feb 03 19:10:03 2015 -0600
@@ -1091,8 +1091,8 @@
if copies:
self.ui.write(',\n "copies": {%s}' %
- ", ".join('"%s": %s' % (j(k), j(copies[k]))
- for k in copies))
+ ", ".join('"%s": "%s"' % (j(k), j(v))
+ for k, v in copies))
matchfn = self.matchfn
if matchfn:
--- a/tests/test-log.t Wed Jan 14 14:24:16 2015 -0800
+++ b/tests/test-log.t Tue Feb 03 19:10:03 2015 -0600
@@ -494,7 +494,23 @@
e
-
+ $ hg log -vC -r4 -Tjson
+ [
+ {
+ "rev": 4,
+ "node": "7e4639b4691b9f84b81036a8d4fb218ce3c5e3a3",
+ "branch": "default",
+ "phase": "draft",
+ "user": "test",
+ "date": [5, 0],
+ "desc": "e",
+ "bookmarks": [],
+ "tags": ["tip"],
+ "parents": ["2ca5ba7019804f1f597249caddf22a64d34df0ba"],
+ "files": ["dir/b", "e"],
+ "copies": {"e": "dir/b"}
+ }
+ ]
log copies, non-linear manifest