# HG changeset patch # User Marcin Kuzminski # Date 2010-11-05 17:39:09 # Node ID 36f839886e0d22b8eee8efb30e7496a1499719fb # Parent aefc371a2531b4db2da596d254a04f6d773eb500 # Parent 37dc1e8d84d8d49df81a966431f3728a63f11283 merge diff --git a/rhodecode/lib/utils.py b/rhodecode/lib/utils.py --- a/rhodecode/lib/utils.py +++ b/rhodecode/lib/utils.py @@ -342,14 +342,9 @@ def repo2db_mapper(initial_repo_list, re 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 diff --git a/rhodecode/model/repo.py b/rhodecode/model/repo.py --- a/rhodecode/model/repo.py +++ b/rhodecode/model/repo.py @@ -111,6 +111,7 @@ class RepoModel(object): 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']) diff --git a/rhodecode/public/css/style.css b/rhodecode/public/css/style.css --- a/rhodecode/public/css/style.css +++ b/rhodecode/public/css/style.css @@ -1542,7 +1542,7 @@ background:#F88; .right .merge { vertical-align:top; -font-size:60%; +font-size:0.75em; font-weight:700; } @@ -1554,13 +1554,15 @@ font-family:monospace; .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 { diff --git a/rhodecode/templates/changelog/changelog.html b/rhodecode/templates/changelog/changelog.html --- a/rhodecode/templates/changelog/changelog.html +++ b/rhodecode/templates/changelog/changelog.html @@ -58,9 +58,12 @@
- ${len(cs.removed)} - ${len(cs.changed)} - ${len(cs.added)} + + ${len(cs.removed)} + + ${len(cs.changed)} + + ${len(cs.added)}
%if len(cs.parents)>1: