##// END OF EJS Templates
log: have changesetformatter fill in wdir() rev and node (BC)...
Yuya Nishihara -
r39831:ba93db17 default
parent child Browse files
Show More
@@ -325,16 +325,9 b' class changesetformatter(changesetprinte'
325 '''show a single changeset or file revision'''
325 '''show a single changeset or file revision'''
326 fm = self._fm
326 fm = self._fm
327 fm.startitem()
327 fm.startitem()
328
329 fm.context(ctx=ctx)
328 fm.context(ctx=ctx)
330 # TODO: maybe this should be wdirrev/wdirnode?
329 fm.data(rev=scmutil.intrev(ctx),
331 rev = ctx.rev()
330 node=fm.hexfunc(scmutil.binnode(ctx)))
332 if rev is None:
333 hexnode = None
334 else:
335 hexnode = fm.hexfunc(ctx.node())
336 fm.data(rev=rev,
337 node=hexnode)
338
331
339 if self.ui.quiet:
332 if self.ui.quiet:
340 return
333 return
@@ -350,7 +343,7 b' class changesetformatter(changesetprinte'
350 for c in ctx.parents()], name='node'))
343 for c in ctx.parents()], name='node'))
351
344
352 if self.ui.debugflag:
345 if self.ui.debugflag:
353 if rev is None:
346 if ctx.rev() is None:
354 hexnode = None
347 hexnode = None
355 else:
348 else:
356 hexnode = fm.hexfunc(ctx.manifestnode())
349 hexnode = fm.hexfunc(ctx.manifestnode())
@@ -2208,10 +2208,10 b' dirty:'
2208 "branch": "default",
2208 "branch": "default",
2209 "date": [*, 0], (glob)
2209 "date": [*, 0], (glob)
2210 "desc": "",
2210 "desc": "",
2211 "node": null,
2211 "node": "ffffffffffffffffffffffffffffffffffffffff",
2212 "parents": ["65624cd9070a035fa7191a54f2b8af39f16b0c08"],
2212 "parents": ["65624cd9070a035fa7191a54f2b8af39f16b0c08"],
2213 "phase": "draft",
2213 "phase": "draft",
2214 "rev": null,
2214 "rev": 2147483647,
2215 "tags": [],
2215 "tags": [],
2216 "user": "test"
2216 "user": "test"
2217 }
2217 }
@@ -2220,8 +2220,8 b' dirty:'
2220 $ hg log -r 'wdir()' -Tjson -q
2220 $ hg log -r 'wdir()' -Tjson -q
2221 [
2221 [
2222 {
2222 {
2223 "node": null,
2223 "node": "ffffffffffffffffffffffffffffffffffffffff",
2224 "rev": null
2224 "rev": 2147483647
2225 }
2225 }
2226 ]
2226 ]
2227
2227
@@ -2236,11 +2236,11 b' dirty:'
2236 "extra": {"branch": "default"},
2236 "extra": {"branch": "default"},
2237 "manifest": null,
2237 "manifest": null,
2238 "modified": ["d1/f1"],
2238 "modified": ["d1/f1"],
2239 "node": null,
2239 "node": "ffffffffffffffffffffffffffffffffffffffff",
2240 "parents": ["65624cd9070a035fa7191a54f2b8af39f16b0c08"],
2240 "parents": ["65624cd9070a035fa7191a54f2b8af39f16b0c08"],
2241 "phase": "draft",
2241 "phase": "draft",
2242 "removed": [".d6/f1"],
2242 "removed": [".d6/f1"],
2243 "rev": null,
2243 "rev": 2147483647,
2244 "tags": [],
2244 "tags": [],
2245 "user": "test"
2245 "user": "test"
2246 }
2246 }
@@ -52,6 +52,27 b' experimental:'
52 $ hg log -r 'wdir()' -T '{rev}:{node}\n'
52 $ hg log -r 'wdir()' -T '{rev}:{node}\n'
53 2147483647:ffffffffffffffffffffffffffffffffffffffff
53 2147483647:ffffffffffffffffffffffffffffffffffffffff
54
54
55 $ hg log -r 'wdir()' -Tjson --debug
56 [
57 {
58 "added": [],
59 "bookmarks": [],
60 "branch": "default",
61 "date": [0, 0],
62 "desc": "",
63 "extra": {"branch": "default"},
64 "manifest": null,
65 "modified": [],
66 "node": "ffffffffffffffffffffffffffffffffffffffff",
67 "parents": ["95c24699272ef57d062b8bccc32c878bf841784a"],
68 "phase": "draft",
69 "removed": [],
70 "rev": 2147483647,
71 "tags": [],
72 "user": "test"
73 }
74 ]
75
55 Some keywords are invalid for working-directory revision, but they should
76 Some keywords are invalid for working-directory revision, but they should
56 never cause crash:
77 never cause crash:
57
78
General Comments 0
You need to be logged in to leave comments. Login now