##// END OF EJS Templates
graphlog: display obsolete changeset as "x"...
Pierre-Yves David -
r17119:2e13c1bd default
parent child Browse files
Show More
@@ -455,7 +455,11 b' def generate(ui, dag, displayer, showpar'
455 filematcher=None):
455 filematcher=None):
456 seen, state = [], asciistate()
456 seen, state = [], asciistate()
457 for rev, type, ctx, parents in dag:
457 for rev, type, ctx, parents in dag:
458 char = ctx.node() in showparents and '@' or 'o'
458 char = 'o'
459 if ctx.node() in showparents:
460 char = '@'
461 elif ctx.obsolete():
462 char = 'x'
459 copies = None
463 copies = None
460 if getrenamed and ctx.rev():
464 if getrenamed and ctx.rev():
461 copies = []
465 copies = []
@@ -60,6 +60,83 b' Register two markers with a missing node'
60 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'}
60 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'}
61 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'}
61 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'}
62
62
63 Check that graphlog detect that a changeset is obsolete:
64
65 $ hg --config 'extensions.graphlog=' glog
66 @ changeset: 5:5601fb93a350
67 | tag: tip
68 | parent: 1:7c3bad9141dc
69 | user: test
70 | date: Thu Jan 01 00:00:00 1970 +0000
71 | summary: add new_3_c
72 |
73 | x changeset: 4:ca819180edb9
74 |/ parent: 1:7c3bad9141dc
75 | user: test
76 | date: Thu Jan 01 00:00:00 1970 +0000
77 | summary: add new_2_c
78 |
79 | x changeset: 3:cdbce2fbb163
80 |/ parent: 1:7c3bad9141dc
81 | user: test
82 | date: Thu Jan 01 00:00:00 1970 +0000
83 | summary: add new_c
84 |
85 | x changeset: 2:245bde4270cd
86 |/ user: test
87 | date: Thu Jan 01 00:00:00 1970 +0000
88 | summary: add original_c
89 |
90 o changeset: 1:7c3bad9141dc
91 | user: test
92 | date: Thu Jan 01 00:00:00 1970 +0000
93 | summary: add b
94 |
95 o changeset: 0:1f0dee641bb7
96 user: test
97 date: Thu Jan 01 00:00:00 1970 +0000
98 summary: add a
99
100
101 Check that public changeset are not accounted as obsolete:
102
103 $ hg phase --public 2
104 $ hg --config 'extensions.graphlog=' glog
105 @ changeset: 5:5601fb93a350
106 | tag: tip
107 | parent: 1:7c3bad9141dc
108 | user: test
109 | date: Thu Jan 01 00:00:00 1970 +0000
110 | summary: add new_3_c
111 |
112 | x changeset: 4:ca819180edb9
113 |/ parent: 1:7c3bad9141dc
114 | user: test
115 | date: Thu Jan 01 00:00:00 1970 +0000
116 | summary: add new_2_c
117 |
118 | x changeset: 3:cdbce2fbb163
119 |/ parent: 1:7c3bad9141dc
120 | user: test
121 | date: Thu Jan 01 00:00:00 1970 +0000
122 | summary: add new_c
123 |
124 | o changeset: 2:245bde4270cd
125 |/ user: test
126 | date: Thu Jan 01 00:00:00 1970 +0000
127 | summary: add original_c
128 |
129 o changeset: 1:7c3bad9141dc
130 | user: test
131 | date: Thu Jan 01 00:00:00 1970 +0000
132 | summary: add b
133 |
134 o changeset: 0:1f0dee641bb7
135 user: test
136 date: Thu Jan 01 00:00:00 1970 +0000
137 summary: add a
138
139
63 $ cd ..
140 $ cd ..
64
141
65 Exchange Test
142 Exchange Test
General Comments 0
You need to be logged in to leave comments. Login now