kallithea Changeset - eafe5ae429ea

Changeset - eafe5ae429ea

Parent rev.

Child rev.

[Not reviewed]

beta

0 3 0

Marcin Kuzminski - 15 years ago 2011-02-09 01:02:44
marcin@python-works.com

Added compare view into journal, fixed wrong function call to show compare view

3 files changed with 17 insertions and 3 deletions:

rhodecode/controllers/changeset.py

rhodecode/lib/helpers.py

rhodecode/public/css/style.css

0 comments (0 inline, 0 general)

rhodecode/controllers/changeset.py

➞

Show inline comments

@@ @@ -53,49 +53,49 @@ class ChangesetController(BaseController @@
                                    'repository.admin')
     def __before__(self):
         super(ChangesetController, self).__before__()
     def index(self, revision):
         hg_model = ScmModel()
         def wrap_to_table(str):
             return '''<table class="code-difftable">
                         <tr class="line">
                         <td class="lineno new"></td>
                         <td class="code"><pre>%s</pre></td>
                         </tr>
                       </table>''' % str
         #get ranges of revisions if preset
         rev_range = revision.split('...')[:2]
         range_limit = 50
         try:
             repo = hg_model.get_repo(c.repo_name)
             if len(rev_range) == 2:
                 rev_start = rev_range[0]
                 rev_end = rev_range[1]
-                rev_ranges = repo.get_changeset_ranges(rev_start, rev_end,
+                rev_ranges = repo.get_changesets_ranges(rev_start, rev_end,
                                                        range_limit)
             else:
                 rev_ranges = [repo.get_changeset(revision)]
             c.cs_ranges = list(rev_ranges)
         except (RepositoryError, ChangesetDoesNotExistError, Exception), e:
             log.error(traceback.format_exc())
             h.flash(str(e), category='warning')
             return redirect(url('home'))
         c.changes = OrderedDict()
         c.sum_added = 0
         c.sum_removed = 0
         for changeset in c.cs_ranges:
             c.changes[changeset.raw_id] = []
             try:
                 changeset_parent = changeset.parents[0]
             except IndexError:
                 changeset_parent = None

rhodecode/lib/helpers.py

➞

Show inline comments

@@ @@ -459,64 +459,75 @@ def action_parser(user_log): @@
     action = user_log.action
     action_params = ' '
     x = action.split(':')
     if len(x) > 1:
         action, action_params = x
     def get_cs_links():
         revs_limit = 5 #display this amount always
         revs_top_limit = 50 #show upto this amount of changesets hidden
         revs = action_params.split(',')
         repo_name = user_log.repository.repo_name
         from rhodecode.model.scm import ScmModel
         message = lambda rev: get_changeset_safe(ScmModel().get(repo_name),
                                                  rev).message
         cs_links = " " + ', '.join ([link_to(rev,
                 url('changeset_home',
                 repo_name=repo_name,
                 revision=rev), title=tooltip(message(rev)),
                 class_='tooltip') for rev in revs[:revs_limit] ])
         compare_view = (' <div class="compare_view tooltip" title="%s">'
                         '<a href="%s">%s</a> '
                         '</div>' % (_('Show all combined changesets %s->%s' \
                                       % (revs[0], revs[-1])),
                                     url('changeset_home', repo_name=repo_name,
                                         revision='%s...%s' % (revs[0], revs[-1])
                                     ),
                                     _('compare view'))
+                        )
         if len(revs) > revs_limit:
             uniq_id = revs[0]
             html_tmpl = ('<span> %s '
             '<a class="show_more" id="_%s" href="#more">%s</a> '
             '%s</span>')
             cs_links += html_tmpl % (_('and'), uniq_id, _('%s more') \
                                         % (len(revs) - revs_limit),
                                         _('revisions'))
             html_tmpl = '<span id="%s" style="display:none"> %s </span>'
             cs_links += html_tmpl % (uniq_id, ', '.join([link_to(rev,
                 url('changeset_home',
                 repo_name=repo_name, revision=rev),
                 title=message(rev), class_='tooltip')
                 for rev in revs[revs_limit:revs_top_limit]]))
+        cs_links += compare_view
         return cs_links
     def get_fork_name():
         from rhodecode.model.scm import ScmModel
         repo_name = action_params
         repo = ScmModel().get(repo_name)
         if repo is None:
             return repo_name
         return link_to(action_params, url('summary_home',
                                           repo_name=repo.name,),
                                           title=repo.dbrepo.description)
     map = {'user_deleted_repo':(_('User [deleted] repository'), None),
            'user_created_repo':(_('User [created] repository'), None),
            'user_forked_repo':(_('User [forked] repository as:'), get_fork_name),
            'user_updated_repo':(_('User [updated] repository'), None),
            'admin_deleted_repo':(_('Admin [delete] repository'), None),
            'admin_created_repo':(_('Admin [created] repository'), None),
            'admin_forked_repo':(_('Admin [forked] repository'), None),
            'admin_updated_repo':(_('Admin [updated] repository'), None),
            'push':(_('[Pushed]'), get_cs_links),
            'pull':(_('[Pulled]'), None),
            'started_following_repo':(_('User [started following] repository'), None),
            'stopped_following_repo':(_('User [stopped following] repository'), None),

rhodecode/public/css/style.css

➞

Show inline comments

@@ @@ -1412,49 +1412,52 @@ border-bottom:2px solid #DDD; @@
 margin-left:10px;
 margin-right:10px;
+}
 #journal .journal_action{
 padding-top:4px;
 min-height:15px;
+}
 #journal .journal_icon{
 float: left;
 padding-top: 4px;
 padding-left:12px;
+}
 #journal .journal_repo{
 margin-left: 38px;
 padding-top: 5px;
+}
 #journal .journal_repo .journal_repo_name{
 font-weight: bold;
 font-size: 1.1em;
+}
 #journal .compare_view{
 padding: 5px 0px 5px 38px;
 width: 95px;
+}
 .trending_language_tbl,.trending_language_tbl td {
 border:0 !important;
 margin:0 !important;
 padding:0 !important;
+}
 .trending_language {
 background-color:#003367;
 color:#FFF;
 display:block;
 min-width:20px;
 text-decoration:none;
 height:12px;
 margin-bottom:4px;
 margin-left:5px;
 white-space:pre;
 padding:3px;
+}
 h3.files_location {
 font-size:1.8em;
 font-weight:700;
 border-bottom:none !important;
 margin:10px 0 !important;

0 comments (0 inline, 0 general)