comparison tests/test-identify.t @ 33051:15a79ac823e8

identify: add template support This is based on a patch proposed last year by Mathias De Maré[1], with a few changes. - Tags and bookmarks are now formatted lists, for more flexible queries. - The templater is populated whether or not [-nibtB] is specified. (Plain output is unchanged.) This seems more consistent with other templated commands. - The 'id' property is a string, instead of a list. - The parents of 'wdir()' have their own list of attributes. I left 'id' as a string because it seems very useful for generating version info. It's also a bit strange because the value and meaning changes depending on whether or not --debug is passed (short vs full hash), whether the revision is a merge or not (one hash or two, separated by a '+'), the working directory or not (node vs p1node), and local or not (remote defaults to tip, and never has '+'). The equivalent string built with {rev} seems much less useful, and I couldn't think of a reasonable name, so I left it out. The discussion seemed to be pointing towards having a list of nodes, with more than one entry for a merge. It seems simpler to give the nodes a name, and use {node} for the actual commit probed, especially now that there is a virtual node for 'wdir()'. Yuya mentioned using fm.nested() in that thread, so I did for the parent nodes. I'm not sure if the plan is to fill in all of the context attributes in these items, or if these nested items should simply be made {p1node} and {p1rev}. I used ':' as the tag separator for consistency with {tags} in the log templater. Likewise, bookmarks are separated by a space for consistency with the corresponding log template. [1] https://www.mercurial-scm.org/pipermail/mercurial-devel/2016-August/087039.html
author Matt Harbison <matt_harbison@yahoo.com>
date Sat, 24 Jun 2017 23:09:21 -0400
parents 4b0fc75f9403
children a49ab7f5e7e7
comparison
equal deleted inserted replaced
33050:0a507da7d8ea 33051:15a79ac823e8
41 default 41 default
42 $ hg id -i 42 $ hg id -i
43 cb9a9f314b8b 43 cb9a9f314b8b
44 $ hg id -n -t -b -i 44 $ hg id -n -t -b -i
45 cb9a9f314b8b 0 default tip 45 cb9a9f314b8b 0 default tip
46 $ hg id -Tjson
47 [
48 {
49 "bookmarks": [],
50 "branch": "default",
51 "changed": "",
52 "id": "cb9a9f314b8b",
53 "node": "ffffffffffffffffffffffffffffffffffffffff",
54 "p1": [{"node": "cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b", "rev": 0}],
55 "tags": ["tip"]
56 }
57 ]
46 58
47 with modifications 59 with modifications
48 60
49 $ echo b > a 61 $ echo b > a
50 $ hg id -n -t -b -i 62 $ hg id -n -t -b -i
51 cb9a9f314b8b+ 0+ default tip 63 cb9a9f314b8b+ 0+ default tip
64 $ hg id -Tjson
65 [
66 {
67 "bookmarks": [],
68 "branch": "default",
69 "changed": "+",
70 "id": "cb9a9f314b8b+",
71 "node": "ffffffffffffffffffffffffffffffffffffffff",
72 "p1": [{"node": "cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b", "rev": 0}],
73 "tags": ["tip"]
74 }
75 ]
52 76
53 other local repo 77 other local repo
54 78
55 $ cd .. 79 $ cd ..
56 $ hg -R test id 80 $ hg -R test id