Mercurial > kallithea
changeset 1281:0d3706ccf129 beta
small fixes for git support
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Sun, 24 Apr 2011 16:59:27 +0200 |
| parents | 215a4801bb1e |
| children | faaadfc3c359 |
| files | rhodecode/controllers/changelog.py rhodecode/controllers/summary.py rhodecode/templates/summary/summary.html |
| diffstat | 3 files changed, 17 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/controllers/changelog.py Sat Apr 23 17:22:50 2011 +0200 +++ b/rhodecode/controllers/changelog.py Sun Apr 24 16:59:27 2011 +0200 @@ -84,7 +84,7 @@ :param size: number of commits to show :param p: page number """ - if not repo.revisions or repo.alias == 'git': + if not repo.revisions: c.jsdata = json.dumps([]) return @@ -93,12 +93,19 @@ rev_start = repo.revisions.index(repo.revisions[(-1 * offset)]) rev_end = max(0, rev_start - revcount) - dag = graph_rev(repo._repo, rev_start, rev_end) - c.dag = tree = list(colored(dag)) data = [] - for (id, type, ctx, vtx, edges) in tree: - if type != CHANGESET: - continue - data.append(('', vtx, edges)) + if repo.alias == 'git': + for _ in xrange(rev_end, rev_start): + vtx = [0, 1] + edges = [[0, 0, 1]] + data.append(['', vtx, edges]) + + elif repo.alias == 'hg': + dag = graph_rev(repo._repo, rev_start, rev_end) + c.dag = tree = list(colored(dag)) + for (id, type, ctx, vtx, edges) in tree: + if type != CHANGESET: + continue + data.append(['', vtx, edges]) c.jsdata = json.dumps(data)
--- a/rhodecode/controllers/summary.py Sat Apr 23 17:22:50 2011 +0200 +++ b/rhodecode/controllers/summary.py Sun Apr 24 16:59:27 2011 +0200 @@ -134,13 +134,13 @@ if stats and stats.languages: c.no_data = False is dbrepo.enable_statistics - lang_stats = json.loads(stats.languages) + lang_stats_d = json.loads(stats.languages) c.commit_data = stats.commit_activity c.overview_data = stats.commit_activity_combined lang_stats = [(x, {"count": y, "desc": LANGUAGES_EXTENSIONS_MAP.get(x)}) - for x, y in lang_stats.items()] + for x, y in lang_stats_d.items()] c.trending_languages = json.dumps(OrderedDict( sorted(lang_stats, reverse=True,
--- a/rhodecode/templates/summary/summary.html Sat Apr 23 17:22:50 2011 +0200 +++ b/rhodecode/templates/summary/summary.html Sun Apr 24 16:59:27 2011 +0200 @@ -130,7 +130,7 @@ <label>${_('Clone url')}:</label> </div> <div class="input-short"> - <input type="text" id="clone_url" readonly="readonly" value="hg clone ${c.clone_repo_url}" size="70"/> + <input type="text" id="clone_url" readonly="readonly" value="${c.rhodecode_repo.alias} clone ${c.clone_repo_url}" size="70"/> </div> </div>