# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: crispin@yossarian-20081218121654-y9h3lhwo1co8yqgs
# target_branch: http://bazaar.launchpad.net/%7Eloggerhead-\
#   team/loggerhead/trunk/
# testament_sha1: bf615e38b8b7e5d008036cf88ec93afb9fbbbdb3
# timestamp: 2008-12-18 12:18:06 +0000
# base_revision_id: argentina@gmail.com-20081126173818-\
#   exr29rhmyqugyiw0
# 
# Begin patch
=== modified file 'loggerhead/history.py'
--- loggerhead/history.py	2008-10-27 02:05:58 +0000
+++ loggerhead/history.py	2008-12-04 22:20:59 +0000
@@ -609,6 +609,7 @@
         Given a bzrlib Revision, return a processed "change" for use in
         templates.
         """
+        revtags = ""
         commit_time = datetime.datetime.fromtimestamp(revision.timestamp)
 
         parents = [util.Container(revid=r,
@@ -616,6 +617,11 @@
 
         message, short_message = clean_message(revision.message)
 
+        tags = self._branch.tags.get_reverse_tag_dict()
+
+        if tags.has_key(revision.revision_id):
+          revtags = ', '.join(tags[revision.revision_id])
+
         entry = {
             'revid': revision.revision_id,
             'date': commit_time,
@@ -625,6 +631,7 @@
             'comment': revision.message,
             'comment_clean': [util.html_clean(s) for s in message],
             'parents': revision.parent_ids,
+            'tags' : revtags
         }
         return util.Container(entry)
 

=== modified file 'loggerhead/static/css/diff.css'
--- loggerhead/static/css/diff.css	2008-07-24 22:07:40 +0000
+++ loggerhead/static/css/diff.css	2008-12-04 22:20:59 +0000
@@ -31,7 +31,7 @@
 	width:493px;
 	margin:0px 0px 5px 0px;
 }
-.information, .comiter, .timer, .mfrom, .mto, .revid {
+.information, .comiter, .timer, .mfrom, .mto, .revid, .tags {
 	clear:both;
 	margin:0px;
 	padding:0px 0px 2px 18px;

=== modified file 'loggerhead/static/css/files.css'
--- loggerhead/static/css/files.css	2008-08-07 04:34:31 +0000
+++ loggerhead/static/css/files.css	2008-12-18 12:16:54 +0000
@@ -7,7 +7,7 @@
 	background:#fcfcfc;
 	border:1px solid #b7b7b7;
 }
-.information, .comiter, .timer, .mfrom, .mto, .revid {
+.information, .comiter, .timer, .mfrom, .mto, .revid, .tags {
 	float:left;
 	margin:0px 10px 5px 0px;
 	padding:0px 0px 2px 18px;

=== modified file 'loggerhead/static/css/global.css'
--- loggerhead/static/css/global.css	2008-09-09 22:47:45 +0000
+++ loggerhead/static/css/global.css	2008-12-18 12:16:54 +0000
@@ -269,6 +269,9 @@
 ul.expandrev li.committerli {
 	background:url(../images/ico_committer.gif) 2px 0px no-repeat;
 }
+ul.expandrev li.tagli {
+        background:url(../images/ico_description.gif) 0px 0px no-repeat;
+}
 ul.expandrev li.desc {
 	background:url(../images/ico_description.gif) 0px 0px no-repeat;
 	color:#666;

=== modified file 'loggerhead/templates/changelog.pt'
--- loggerhead/templates/changelog.pt	2008-10-30 11:37:16 +0000
+++ loggerhead/templates/changelog.pt	2008-12-18 12:16:54 +0000
@@ -120,6 +120,7 @@
                                                title="Show history" class="link"></a>
                                         </li>
                                         <li class="committerli" tal:content="python:util.hide_email(entry.author)"></li>
+                                        <li class="tagli" tal:content="string:tags: ${entry/tags}"></li>
                                         <tal:block content="structure python:file_change_summary(url, entry, modified_file_link_log)" />
                                     </ul>
                                 </div>

=== modified file 'loggerhead/templates/revisioninfo.pt'
--- loggerhead/templates/revisioninfo.pt	2008-08-05 19:25:28 +0000
+++ loggerhead/templates/revisioninfo.pt	2008-12-04 22:20:59 +0000
@@ -13,6 +13,7 @@
                tal:content="python:revno_with_nick(merge_point)"></a>
         </div>
         <div class="revid" tal:content="string:Revision ID: ${change/revid}"></div>
+        <div class="tags" tal:content="string:Tags: ${change/tags}"></div>
         <div class="information" tal:content="python:util.fixed_width(change.comment)"></div>
     </div>
     <ul id="list-files">

# Begin bundle
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