kallithea Changeset - 0d3706ccf129

Changeset - 0d3706ccf129

Parent rev.

Child rev.

[Not reviewed]

beta

0 3 0

Marcin Kuzminski - 15 years ago 2011-04-24 16:59:27
marcin@python-works.com

small fixes for git support

3 files changed with 17 insertions and 10 deletions:

rhodecode/controllers/changelog.py

rhodecode/controllers/summary.py

rhodecode/templates/summary/summary.html

0 comments (0 inline, 0 general)

rhodecode/controllers/changelog.py

➞

Show inline comments

@@ @@ -84,7 +84,7 @@ class ChangelogController(BaseRepoContro @@
         :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 @@ class ChangelogController(BaseRepoContro @@
         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)

rhodecode/controllers/summary.py

➞

Show inline comments

@@ @@ -134,13 +134,13 @@ class SummaryController(BaseRepoControll @@
         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,

rhodecode/templates/summary/summary.html

➞

Show inline comments

@@ @@ -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>

0 comments (0 inline, 0 general)