Fixes for raw_id, needed for git

Renamed hg controller to home
css html changes

rhodecode/config/routing.py

@@ -35,7 +35,7 b' def make_map(config):'
     #==========================================================================
 
     #MAIN PAGE
-    map.connect('hg_home', '/', controller='hg', action='index')
+    map.connect('home', '/', controller='home', action='index')
     map.connect('bugtracker', "http://bitbucket.org/marcinkuzminski/rhodecode/issues", _static=True)
     map.connect('gpl_license', "http://www.gnu.org/licenses/gpl.html", _static=True)
     #ADMIN REPOSITORY REST ROUTES

rhodecode/controllers/admin/repos.py

@@ -106,7 +106,7 b' class ReposController(BaseController):'
                     % form_result.get('repo_name')
             h.flash(msg, category='error')
         if request.POST.get('user_created'):
-            return redirect(url('hg_home'))    
+            return redirect(url('home'))
         return redirect(url('repos'))
     
     @HasPermissionAllDecorator('hg.admin')

rhodecode/controllers/changelog.py

@@ -77,7 +77,9 b' class ChangelogController(BaseController'
         if not repo.revisions:return json.dumps([]), 0
         
         max_rev = repo.revisions[-1]
+
         offset = 1 if p == 1 else  ((p - 1) * revcount + 1)
+
         rev_start = repo.revisions[(-1 * offset)]
         
         revcount = min(max_rev, revcount)

rhodecode/controllers/changeset.py

@@ -61,7 +61,7 b' class ChangesetController(BaseController'
             c.changeset = hg_model.get_repo(c.repo_name).get_changeset(revision)
         except RepositoryError:
             log.error(traceback.format_exc())
-            return redirect(url('hg_home'))
+            return redirect(url('home'))
         else:
             try:
                 c.changeset_old = c.changeset.parents[0]
@@ -89,7 +89,7 b' class ChangesetController(BaseController'
                                             ' off, see raw changeset instead'))
                         
                 cs1 = None
-                cs2 = node.last_changeset.short_id                                        
+                cs2 = node.last_changeset.raw_id
                 c.changes.append(('added', node, diff, cs1, cs2))
             
             #===================================================================
@@ -116,8 +116,8 b' class ChangesetController(BaseController'
                                             ' off, see raw changeset instead'))
                 
                 
-                cs1 = filenode_old.last_changeset.short_id
-                cs2 = node.last_changeset.short_id                    
+                cs1 = filenode_old.last_changeset.raw_id
+                cs2 = node.last_changeset.raw_id
                 c.changes.append(('changed', node, diff, cs1, cs2))
                 
             #===================================================================
@@ -136,7 +136,7 b' class ChangesetController(BaseController'
             c.changeset = hg_model.get_repo(c.repo_name).get_changeset(revision)
         except RepositoryError:
             log.error(traceback.format_exc())
-            return redirect(url('hg_home'))
+            return redirect(url('home'))
         else:
             try:
                 c.changeset_old = c.changeset.parents[0]
@@ -153,7 +153,7 b' class ChangesetController(BaseController'
                     diff = differ.DiffProcessor(f_udiff).raw_diff()
 
                 cs1 = None
-                cs2 = node.last_changeset.short_id                                        
+                cs2 = node.last_changeset.raw_id
                 c.changes.append(('added', node, diff, cs1, cs2))
                 
             for node in c.changeset.changed:
@@ -164,8 +164,8 b' class ChangesetController(BaseController'
                     f_udiff = differ.get_udiff(filenode_old, node)
                     diff = differ.DiffProcessor(f_udiff).raw_diff()
 
-                cs1 = filenode_old.last_changeset.short_id
-                cs2 = node.last_changeset.short_id                    
+                cs1 = filenode_old.last_changeset.raw_id
+                cs2 = node.last_changeset.raw_id
                 c.changes.append(('changed', node, diff, cs1, cs2))      
         
         response.content_type = 'text/plain'

rhodecode/controllers/feed.py

@@ -54,7 +54,7 b' class FeedController(BaseController):'
         for cs in changesets[:self.feed_nr]:
             feed.add_item(title=cs.message,
                           link=url('changeset_home', repo_name=repo_name,
-                                   revision=cs.short_id, qualified=True),
+                                   revision=cs.raw_id, qualified=True),
                                    description=str(cs.date))
         
         response.content_type = feed.mime_type
@@ -73,7 +73,7 b' class FeedController(BaseController):'
         for cs in changesets[:self.feed_nr]:
             feed.add_item(title=cs.message,
                           link=url('changeset_home', repo_name=repo_name,
-                                   revision=cs.short_id, qualified=True),
+                                   revision=cs.raw_id, qualified=True),
                           description=str(cs.date))
             
         response.content_type = feed.mime_type

rhodecode/controllers/files.py

@@ -69,8 +69,8 b' class FilesController(BaseController):'
         
         try:
             cur_rev = repo.get_changeset(revision).revision
-            prev_rev = repo.get_changeset(get_prev_rev(cur_rev)).short_id
-            next_rev = repo.get_changeset(get_next_rev(cur_rev)).short_id
+            prev_rev = repo.get_changeset(get_prev_rev(cur_rev)).raw_id
+            next_rev = repo.get_changeset(get_next_rev(cur_rev)).raw_id
                     
             c.url_prev = url('files_home', repo_name=c.repo_name,
                              revision=prev_rev, f_path=f_path) 
@@ -79,7 +79,7 b' class FilesController(BaseController):'
                     
             c.changeset = repo.get_changeset(revision)
                         
-            c.cur_rev = c.changeset.short_id
+            c.cur_rev = c.changeset.raw_id
             c.rev_nr = c.changeset.revision
             c.files_list = c.changeset.get_node(f_path)
             c.file_history = self._get_history(repo, c.files_list, f_path)
@@ -112,7 +112,7 b' class FilesController(BaseController):'
         cs = c.repo.get_changeset(revision)
         c.file = cs.get_node(f_path)
         c.file_msg = cs.get_file_message(f_path)
-        c.cur_rev = cs.short_id
+        c.cur_rev = cs.raw_id
         c.rev_nr = cs.revision        
         c.f_path = f_path
 
@@ -173,9 +173,6 b' class FilesController(BaseController):'
             return redirect(url('files_home',
                                 repo_name=c.repo_name, f_path=f_path))
 
-        c.diff1 = 'r%s:%s' % (c.changeset_1.revision, c.changeset_1.short_id)
-        c.diff2 = 'r%s:%s' % (c.changeset_2.revision, c.changeset_2.short_id)
-        
         f_udiff = differ.get_udiff(node1, node2)
         diff = differ.DiffProcessor(f_udiff)
                                 
@@ -211,5 +208,5 b' class FilesController(BaseController):'
         hist_l = []
         for chs in changesets:
             n_desc = 'r%s:%s' % (chs.revision, chs.short_id)
-            hist_l.append((chs.short_id, n_desc,))
+            hist_l.append((chs.raw_id, n_desc,))
         return hist_l

rhodecode/controllers/home.py

@@ -30,11 +30,11 b' from rhodecode.model.hg import HgModel'
 import logging
 log = logging.getLogger(__name__)
 
-class HgController(BaseController):
+class HomeController(BaseController):
 
     @LoginRequired()
     def __before__(self):
-        super(HgController, self).__before__()
+        super(HomeController, self).__before__()
         
     def index(self):
         sortables = ['name', 'description', 'last_change', 'tip', 'contact']

rhodecode/controllers/login.py

@@ -47,7 +47,7 b' class LoginController(BaseController):'
         c.came_from = request.GET.get('came_from', None)
         
         if c.rhodecode_user.is_authenticated:
-            return redirect(url('hg_home'))
+            return redirect(url('home'))
         
         if request.POST:
             #import Login Form validator class
@@ -72,7 +72,7 b' class LoginController(BaseController):'
                 if c.came_from:
                     return redirect(c.came_from)
                 else:
-                    return redirect(url('hg_home'))
+                    return redirect(url('home'))
                                
             except formencode.Invalid, errors:
                 return htmlfill.render(
@@ -141,4 +141,4 b' class LoginController(BaseController):'
         session['rhodecode_user'] = AuthUser()
         session.save()
         log.info('Logging out and setting user as Empty')
-        redirect(url('hg_home'))
+        redirect(url('home'))

rhodecode/controllers/settings.py

@@ -55,7 +55,7 b' class SettingsController(BaseController)'
                       ' in order to rescan repositories') % repo_name,
                       category='error')
         
-            return redirect(url('hg_home'))        
+            return redirect(url('home'))
         defaults = c.repo_info.__dict__
         defaults.update({'user':c.repo_info.user.username})
         c.users_array = repo_model.get_users_js()
@@ -119,7 +119,7 b' class SettingsController(BaseController)'
                       ' in order to rescan repositories') % repo_name,
                       category='error')
         
-            return redirect(url('hg_home'))
+            return redirect(url('home'))
         try:
             action_logger(self.rhodecode_user, 'user_deleted_repo',
                               repo_name, '', self.sa)            
@@ -130,7 +130,7 b' class SettingsController(BaseController)'
             h.flash(_('An error occurred during deletion of %s') % repo_name,
                     category='error')
         
-        return redirect(url('hg_home'))
+        return redirect(url('home'))
     
     def fork(self, repo_name):
         repo_model = RepoModel()
@@ -142,7 +142,7 b' class SettingsController(BaseController)'
                       ' in order to rescan repositories') % repo_name,
                       category='error')
         
-            return redirect(url('hg_home'))
+            return redirect(url('home'))
         
         return render('settings/repo_fork.html')
     
@@ -172,4 +172,4 b' class SettingsController(BaseController)'
                 errors=errors.error_dict or {},
                 prefix_error=False,
                 encoding="UTF-8")   
-        return redirect(url('hg_home'))
+        return redirect(url('home'))

rhodecode/lib/helpers.py

@@ -272,12 +272,12 b' def pygmentize_annotation(filenode, **kw'
                                                changeset.date,
                                                tooltip(changeset.message))
         lnk_format = 'r%-5s:%s' % (changeset.revision,
-                                 changeset.short_id)
+                                 changeset.raw_id)
         uri = link_to(
                 lnk_format,
                 url('changeset_home', repo_name=changeset.repository.name,
-                    revision=changeset.short_id),
-                style=get_color_string(changeset.short_id),
+                    revision=changeset.raw_id),
+                style=get_color_string(changeset.raw_id),
                 class_='tooltip',
                 tooltip_title=tooltip_html
               )
@@ -352,6 +352,7 b' capitalize = lambda x: x.capitalize()'
 email = util.email
 email_or_none = lambda x: util.email(x) if util.email(x) != x else None
 person = lambda x: _person(x)
+short_id = lambda x: x[:12]
 
 #==============================================================================
 # PERMS

rhodecode/lib/utils.py

@@ -303,6 +303,7 b' class EmptyChangeset(BaseChangeset):'
     message = ''
     author = ''
     date = ''
+
     @LazyProperty
     def raw_id(self):
         """

rhodecode/model/hg.py

@@ -158,7 +158,7 b' class HgModel(object):'
             tmp_d['description_sort'] = tmp_d['description']
             tmp_d['last_change'] = last_change
             tmp_d['last_change_sort'] = time.mktime(last_change.timetuple())
-            tmp_d['tip'] = tip.short_id
+            tmp_d['tip'] = tip.raw_id
             tmp_d['tip_sort'] = tip.revision
             tmp_d['rev'] = tip.revision
             tmp_d['contact'] = repo.contact

rhodecode/public/css/style.css

@@ -1701,6 +1701,7 b' font:100% sans-serif;'
 width:auto;
 opacity:1px;
 padding:8px;
+white-space: pre;
 }
 
 .ac {

rhodecode/templates/base/base.html

@@ -31,7 +31,7 b''
         <div id="header-inner" class="title top-left-rounded-corner top-right-rounded-corner">
             <!-- logo -->
             <div id="logo">
-                <h1><a href="${h.url('hg_home')}">${c.rhodecode_name}</a></h1>
+                <h1><a href="${h.url('home')}">${c.rhodecode_name}</a></h1>
             </div>
             <!-- end logo -->
             <!-- menu -->
@@ -146,7 +146,7 b''
                             <ul>
                             %if c.repository_branches.values():
 						        %for cnt,branch in enumerate(c.repository_branches.items()):
-						            <li>${h.link_to('%s - %s' % (branch[0],branch[1]),h.url('files_home',repo_name=c.repo_name,revision=branch[1]))}</li>
+						            <li>${h.link_to('%s - %s' % (branch[0],h.short_id(branch[1])),h.url('files_home',repo_name=c.repo_name,revision=branch[1]))}</li>
 						        %endfor
 						    %else:
 						    	<li>${h.link_to(_('There are no branches yet'),'#')}</li>
@@ -158,7 +158,7 b''
                             <ul>
                             %if c.repository_tags.values():
                                 %for cnt,tag in enumerate(c.repository_tags.items()):
-                                 <li>${h.link_to('%s - %s' % (tag[0],tag[1]),h.url('files_home',repo_name=c.repo_name,revision=tag[1]))}</li>
+                                 <li>${h.link_to('%s - %s' % (tag[0],h.short_id(tag[1])),h.url('files_home',repo_name=c.repo_name,revision=tag[1]))}</li>
                                 %endfor
                             %else:
                             	<li>${h.link_to(_('There are no tags yet'),'#')}</li>
@@ -219,7 +219,7 b''
 		    ##ROOT MENU
             <ul id="quick">
                 <li>
-                    <a title="${_('Home')}"  href="${h.url('hg_home')}">
+                    <a title="${_('Home')}"  href="${h.url('home')}">
                     <span class="icon">
                         <img src="/images/icons/home_16.png" alt="${_('Home')}" />
                     </span>

rhodecode/templates/branches/branches_data.html

@@ -2,24 +2,26 b''
     <table class="table_disp">
         <tr>
             <th class="left">${_('date')}</th>
+            <th class="left">${_('name')}</th>
+            <th class="left">${_('author')}</th>
             <th class="left">${_('revision')}</th>
-            <th class="left">${_('name')}</th>
             <th class="left">${_('links')}</th>
         </tr>
 		%for cnt,branch in enumerate(c.repo_branches.items()):
 		<tr class="parity${cnt%2}">
-			<td>${h.age(branch[1].date)}</td>
-			<td>r${branch[1].revision}:${branch[1].short_id}</td>
+            <td>${branch[1].date} - ${h.age(branch[1].date)}</td>
 			<td>
 				<span class="logtags">
 					<span class="branchtag">${h.link_to(branch[0],
-					h.url('changeset_home',repo_name=c.repo_name,revision=branch[1].short_id))}</span>
+                    h.url('changeset_home',repo_name=c.repo_name,revision=branch[1].raw_id))}</span>
 				</span>			
 			</td>
+            <td title="${branch[1].author}">${h.person(branch[1].author)}</td>
+            <td>r${branch[1].revision}:${h.short_id(branch[1].raw_id)}</td>
 			<td class="nowrap">
-			${h.link_to(_('changeset'),h.url('changeset_home',repo_name=c.repo_name,revision=branch[1].short_id))}
+			${h.link_to(_('changeset'),h.url('changeset_home',repo_name=c.repo_name,revision=branch[1].raw_id))}
 			|
-			${h.link_to(_('files'),h.url('files_home',repo_name=c.repo_name,revision=branch[1].short_id))}
+			${h.link_to(_('files'),h.url('files_home',repo_name=c.repo_name,revision=branch[1].raw_id))}
 			</td>
 		</tr>	
 		%endfor

rhodecode/templates/changelog/changelog.html

@@ -46,7 +46,7 b''
 				%for cnt,cs in enumerate(c.pagination):
 					<div id="chg_${cnt+1}" class="container">
 						<div class="left">
-							<div class="date">${_('commit')} ${cs.revision}: ${cs.short_id}@${cs.date}</div>
+							<div class="date">${_('commit')} ${cs.revision}: ${cs.raw_id}@${cs.date}</div>
 							<div class="author">
 								<div class="gravatar">
 									<img alt="gravatar" src="${h.gravatar_url(h.email(cs.author),20)}"/>
@@ -54,7 +54,7 b''
 								<span>${h.person(cs.author)}</span><br/>
 								<span><a href="mailto:${h.email_or_none(cs.author)}">${h.email_or_none(cs.author)}</a></span><br/>
 							</div>
-							<div class="message">${h.link_to(h.wrap_paragraphs(cs.message),h.url('changeset_home',repo_name=c.repo_name,revision=cs.short_id))}</div>
+							<div class="message">${h.link_to(h.wrap_paragraphs(cs.message),h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</div>
 						</div>	
 						<div class="right">
 									<div class="changes">
@@ -69,8 +69,8 b''
 										%endif
 								   %if cs.parents:							
 									%for p_cs in reversed(cs.parents):
-										<div class="parent">${_('Parent')} ${p_cs.revision}: ${h.link_to(p_cs.short_id,
-											h.url('changeset_home',repo_name=c.repo_name,revision=p_cs.short_id),title=p_cs.message)}
+										<div class="parent">${_('Parent')} ${p_cs.revision}: ${h.link_to(p_cs.raw_id,
+											h.url('changeset_home',repo_name=c.repo_name,revision=p_cs.raw_id),title=p_cs.message)}
 										</div>
 									%endfor
 								   %else:	
@@ -79,10 +79,10 b''
                     									
 								<span class="logtags">
 									<span class="branchtag" title="${'%s %s' % (_('branch'),cs.branch)}">
-									${h.link_to(cs.branch,h.url('files_home',repo_name=c.repo_name,revision=cs.short_id))}</span>
+									${h.link_to(cs.branch,h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}</span>
 									%for tag in cs.tags:
 										<span class="tagtag"  title="${'%s %s' % (_('tag'),tag)}">
-										${h.link_to(tag,h.url('files_home',repo_name=c.repo_name,revision=cs.short_id))}</span>
+										${h.link_to(tag,h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}</span>
 									%endfor
 								</span>																	
 						</div>				

rhodecode/templates/changeset/changeset.html

@@ -1,7 +1,7 b''
 <%inherit file="/base/base.html"/>
 
 <%def name="title()">
-    ${c.repo_name} ${_('Changeset')} - r${c.changeset.revision}:${c.changeset.short_id}  - ${c.rhodecode_name}
+    ${c.repo_name} ${_('Changeset')} - r${c.changeset.revision}:${h.short_id(c.changeset.raw_id)} - ${c.rhodecode_name}
 </%def>
 
 <%def name="breadcrumbs_links()">
@@ -9,7 +9,7 b''
     &raquo;
     ${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))}
     &raquo;
-    ${_('Changeset')} - r${c.changeset.revision}:${c.changeset.short_id}
+    ${_('Changeset')} - r${c.changeset.revision}:${h.short_id(c.changeset.raw_id)}
 </%def>
 
 <%def name="page_nav()">
@@ -26,18 +26,18 b''
 		<div id="body" class="diffblock">
 			<div class="code-header">
 				<div>
-				${_('Changeset')} - r${c.changeset.revision}:${c.changeset.short_id}
+				${_('Changeset')} - r${c.changeset.revision}:${h.short_id(c.changeset.raw_id)}
 				 &raquo; <span>${h.link_to(_('raw diff'),
-				h.url('raw_changeset_home',repo_name=c.repo_name,revision=c.changeset.short_id,diff='show'))}</span>
+				h.url('raw_changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id,diff='show'))}</span>
 				 &raquo; <span>${h.link_to(_('download diff'),
-				h.url('raw_changeset_home',repo_name=c.repo_name,revision=c.changeset.short_id,diff='download'))}</span>
+				h.url('raw_changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id,diff='download'))}</span>
 				</div>
 			</div>
 		</div>
 	    <div id="changeset_content">
 			<div class="container">
 	             <div class="left">
-	                 <div class="date">${_('commit')} ${c.changeset.revision}: ${c.changeset.short_id}@${c.changeset.date}</div>
+	                 <div class="date">${_('commit')} ${c.changeset.revision}: ${h.short_id(c.changeset.raw_id)}@${c.changeset.date}</div>
 	                 <div class="author">
 	                     <div class="gravatar">
 	                         <img alt="gravatar" src="${h.gravatar_url(h.email(c.changeset.author),20)}"/>
@@ -45,7 +45,7 b''
 	                     <span>${h.person(c.changeset.author)}</span><br/>
 	                     <span><a href="mailto:${h.email_or_none(c.changeset.author)}">${h.email_or_none(c.changeset.author)}</a></span><br/>
 	                 </div>
-	                 <div class="message">${h.link_to(h.wrap_paragraphs(c.changeset.message),h.url('changeset_home',repo_name=c.repo_name,revision=c.changeset.short_id))}</div>
+	                 <div class="message">${h.link_to(h.wrap_paragraphs(c.changeset.message),h.url('changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}</div>
 	             </div>
 	             <div class="right">
 		             <div class="changes">
@@ -61,8 +61,8 b''
 		                 
 		            %if c.changeset.parents:
 		             %for p_cs in reversed(c.changeset.parents):
-		                 <div class="parent">${_('Parent')} ${p_cs.revision}: ${h.link_to(p_cs.short_id,
-		                     h.url('changeset_home',repo_name=c.repo_name,revision=p_cs.short_id),title=p_cs.message)}
+		                 <div class="parent">${_('Parent')} ${p_cs.revision}: ${h.link_to(h.short_id(p_cs.raw_id),
+		                     h.url('changeset_home',repo_name=c.repo_name,revision=p_cs.raw_id),title=p_cs.message)}
 		                 </div>
 		             %endfor
                     %else: 
@@ -70,10 +70,10 b''
                     %endif		             
 		         <span class="logtags">
 		             <span class="branchtag" title="${'%s %s' % (_('branch'),c.changeset.branch)}">
-		             ${h.link_to(c.changeset.branch,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.short_id))}</span>
+		             ${h.link_to(c.changeset.branch,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}</span>
 		             %for tag in c.changeset.tags:
 		                 <span class="tagtag"  title="${'%s %s' % (_('tag'),tag)}">
-		                 ${h.link_to(tag,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.short_id))}</span>
+		                 ${h.link_to(tag,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}</span>
 		             %endfor
 		         </span>                                                                 
 	                </div>              
@@ -96,7 +96,7 b''
 				<div>
 					<span>
 						${h.link_to_if(change!='removed',filenode.path,h.url('files_home',repo_name=c.repo_name,
-						revision=filenode.changeset.short_id,f_path=filenode.path))}
+						revision=filenode.changeset.raw_id,f_path=filenode.path))}
 					</span>
 					%if 1:
 					&raquo; <span>${h.link_to(_('diff'),

rhodecode/templates/errors/error_404.html

@@ -6,7 +6,7 b''
 </%def>
 
 <%def name="breadcrumbs()">
-	${h.link_to(u'Home',h.url('hg_home'))}
+	${h.link_to(u'Home',h.url('home'))}
 	 / 
 	${h.link_to(u'Admin',h.url('admin_home'))}
 </%def>
@@ -26,7 +26,7 b''
     ${_('Create "%s" repository as %s' % (c.repo_name,c.repo_name_cleaned))}</a>
 
     </p>
-    <p class="normal">${h.link_to(_('Go back to the main repository list page'),h.url('hg_home'))}</p>
+    <p class="normal">${h.link_to(_('Go back to the main repository list page'),h.url('home'))}</p>
     <div class="page-footer">
     </div>
 </%def>
  No newline at end of file

rhodecode/templates/files/file_diff.html

@@ -9,7 +9,7 b''
     »
     ${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))}
     »
-    ${'%s:  %s %s %s' % (_('File diff'),c.diff2,'→',c.diff1)|n}
+    ${_('File diff')} r${c.changeset_1.revision}:${h.short_id(c.changeset_1.raw_id)} → r${c.changeset_2.revision}:${h.short_id(c.changeset_2.raw_id)}
 </%def>
 
 <%def name="page_nav()">
@@ -26,13 +26,13 b''
 			<div class="code-header">
 				<div>
 				<span>${h.link_to(c.f_path,h.url('files_home',repo_name=c.repo_name,
-				revision=c.diff2.split(':')[1],f_path=c.f_path))}</span>
+				revision=c.changeset_2.raw_id,f_path=c.f_path))}</span>
 				 &raquo; <span>${h.link_to(_('diff'),
-				h.url.current(diff2=c.diff2.split(':')[-1],diff1=c.diff1.split(':')[-1],diff='diff'))}</span>
+				h.url.current(diff2=c.changeset_2.raw_id,diff1=c.changeset_1.raw_id,diff='diff'))}</span>
 				 &raquo; <span>${h.link_to(_('raw diff'),
-				h.url.current(diff2=c.diff2.split(':')[-1],diff1=c.diff1.split(':')[-1],diff='raw'))}</span>
+				h.url.current(diff2=c.changeset_2.raw_id,diff1=c.changeset_1.raw_id,diff='raw'))}</span>
 				 &raquo; <span>${h.link_to(_('download diff'),
-				h.url.current(diff2=c.diff2.split(':')[-1],diff1=c.diff1.split(':')[-1],diff='download'))}</span>
+				h.url.current(diff2=c.changeset_2.raw_id,diff1=c.changeset_1.raw_id,diff='download'))}</span>
 				</div>
 			</div>
 			<div class="code-body">

rhodecode/templates/files/files.html

@@ -11,7 +11,7 b''
     »
     ${_('files')}
     %if c.files_list:
-        @ R${c.rev_nr}:${c.cur_rev}
+        @ R${c.rev_nr}:${h.short_id(c.cur_rev)}
     %endif        
 </%def>
 

rhodecode/templates/files/files_annotate.html

@@ -26,8 +26,8 b''
 			<h3 class="files_location">${_('Location')}: ${h.files_breadcrumbs(c.repo_name,c.cur_rev,c.file.path)}</h3>
 			<dl class="overview">
 				<dt>${_('Last revision')}</dt>
-				<dd>${h.link_to("r%s:%s" % (c.file.last_changeset.revision,c.file.last_changeset.short_id),
-						h.url('files_annotate_home',repo_name=c.repo_name,revision=c.file.last_changeset.short_id,f_path=c.f_path))} </dd>
+				<dd>${h.link_to("r%s:%s" % (c.file.last_changeset.revision,c.file.last_changeset.raw_id),
+						h.url('files_annotate_home',repo_name=c.repo_name,revision=c.file.last_changeset.raw_id,f_path=c.f_path))} </dd>
 				<dt>${_('Size')}</dt>
 				<dd>${h.format_byte_size(c.file.size,binary=True)}</dd>
     			<dt>${_('Mimetype')}</dt>
@@ -43,7 +43,7 b''
 			</dl>
 			<div id="body" class="codeblock">
 				<div class="code-header">
-					<div class="revision">${c.file.name}@r${c.file.last_changeset.revision}:${c.file.last_changeset.short_id}</div>
+					<div class="revision">${c.file.name}@r${c.file.last_changeset.revision}:${c.file.last_changeset.raw_id}</div>
 					<div class="commit">"${c.file_msg}"</div>
 				</div>
 				<div class="code-body">

rhodecode/templates/files/files_source.html

@@ -1,8 +1,8 b''
 <dl>
 	<dt>${_('Last revision')}</dt>
 	<dd>
-		${h.link_to("r%s:%s" % (c.files_list.last_changeset.revision,c.files_list.last_changeset.short_id),
-						h.url('files_home',repo_name=c.repo_name,revision=c.files_list.last_changeset.short_id,f_path=c.f_path))} 
+		${h.link_to("r%s:%s" % (c.files_list.last_changeset.revision,h.short_id(c.files_list.last_changeset.raw_id)),
+						h.url('files_home',repo_name=c.repo_name,revision=c.files_list.last_changeset.raw_id,f_path=c.f_path))} 
 	</dd>
 	<dt>${_('Size')}</dt>
 	<dd>${h.format_byte_size(c.files_list.size,binary=True)}</dd>
@@ -20,8 +20,8 b''
 	<dd>
 		<div>
 		${h.form(h.url('files_diff_home',repo_name=c.repo_name,f_path=c.f_path),method='get')}
-		${h.hidden('diff2',c.files_list.last_changeset.short_id)}
-		${h.select('diff1',c.files_list.last_changeset.short_id,c.file_history)}
+		${h.hidden('diff2',c.files_list.last_changeset.raw_id)}
+		${h.select('diff1',c.files_list.last_changeset.raw_id,c.file_history)}
 		${h.submit('diff','diff to revision',class_="ui-button ui-widget ui-state-default ui-corner-all")}
 		${h.submit('show_rev','show at revision',class_="ui-button ui-widget ui-state-default ui-corner-all")}
 		${h.end_form()}
@@ -32,7 +32,7 b''
 	
 <div id="body" class="codeblock">
 	<div class="code-header">
-		<div class="revision">${c.files_list.name}@r${c.files_list.last_changeset.revision}:${c.files_list.last_changeset.short_id}</div>
+		<div class="revision">${c.files_list.name}@r${c.files_list.last_changeset.revision}:${h.short_id(c.files_list.last_changeset.raw_id)}</div>
 		<div class="commit">"${c.files_list.last_changeset.message}"</div>
 	</div>
 	<div class="code-body">

rhodecode/templates/index.html

@@ -56,33 +56,36 b''
 					        <tr class="parity${cnt%2}">
 					            <td>
 					             %if repo['repo'].dbrepo.repo_type =='hg':
-					               <img class="icon" alt="${_('Mercurial repository')}" src="/images/icons/hgicon.png"/>
+					               <img class="icon" title="${_('Mercurial repository')}" alt="${_('Mercurial repository')}" src="/images/icons/hgicon.png"/>
 					             %elif repo['repo'].dbrepo.repo_type =='git':
-					               <img class="icon" alt="${_('Git repository')}" src="/images/icons/giticon.png"/>
+					               <img class="icon" title="${_('Git repository')}" alt="${_('Git repository')}" src="/images/icons/giticon.png"/>
 					             %else:
 					               
 					             %endif 
 					            
 					             %if repo['repo'].dbrepo.private:
-					                <img class="icon" alt="${_('private')}" src="/images/icons/lock.png"/>
+					                <img class="icon" title="${_('private repository')}" alt="${_('private repository')}" src="/images/icons/lock.png"/>
 					             %else:
-					                <img class="icon" alt="${_('public')}" src="/images/icons/lock_open.png"/>
+					                <img class="icon" title="${_('public repository')}" alt="${_('public repository')}" src="/images/icons/lock_open.png"/>
 					             %endif  
 					            ${h.link_to(repo['name'],
 					                h.url('summary_home',repo_name=repo['name']))}
 					            %if repo['repo'].dbrepo.fork:
 					            	<a href="${h.url('summary_home',repo_name=repo['repo'].dbrepo.fork.repo_name)}">
-					            	<img class="icon" alt="${_('public')}"
+					            	<img class="icon" alt="${_('fork')}"
 					            	title="${_('Fork of')} ${repo['repo'].dbrepo.fork.repo_name}" 
 					            	src="/images/icons/arrow_divide.png"/></a>
 					            %endif
 					            </td>
-					            <td title="${repo['description']}">${h.truncate(repo['description'],60)}</td>
+					            <td><span class="tooltip" tooltip_title="${repo['description']}">
+					               ${h.truncate(repo['description'],60)}</span>
+					            </td>
 					            <td><span class="tooltip" tooltip_title="${repo['last_change']}">
-					                ${h.age(repo['last_change'])} </span></td>
+					                ${h.age(repo['last_change'])} </span>
+					            </td>
 					            <td>
 					            	%if repo['rev']>=0:
-					            	${h.link_to('r%s:%s' % (repo['rev'],repo['tip']),
+					            	${h.link_to('r%s:%s' % (repo['rev'],h.short_id(repo['tip'])),
 					                h.url('changeset_home',repo_name=repo['name'],revision=repo['tip']),
 					                class_="tooltip",
 					                tooltip_title=h.tooltip(repo['last_msg']))}

rhodecode/templates/shortlog/shortlog_data.html

@@ -3,9 +3,9 b''
 <table>
 	<tr>
 		<th class="left">${_('date')}</th>
+		<th class="left">${_('commit message')}</th>
 		<th class="left">${_('author')}</th>
 		<th class="left">${_('revision')}</th>
-		<th class="left">${_('commit message')}</th>
 		<th class="left">${_('branch')}</th>
 		<th class="left">${_('tags')}</th>
 		<th class="left">${_('links')}</th>
@@ -13,14 +13,14 b''
 	</tr>
 %for cnt,cs in enumerate(c.repo_changesets):
 	<tr class="parity${cnt%2}">
-		<td>${h.age(cs.date)} - ${cs.date} </td>
-		<td title="${cs.author}">${h.person(cs.author)}</td>
-		<td>r${cs.revision}:${cs.short_id}</td>
+		<td>${cs.date} - ${h.age(cs.date)}</td>
 		<td>
 			${h.link_to(h.truncate(cs.message,60),
-			h.url('changeset_home',repo_name=c.repo_name,revision=cs.short_id),
+            h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id),
 			title=cs.message)}
 		</td>
+		<td title="${cs.author}">${h.person(cs.author)}</td>
+		<td>r${cs.revision}:${h.short_id(cs.raw_id)}</td>
 		<td>
 			<span class="logtags">
 				<span class="branchtag">${cs.branch}</span>
@@ -34,9 +34,9 b''
 			</span>
 		</td>
 		<td class="nowrap">
-		${h.link_to(_('changeset'),h.url('changeset_home',repo_name=c.repo_name,revision=cs.short_id))}
+		${h.link_to(_('changeset'),h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}
 		|
-		${h.link_to(_('files'),h.url('files_home',repo_name=c.repo_name,revision=cs.short_id))}
+		${h.link_to(_('files'),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}
 		</td>
 	</tr>
 %endfor

rhodecode/templates/summary/summary.html

@@ -42,10 +42,19 b' E.onDOMReady(function(e){'
 			      <label>${_('Name')}:</label>
 			  </div>
 			  <div class="input-short">
+			  
+		          %if c.repo_info.dbrepo.repo_type =='hg':
+		            <img style="margin-bottom:2px" class="icon" title="${_('Mercurial repository')}" alt="${_('Mercurial repository')}" src="/images/icons/hgicon.png"/>
+		          %elif c.repo_info.dbrepo.repo_type =='git':
+		            <img style="margin-bottom:2px" class="icon" title="${_('Git repository')}" alt="${_('Git repository')}" src="/images/icons/giticon.png"/>
+		          %else:
+		            
+		          %endif 
+                                 			  
 	             %if c.repo_info.dbrepo.private:
-	                <img style="margin-bottom:2px" class="icon" title="${_('private repository')}" alt="${_('private')}" src="/images/icons/lock.png"/>
+	                <img style="margin-bottom:2px" class="icon" title="${_('private repository')}" alt="${_('private repository')}" src="/images/icons/lock.png"/>
 	             %else:
-	                <img style="margin-bottom:2px" class="icon" title="${_('public repository')}" alt="${_('public')}" src="/images/icons/lock_open.png"/>
+	                <img style="margin-bottom:2px" class="icon" title="${_('public repository')}" alt="${_('public repository')}" src="/images/icons/lock_open.png"/>
 	             %endif
 			      <span style="font-size: 1.6em;font-weight: bold;vertical-align: baseline;">${c.repo_info.name}</span>
 			      <br/>

rhodecode/templates/tags/tags_data.html

@@ -2,24 +2,26 b''
     <table>
     	<tr>
 			<th class="left">${_('date')}</th>
+	        <th class="left">${_('name')}</th>
+	        <th class="left">${_('author')}</th>
 			<th class="left">${_('revision')}</th>
-			<th class="left">${_('name')}</th>
 			<th class="left">${_('links')}</th>
     	</tr>
 		%for cnt,tag in enumerate(c.repo_tags.items()):
 		<tr class="parity${cnt%2}">
-			<td>${h.age(tag[1].date)}</td>
-			<td>r${tag[1].revision}:${tag[1].short_id}</td>
+	        <td>${tag[1].date} - ${h.age(tag[1].date)}</td>
 			<td>
 				<span class="logtags">
 					<span class="tagtag">${h.link_to(tag[0],
-					h.url('changeset_home',repo_name=c.repo_name,revision=tag[1].short_id))}</span>
+                    h.url('changeset_home',repo_name=c.repo_name,revision=tag[1].raw_id))}</span>
 				</span>
 			</td>
+	        <td title="${tag[1].author}">${h.person(tag[1].author)}</td>
+	        <td>r${tag[1].revision}:${h.short_id(tag[1].raw_id)}</td>
 			<td class="nowrap">
-			${h.link_to(_('changeset'),h.url('changeset_home',repo_name=c.repo_name,revision=tag[1].short_id))}
+			${h.link_to(_('changeset'),h.url('changeset_home',repo_name=c.repo_name,revision=tag[1].raw_id))}
 			|
-			${h.link_to(_('files'),h.url('files_home',repo_name=c.repo_name,revision=tag[1].short_id))}
+			${h.link_to(_('files'),h.url('files_home',repo_name=c.repo_name,revision=tag[1].raw_id))}
 			</td>
 		</tr>	
 		%endfor