Show More
@@ -1260,8 +1260,12 b' class jsonchangeset(changeset_printer):' | |||
|
1260 | 1260 | |
|
1261 | 1261 | def _show(self, ctx, copies, matchfn, props): |
|
1262 | 1262 | '''show a single changeset or file revision''' |
|
1263 | hexnode = hex(ctx.node()) | |
|
1264 | 1263 | rev = ctx.rev() |
|
1264 | if rev is None: | |
|
1265 | jrev = jnode = 'null' | |
|
1266 | else: | |
|
1267 | jrev = str(rev) | |
|
1268 | jnode = '"%s"' % hex(ctx.node()) | |
|
1265 | 1269 | j = encoding.jsonescape |
|
1266 | 1270 | |
|
1267 | 1271 | if self._first: |
@@ -1271,13 +1275,13 b' class jsonchangeset(changeset_printer):' | |||
|
1271 | 1275 | self.ui.write(",\n {") |
|
1272 | 1276 | |
|
1273 | 1277 | if self.ui.quiet: |
|
1274 |
self.ui.write('\n "rev": % |
|
|
1275 |
self.ui.write(',\n "node": |
|
|
1278 | self.ui.write('\n "rev": %s' % jrev) | |
|
1279 | self.ui.write(',\n "node": %s' % jnode) | |
|
1276 | 1280 | self.ui.write('\n }') |
|
1277 | 1281 | return |
|
1278 | 1282 | |
|
1279 |
self.ui.write('\n "rev": % |
|
|
1280 |
self.ui.write(',\n "node": |
|
|
1283 | self.ui.write('\n "rev": %s' % jrev) | |
|
1284 | self.ui.write(',\n "node": %s' % jnode) | |
|
1281 | 1285 | self.ui.write(',\n "branch": "%s"' % j(ctx.branch())) |
|
1282 | 1286 | self.ui.write(',\n "phase": "%s"' % ctx.phasestr()) |
|
1283 | 1287 | self.ui.write(',\n "user": "%s"' % j(ctx.user())) |
@@ -1642,6 +1642,30 b' working-directory revision requires spec' | |||
|
1642 | 1642 | date: [A-Za-z0-9:+ ]+ (re) |
|
1643 | 1643 | extra: branch=default |
|
1644 | 1644 | |
|
1645 | $ hg log -r 'wdir()' -Tjson | |
|
1646 | [ | |
|
1647 | { | |
|
1648 | "rev": null, | |
|
1649 | "node": null, | |
|
1650 | "branch": "default", | |
|
1651 | "phase": "draft", | |
|
1652 | "user": "test", | |
|
1653 | "date": [*, 0], (glob) | |
|
1654 | "desc": "", | |
|
1655 | "bookmarks": [], | |
|
1656 | "tags": ["tip"], | |
|
1657 | "parents": ["65624cd9070a035fa7191a54f2b8af39f16b0c08"] | |
|
1658 | } | |
|
1659 | ] | |
|
1660 | ||
|
1661 | $ hg log -r 'wdir()' -Tjson -q | |
|
1662 | [ | |
|
1663 | { | |
|
1664 | "rev": null, | |
|
1665 | "node": null | |
|
1666 | } | |
|
1667 | ] | |
|
1668 | ||
|
1645 | 1669 | Check that adding an arbitrary name shows up in log automatically |
|
1646 | 1670 | |
|
1647 | 1671 | $ cat > ../names.py <<EOF |
General Comments 0
You need to be logged in to leave comments.
Login now