@@ -5,48 +5,49 @@ Changelog
=========
1.3.5 (**2012-XX-XX**)
----------------------
:status: in-progress
:branch: beta
news
++++
- use ext_json for json module
- unified annotation view with file source view
- notification improvements, better inbox + css
- #419 don't strip passwords for login forms, make rhodecode
more compatible with LDAP servers
- Added HTTP_X_FORWARDED_FOR as another method of extracting
IP for pull/push logs. - moved all to base controller
- #415: Adding comment to changeset causes reload.
Comments are now added via ajax and doesn't reload the page
- #374 LDAP config is discarded when LDAP can't be activated
- limited push/pull operations are now logged for git in the journal
- bumped mercurial to 2.2.X series
- added support for displaying submodules in file-browser
- #421 added bookmarks in changlog view
fixes
+++++
- fixed dev-version marker for stable when served from source codes
- fixed missing permission checks on show forks page
- #418 cast to unicode fixes in notification objects
- #426 fixed mention extracting regex
- fixed remote-pulling for git remotes remopositories
- fixed #434: Error when accessing files or changesets of a git repository
with submodules
1.3.4 (**2012-03-28**)
- Whoosh logging is now controlled by the .ini files logging setup
- added clone-url into edit form on /settings page
- added help text into repo add/edit forms
- created rcextensions module with additional mappings (ref #322) and
post push/pull/create repo hooks callbacks
- implemented #377 Users view for his own permissions on account page
@@ -16,48 +16,52 @@ from rhodecode.lib.vcs.utils.paths impor
from ...utils.hgcompat import archival, hex
class MercurialChangeset(BaseChangeset):
"""
Represents state of the repository at the single revision.
def __init__(self, repository, revision):
self.repository = repository
self.raw_id = revision
self._ctx = repository._repo[revision]
self.revision = self._ctx._rev
self.nodes = {}
@LazyProperty
def tags(self):
return map(safe_unicode, self._ctx.tags())
def branch(self):
return safe_unicode(self._ctx.branch())
def bookmarks(self):
return map(safe_unicode, self._ctx.bookmarks())
def message(self):
return safe_unicode(self._ctx.description())
def author(self):
return safe_unicode(self._ctx.user())
def date(self):
return date_fromtimestamp(*self._ctx.date())
def status(self):
Returns modified, added, removed, deleted files for current changeset
return self.repository._repo.status(self._ctx.p1().node(),
self._ctx.node())
def _file_paths(self):
return list(self._ctx)
@@ -2499,102 +2499,106 @@ h3.files_location {
background: #FAA;
}
.right .merge {
padding: 1px 3px 1px 3px;
background-color: #fca062;
font-size: 10px;
font-weight: bold;
color: #ffffff;
text-transform: uppercase;
white-space: nowrap;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
margin-right: 2px;
.right .parent {
color: #666666;
clear:both;
.right .logtags{
padding: 2px 2px 2px 2px;
.right .logtags .branchtag,.right .logtags .tagtag,.right .logtags .booktag{
margin: 0px 2px;
.right .logtags .branchtag,.logtags .branchtag {
background-color: #bfbfbf;
.right .logtags .branchtag a:hover,.logtags .branchtag a{
.right .logtags .branchtag a:hover,.logtags .branchtag a:hover{
text-decoration: none;
.right .logtags .tagtag,.logtags .tagtag {
background-color: #62cffc;
.right .logtags .tagtag a:hover,.logtags .tagtag a{
.right .logtags .tagtag a:hover,.logtags .tagtag a:hover{
.right .logbooks .bookbook,.logbooks .bookbook {
padding: 1px 3px 2px;
.right .logbooks .bookbook,.logbooks .bookbook,.right .logtags .bookbook,.logtags .bookbook {
background-color: #46A546;
font-size: 9.75px;
.right .logbooks .bookbook,.logbooks .bookbook a{
.right .logbooks .bookbook,.logbooks .bookbook a,.right .logtags .bookbook,.logtags .bookbook a{
.right .logbooks .bookbook,.logbooks .bookbook a:hover{
.right .logbooks .bookbook,.logbooks .bookbook a:hover,.right .logtags .bookbook,.logtags .bookbook a:hover{
div.browserblock {
overflow: hidden;
border: 1px solid #ccc;
background: #f8f8f8;
font-size: 100%;
line-height: 125%;
padding: 0;
-webkit-border-radius: 6px 6px 0px 0px;
-moz-border-radius: 6px 6px 0px 0px;
border-radius: 6px 6px 0px 0px;
div.browserblock .browser-header {
background: #FFF;
padding: 10px 0px 15px 0px;
width: 100%;
div.browserblock .browser-nav {
float: left
@@ -72,50 +72,58 @@ ${c.repo_name} ${_('Changelog')} - ${c.r
<div class="comments-cnt">${len(c.comments[cs.raw_id])}</div>
<img src="${h.url('/images/icons/comments.png')}">
</a>
</div>
%endif
%if cs.parents:
%for p_cs in reversed(cs.parents):
<div class="parent">${_('Parent')}
<span class="changeset_id">${p_cs.revision}:<span class="changeset_hash">${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)}</span></span>
%endfor
%else:
<div class="parent">${_('No parents')}</div>
<span class="logtags">
%if len(cs.parents)>1:
<span class="merge">${_('merge')}</span>
%if cs.branch:
<span class="branchtag" title="${'%s %s' % (_('branch'),cs.branch)}">
${h.link_to(h.shorter(cs.branch),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}</span>
${h.link_to(h.shorter(cs.branch),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}
</span>
%if h.is_hg(c.rhodecode_repo):
%for book in cs.bookmarks:
<span class="bookbook" title="${'%s %s' % (_('bookmark'),book)}">
${h.link_to(h.shorter(book),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}
%for tag in cs.tags:
<span class="tagtag" title="${'%s %s' % (_('tag'),tag)}">
${h.link_to(h.shorter(tag),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}</span>
<div class="pagination-wh pagination-left">
${c.pagination.pager('$link_previous ~2~ $link_next')}
<script type="text/javascript" src="${h.url('/js/graph.js')}"></script>
<script type="text/javascript">
YAHOO.util.Event.onDOMReady(function(){
//Monitor range checkboxes and build a link to changesets
//ranges
var checkboxes = YUD.getElementsByClassName('changeset_range');
var url_tmpl = "${h.url('changeset_home',repo_name=c.repo_name,revision='__REVRANGE__')}";
YUE.on(checkboxes,'click',function(e){
Status change: