Show More
@@ -809,8 +809,10 b' def showwhyunstable(context, mapping):' | |||||
809 | for entry in entries: |
|
809 | for entry in entries: | |
810 | if entry.get('divergentnodes'): |
|
810 | if entry.get('divergentnodes'): | |
811 | dnodes = entry['divergentnodes'] |
|
811 | dnodes = entry['divergentnodes'] | |
812 | entry['divergentnodes'] = ''.join(formatnode(dnode) |
|
812 | dnhybrid = _hybrid(None, [dnode.hex() for dnode in dnodes], | |
813 | for dnode in dnodes) |
|
813 | lambda x: {'ctx': repo[x]}, | |
|
814 | lambda x: formatnode(repo[x])) | |||
|
815 | entry['divergentnodes'] = dnhybrid | |||
814 |
|
816 | |||
815 | tmpl = '{instability}:{divergentnodes} {reason} {node|short}' |
|
817 | tmpl = '{instability}:{divergentnodes} {reason} {node|short}' | |
816 | return templateutil.mappinglist(entries, tmpl=tmpl, sep='\n') |
|
818 | return templateutil.mappinglist(entries, tmpl=tmpl, sep='\n') |
@@ -725,6 +725,8 b' Use scmutil.cleanupnodes API to create d' | |||||
725 | content-divergent: 4:70d5a63ca112 (draft) predecessor a178212c3433 |
|
725 | content-divergent: 4:70d5a63ca112 (draft) predecessor a178212c3433 | |
726 | $ hg log -r 1a2a9b5b0030 --hidden -T '{whyunstable%"{instability}:{divergentnodes} {reason} {node}\n"}' |
|
726 | $ hg log -r 1a2a9b5b0030 --hidden -T '{whyunstable%"{instability}:{divergentnodes} {reason} {node}\n"}' | |
727 | content-divergent: 4:70d5a63ca112 (draft) predecessor a178212c3433c4e77b573f6011e29affb8aefa33 |
|
727 | content-divergent: 4:70d5a63ca112 (draft) predecessor a178212c3433c4e77b573f6011e29affb8aefa33 | |
|
728 | $ hg log -r 1a2a9b5b0030 --hidden -T '{whyunstable%"{instability}:{divergentnodes % " {node} ({phase})"} {reason} {node}\n"}' | |||
|
729 | content-divergent: 70d5a63ca112acb3764bc1d7320ca90ea688d671 (draft) predecessor a178212c3433c4e77b573f6011e29affb8aefa33 | |||
728 |
|
730 | |||
729 | #if serve |
|
731 | #if serve | |
730 |
|
732 |
General Comments 0
You need to be logged in to leave comments.
Login now