##// END OF EJS Templates
identify: change p1/p2 to a list of parents...
Yuya Nishihara -
r33089:9e0d222f default
parent child Browse files
Show More
@@ -2790,12 +2790,12 b' def identify(ui, repo, source=None, rev='
2790 numoutput = ["%d" % p.rev() for p in parents]
2790 numoutput = ["%d" % p.rev() for p in parents]
2791 output.append("%s%s" % ('+'.join(numoutput), dirty))
2791 output.append("%s%s" % ('+'.join(numoutput), dirty))
2792
2792
2793 for i, p in enumerate(parents):
2793 fn = fm.nested('parents')
2794 fn = fm.nested('p%d' % (i + 1))
2794 for p in parents:
2795 fn.startitem()
2795 fn.startitem()
2796 fn.data(rev=p.rev())
2796 fn.data(rev=p.rev())
2797 fn.data(node=p.hex())
2797 fn.data(node=p.hex())
2798 fn.end()
2798 fn.end()
2799 else:
2799 else:
2800 hexoutput = hexfunc(ctx.node())
2800 hexoutput = hexfunc(ctx.node())
2801 if default or id:
2801 if default or id:
@@ -51,7 +51,7 b' with options'
51 "dirty": "",
51 "dirty": "",
52 "id": "cb9a9f314b8b",
52 "id": "cb9a9f314b8b",
53 "node": "ffffffffffffffffffffffffffffffffffffffff",
53 "node": "ffffffffffffffffffffffffffffffffffffffff",
54 "p1": [{"node": "cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b", "rev": 0}],
54 "parents": [{"node": "cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b", "rev": 0}],
55 "tags": ["tip"]
55 "tags": ["tip"]
56 }
56 }
57 ]
57 ]
@@ -69,7 +69,7 b' with modifications'
69 "dirty": "+",
69 "dirty": "+",
70 "id": "cb9a9f314b8b+",
70 "id": "cb9a9f314b8b+",
71 "node": "ffffffffffffffffffffffffffffffffffffffff",
71 "node": "ffffffffffffffffffffffffffffffffffffffff",
72 "p1": [{"node": "cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b", "rev": 0}],
72 "parents": [{"node": "cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b", "rev": 0}],
73 "tags": ["tip"]
73 "tags": ["tip"]
74 }
74 }
75 ]
75 ]
@@ -57,8 +57,7 b' Should succeed:'
57 "dirty": "+",
57 "dirty": "+",
58 "id": "f25cbe84d8b3+2d95304fed5d+",
58 "id": "f25cbe84d8b3+2d95304fed5d+",
59 "node": "ffffffffffffffffffffffffffffffffffffffff",
59 "node": "ffffffffffffffffffffffffffffffffffffffff",
60 "p1": [{"node": "f25cbe84d8b320e298e7703f18a25a3959518c23", "rev": 4}],
60 "parents": [{"node": "f25cbe84d8b320e298e7703f18a25a3959518c23", "rev": 4}, {"node": "2d95304fed5d89bc9d70b2a0d02f0d567469c3ab", "rev": 2}],
61 "p2": [{"node": "2d95304fed5d89bc9d70b2a0d02f0d567469c3ab", "rev": 2}],
62 "tags": ["tip"]
61 "tags": ["tip"]
63 }
62 }
64 ]
63 ]
General Comments 0
You need to be logged in to leave comments. Login now