Show More
@@ -337,7 +337,7 b' proc readcommit {id} {' | |||
|
337 | 337 | |
|
338 | 338 | proc parsecommit {id contents listed olds} { |
|
339 | 339 | global commitinfo children nchildren parents nparents cdate ncleft |
|
340 | global firstparents | |
|
340 | global firstparents obsolete | |
|
341 | 341 | |
|
342 | 342 | set inhdr 1 |
|
343 | 343 | set comment {} |
@@ -389,6 +389,8 b' proc parsecommit {id contents listed old' | |||
|
389 | 389 | set branch [join [lrange $line 1 end]] |
|
390 | 390 | } elseif {$tag == "bookmark"} { |
|
391 | 391 | set bookmark [join [lrange $line 1 end]] |
|
392 | } elseif {$tag == "obsolete"} { | |
|
393 | set obsolete($id) "" | |
|
392 | 394 | } |
|
393 | 395 | } |
|
394 | 396 | } else { |
@@ -1139,7 +1141,7 b' proc drawcommitline {level} {' | |||
|
1139 | 1141 | global lineno lthickness mainline mainlinearrow sidelines |
|
1140 | 1142 | global commitlisted rowtextx idpos lastuse displist |
|
1141 | 1143 | global oldnlines olddlevel olddisplist |
|
1142 | global aucolormap curid curidfont | |
|
1144 | global aucolormap curid curidfont obsolete | |
|
1143 | 1145 | |
|
1144 | 1146 | incr numcommits |
|
1145 | 1147 | incr lineno |
@@ -1155,6 +1157,9 b' proc drawcommitline {level} {' | |||
|
1155 | 1157 | set nparents($id) 0 |
|
1156 | 1158 | } |
|
1157 | 1159 | } |
|
1160 | if {[info exists obsolete($id)]} { | |
|
1161 | set ofill darkgrey | |
|
1162 | } | |
|
1158 | 1163 | assigncolor $id |
|
1159 | 1164 | set currentparents {} |
|
1160 | 1165 | set dupparents {} |
@@ -35,7 +35,7 b' vdiff on hovered and selected revisions.' | |||
|
35 | 35 | ''' |
|
36 | 36 | |
|
37 | 37 | import os |
|
38 | from mercurial import cmdutil, commands, patch, revlog, scmutil | |
|
38 | from mercurial import cmdutil, commands, patch, revlog, scmutil, obsolete | |
|
39 | 39 | from mercurial.node import nullid, nullrev, short |
|
40 | 40 | from mercurial.i18n import _ |
|
41 | 41 | |
@@ -128,6 +128,9 b' def catcommit(ui, repo, n, prefix, ctx=N' | |||
|
128 | 128 | ui.write(("committer %s %s %s\n" % (committer, int(date[0]), date[1]))) |
|
129 | 129 | ui.write(("revision %d\n" % ctx.rev())) |
|
130 | 130 | ui.write(("branch %s\n" % ctx.branch())) |
|
131 | if obsolete.isenabled(repo, obsolete.createmarkersopt): | |
|
132 | if ctx.obsolete(): | |
|
133 | ui.write(("obsolete\n")) | |
|
131 | 134 | ui.write(("phase %s\n\n" % ctx.phasestr())) |
|
132 | 135 | |
|
133 | 136 | if prefix != "": |
General Comments 0
You need to be logged in to leave comments.
Login now