Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/cmdutil.py @ 23734:f4e6475950f1 stable
cmdutil.jsonchangeset: properly compute added and removed files
jsonchangeset._show() was computing the reverse status of the current
changeset. As a result, added files were showing up as removed and
removed files were showing up as adds.
There were existing tests for this code and they were flat out wrong.
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Mon, 05 Jan 2015 22:18:55 -0800 |
| parents | 424d669118d3 |
| children | b9d06fa10ef2 |
comparison
equal
deleted
inserted
replaced
| 23724:aafeaba22826 | 23734:f4e6475950f1 |
|---|---|
| 1070 | 1070 |
| 1071 self.ui.write(',\n "extra": {%s}' % | 1071 self.ui.write(',\n "extra": {%s}' % |
| 1072 ", ".join('"%s": "%s"' % (j(k), j(v)) | 1072 ", ".join('"%s": "%s"' % (j(k), j(v)) |
| 1073 for k, v in ctx.extra().items())) | 1073 for k, v in ctx.extra().items())) |
| 1074 | 1074 |
| 1075 files = ctx.status(ctx.p1()) | 1075 files = ctx.p1().status(ctx) |
| 1076 self.ui.write(',\n "modified": [%s]' % | 1076 self.ui.write(',\n "modified": [%s]' % |
| 1077 ", ".join('"%s"' % j(f) for f in files[0])) | 1077 ", ".join('"%s"' % j(f) for f in files[0])) |
| 1078 self.ui.write(',\n "added": [%s]' % | 1078 self.ui.write(',\n "added": [%s]' % |
| 1079 ", ".join('"%s"' % j(f) for f in files[1])) | 1079 ", ".join('"%s"' % j(f) for f in files[1])) |
| 1080 self.ui.write(',\n "removed": [%s]' % | 1080 self.ui.write(',\n "removed": [%s]' % |