Mercurial > kallithea
changeset 656:36f839886e0d beta
merge
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Fri, 05 Nov 2010 18:39:09 +0100 |
parents | aefc371a2531 (current diff) 37dc1e8d84d8 (diff) |
children | 212f97c2d2b7 |
files | rhodecode/lib/utils.py |
diffstat | 4 files changed, 13 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/lib/utils.py Fri Nov 05 18:38:25 2010 +0100 +++ b/rhodecode/lib/utils.py Fri Nov 05 18:39:09 2010 +0100 @@ -342,14 +342,9 @@ if not rm.get(name, cache=False): log.info('repository %s not found creating default', name) - if isinstance(repo, MercurialRepository): - repo_type = 'hg' - if isinstance(repo, GitRepository): - repo_type = 'git' - form_data = { 'repo_name':name, - 'repo_type':repo_type, + 'repo_type':repo.alias, 'description':repo.description if repo.description != 'unknown' else \ 'auto description for %s' % name, 'private':False
--- a/rhodecode/model/repo.py Fri Nov 05 18:38:25 2010 +0100 +++ b/rhodecode/model/repo.py Fri Nov 05 18:39:09 2010 +0100 @@ -111,6 +111,7 @@ def create(self, form_data, cur_user, just_db=False, fork=False): try: if fork: + #force str since hg doesn't go with unicode repo_name = str(form_data['fork_name']) org_name = str(form_data['repo_name'])
--- a/rhodecode/public/css/style.css Fri Nov 05 18:38:25 2010 +0100 +++ b/rhodecode/public/css/style.css Fri Nov 05 18:39:09 2010 +0100 @@ -1542,7 +1542,7 @@ .right .merge { vertical-align:top; -font-size:60%; +font-size:0.75em; font-weight:700; } @@ -1554,13 +1554,15 @@ .right .logtags .branchtag { background:#FFF url("../images/icons/arrow_branch.png") no-repeat right 6px; display:block; -padding:8px 16px 0 0; +font-size:0.8em; +padding:11px 16px 0 0; } .right .logtags .tagtag { background:#FFF url("../images/icons/tag_blue.png") no-repeat right 6px; display:block; -padding:6px 18px 0 0; +font-size:0.8em; +padding:11px 16px 0 0; } div.browserblock {
--- a/rhodecode/templates/changelog/changelog.html Fri Nov 05 18:38:25 2010 +0100 +++ b/rhodecode/templates/changelog/changelog.html Fri Nov 05 18:39:09 2010 +0100 @@ -58,9 +58,12 @@ </div> <div class="right"> <div class="changes"> - <span class="removed" title="${_('removed')}">${len(cs.removed)}</span> - <span class="changed" title="${_('changed')}">${len(cs.changed)}</span> - <span class="added" title="${_('added')}">${len(cs.added)}</span> + <span class="removed" title="${_('removed')}: ${' | '.join([x.name for x in cs.removed])}"> + ${len(cs.removed)}</span> + <span class="changed" title="${_('changed')}: ${' | '.join([x.name for x in cs.changed])}"> + ${len(cs.changed)}</span> + <span class="added" title="${_('added')}: ${' | '.join([x.name for x in cs.added])}"> + ${len(cs.added)}</span> </div> %if len(cs.parents)>1: <div class="merge">