Mercurial > hg
changeset 28709:94494031f659
hgweb: add parents to json-log (issue5074)
Entries prepared in webutil.changelistentry() skip showing parents in the
trivial case when there's only one parent and it's the previous revision. This
doesn't work well for the json-log template, which is supposed to just dump raw
data in an easy-to-parse format, so let's provide all parents as another
keyword: allparents.
Using a lambda function here means that the performance of templates that don't
use allparents won't be affected (see 41957e50e109).
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Thu, 31 Mar 2016 18:09:09 +0800 |
| parents | ab06b5ef93f7 |
| children | ca0c0ca30c62 |
| files | mercurial/hgweb/webutil.py mercurial/templates/json/map tests/test-hgweb-json.t |
| diffstat | 3 files changed, 65 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/hgweb/webutil.py Mon Feb 29 17:46:06 2016 +0900 +++ b/mercurial/hgweb/webutil.py Thu Mar 31 18:09:09 2016 +0800 @@ -341,6 +341,7 @@ entry = commonentry(repo, ctx) entry.update( + allparents=lambda **x: parents(ctx), parent=lambda **x: parents(ctx, rev - 1), child=lambda **x: children(ctx, rev + 1), changelogtag=showtags,
--- a/mercurial/templates/json/map Mon Feb 29 17:46:06 2016 +0900 +++ b/mercurial/templates/json/map Thu Mar 31 18:09:09 2016 +0800 @@ -11,7 +11,8 @@ "desc": {desc|utf8|json}, "bookmarks": [{join(bookmarks%changelistentryname, ", ")}], "tags": [{join(tags%changelistentryname, ", ")}], - "user": {author|utf8|json} + "user": {author|utf8|json}, + "parents": [{join(allparents%changesetparent, ", ")}] }' changelistentryname = '{name|utf8|json}' changeset = '\{
--- a/tests/test-hgweb-json.t Mon Feb 29 17:46:06 2016 +0900 +++ b/tests/test-hgweb-json.t Thu Mar 31 18:09:09 2016 +0800 @@ -175,6 +175,10 @@ ], "desc": "merge test-branch into default", "node": "cc725e08502a79dd1eda913760fbe06ed7a9abc7", + "parents": [ + "ceed296fe500c3fac9541e31dad860cb49c89e45", + "ed66c30e87eb65337c05a4229efaa5f1d5285a90" + ], "tags": [ "tip" ], @@ -188,6 +192,9 @@ ], "desc": "another commit in test-branch", "node": "ed66c30e87eb65337c05a4229efaa5f1d5285a90", + "parents": [ + "6ab967a8ab3489227a83f80e920faa039a71819f" + ], "tags": [], "user": "test" }, @@ -199,6 +206,9 @@ ], "desc": "create test branch", "node": "6ab967a8ab3489227a83f80e920faa039a71819f", + "parents": [ + "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e" + ], "tags": [], "user": "test" }, @@ -212,6 +222,9 @@ ], "desc": "create tag2", "node": "ceed296fe500c3fac9541e31dad860cb49c89e45", + "parents": [ + "f2890a05fea49bfaf9fb27ed5490894eba32da78" + ], "tags": [], "user": "test" }, @@ -223,6 +236,9 @@ ], "desc": "another commit to da/foo", "node": "f2890a05fea49bfaf9fb27ed5490894eba32da78", + "parents": [ + "93a8ce14f89156426b7fa981af8042da53f03aa0" + ], "tags": [ "tag2" ], @@ -236,6 +252,9 @@ ], "desc": "create tag", "node": "93a8ce14f89156426b7fa981af8042da53f03aa0", + "parents": [ + "78896eb0e102174ce9278438a95e12543e4367a7" + ], "tags": [], "user": "test" }, @@ -247,6 +266,9 @@ ], "desc": "move foo", "node": "78896eb0e102174ce9278438a95e12543e4367a7", + "parents": [ + "8d7c456572acf3557e8ed8a07286b10c408bcec5" + ], "tags": [ "tag1" ], @@ -262,6 +284,9 @@ ], "desc": "modify da/foo", "node": "8d7c456572acf3557e8ed8a07286b10c408bcec5", + "parents": [ + "f8bbb9024b10f93cdbb8d940337398291d40dea8" + ], "tags": [], "user": "test" }, @@ -273,6 +298,9 @@ ], "desc": "modify foo", "node": "f8bbb9024b10f93cdbb8d940337398291d40dea8", + "parents": [ + "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e" + ], "tags": [], "user": "test" }, @@ -284,6 +312,7 @@ ], "desc": "initial", "node": "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e", + "parents": [], "tags": [], "user": "test" } @@ -307,6 +336,9 @@ ], "desc": "modify foo", "node": "f8bbb9024b10f93cdbb8d940337398291d40dea8", + "parents": [ + "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e" + ], "tags": [], "user": "test" }, @@ -318,6 +350,7 @@ ], "desc": "initial", "node": "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e", + "parents": [], "tags": [], "user": "test" } @@ -341,6 +374,10 @@ ], "desc": "merge test-branch into default", "node": "cc725e08502a79dd1eda913760fbe06ed7a9abc7", + "parents": [ + "ceed296fe500c3fac9541e31dad860cb49c89e45", + "ed66c30e87eb65337c05a4229efaa5f1d5285a90" + ], "tags": [ "tip" ], @@ -354,6 +391,9 @@ ], "desc": "another commit in test-branch", "node": "ed66c30e87eb65337c05a4229efaa5f1d5285a90", + "parents": [ + "6ab967a8ab3489227a83f80e920faa039a71819f" + ], "tags": [], "user": "test" }, @@ -365,6 +405,9 @@ ], "desc": "create test branch", "node": "6ab967a8ab3489227a83f80e920faa039a71819f", + "parents": [ + "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e" + ], "tags": [], "user": "test" }, @@ -378,6 +421,9 @@ ], "desc": "create tag2", "node": "ceed296fe500c3fac9541e31dad860cb49c89e45", + "parents": [ + "f2890a05fea49bfaf9fb27ed5490894eba32da78" + ], "tags": [], "user": "test" }, @@ -389,6 +435,9 @@ ], "desc": "another commit to da/foo", "node": "f2890a05fea49bfaf9fb27ed5490894eba32da78", + "parents": [ + "93a8ce14f89156426b7fa981af8042da53f03aa0" + ], "tags": [ "tag2" ], @@ -402,6 +451,9 @@ ], "desc": "create tag", "node": "93a8ce14f89156426b7fa981af8042da53f03aa0", + "parents": [ + "78896eb0e102174ce9278438a95e12543e4367a7" + ], "tags": [], "user": "test" }, @@ -413,6 +465,9 @@ ], "desc": "move foo", "node": "78896eb0e102174ce9278438a95e12543e4367a7", + "parents": [ + "8d7c456572acf3557e8ed8a07286b10c408bcec5" + ], "tags": [ "tag1" ], @@ -428,6 +483,9 @@ ], "desc": "modify da/foo", "node": "8d7c456572acf3557e8ed8a07286b10c408bcec5", + "parents": [ + "f8bbb9024b10f93cdbb8d940337398291d40dea8" + ], "tags": [], "user": "test" }, @@ -439,6 +497,9 @@ ], "desc": "modify foo", "node": "f8bbb9024b10f93cdbb8d940337398291d40dea8", + "parents": [ + "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e" + ], "tags": [], "user": "test" }, @@ -450,6 +511,7 @@ ], "desc": "initial", "node": "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e", + "parents": [], "tags": [], "user": "test" }