##// END OF EJS Templates
coal/paper: show branch name in changeset view
Dirkjan Ochtman -
r7410:f1111704 default
parent child Browse files
Show More
@@ -227,6 +227,7 b' def shortlog(web, req, tmpl):'
227 def changeset(web, req, tmpl):
227 def changeset(web, req, tmpl):
228 ctx = webutil.changectx(web.repo, req)
228 ctx = webutil.changectx(web.repo, req)
229 showtags = webutil.showtag(web.repo, tmpl, 'changesettag', ctx.node())
229 showtags = webutil.showtag(web.repo, tmpl, 'changesettag', ctx.node())
230 showbranch = webutil.nodebranchnodefault(ctx)
230 parents = ctx.parents()
231 parents = ctx.parents()
231
232
232 files = []
233 files = []
@@ -246,6 +247,7 b' def changeset(web, req, tmpl):'
246 parent=webutil.siblings(parents),
247 parent=webutil.siblings(parents),
247 child=webutil.siblings(ctx.children()),
248 child=webutil.siblings(ctx.children()),
248 changesettag=showtags,
249 changesettag=showtags,
250 changesetbranch=showbranch,
249 author=ctx.user(),
251 author=ctx.user(),
250 desc=ctx.description(),
252 desc=ctx.description(),
251 date=ctx.date(),
253 date=ctx.date(),
@@ -26,7 +26,7 b''
26 <div class="main">
26 <div class="main">
27
27
28 <h2><a href="{url}{sessionvars%urlparameter}">{repo|escape}</a></h2>
28 <h2><a href="{url}{sessionvars%urlparameter}">{repo|escape}</a></h2>
29 <h3>changeset {rev}:{node|short} {changesettag}</h3>
29 <h3>changeset {rev}:{node|short} {changesetbranch%changelogbranchname} {changesettag}</h3>
30
30
31 <form class="search" action="{url}log">
31 <form class="search" action="{url}log">
32 {sessionvars%hiddenformentry}
32 {sessionvars%hiddenformentry}
@@ -131,6 +131,10 b' ul#graphnodes .branchhead {'
131 vertical-align: baseline;
131 vertical-align: baseline;
132 }
132 }
133
133
134 h3 .branchname {
135 font-size: 80%;
136 }
137
134 /* Common */
138 /* Common */
135 pre { margin: 0; }
139 pre { margin: 0; }
136
140
@@ -122,6 +122,10 b' ul#graphnodes .branchhead {'
122 vertical-align: baseline;
122 vertical-align: baseline;
123 }
123 }
124
124
125 h3 .branchname {
126 font-size: 80%;
127 }
128
125 /* Common */
129 /* Common */
126 pre { margin: 0; }
130 pre { margin: 0; }
127
131
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
@@ -41,7 +41,7 b' 200 Script output follows'
41 <div class="main">
41 <div class="main">
42
42
43 <h2><a href="/">test</a></h2>
43 <h2><a href="/">test</a></h2>
44 <h3>changeset 0:0cd96de13884 </h3>
44 <h3>changeset 0:0cd96de13884 </h3>
45
45
46 <form class="search" action="/log">
46 <form class="search" action="/log">
47
47
@@ -223,7 +223,7 b' 200 Script output follows'
223 <div class="main">
223 <div class="main">
224
224
225 <h2><a href="/">test</a></h2>
225 <h2><a href="/">test</a></h2>
226 <h3>changeset 0:0cd96de13884 </h3>
226 <h3>changeset 0:0cd96de13884 </h3>
227
227
228 <form class="search" action="/log">
228 <form class="search" action="/log">
229
229
@@ -39,7 +39,7 b' 200 Script output follows'
39 <div class="main">
39 <div class="main">
40
40
41 <h2><a href="/">test</a></h2>
41 <h2><a href="/">test</a></h2>
42 <h3>changeset 1:c78f6c5cbea9 <span class="tag">tip</span> </h3>
42 <h3>changeset 1:c78f6c5cbea9 <span class="tag">tip</span> </h3>
43
43
44 <form class="search" action="/log">
44 <form class="search" action="/log">
45
45
General Comments 0
You need to be logged in to leave comments. Login now