changeset 3507:71fa9a198ac3 beta

show correct values for compare view when multiple git tags are pushed
author Marcin Kuzminski <marcin@python-works.com>
date Tue, 26 Feb 2013 02:29:02 +0100
parents 9f9e7c937eb0
children 224cc3661f7d
files rhodecode/lib/helpers.py
diffstat 1 files changed, 13 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/rhodecode/lib/helpers.py	Wed Mar 06 20:18:41 2013 +0100
+++ b/rhodecode/lib/helpers.py	Tue Feb 26 02:29:02 2013 +0100
@@ -550,13 +550,18 @@
             return link_to(lbl, _url, raw_id=rev.raw_id, repo_name=repo_name,
                            class_='lazy-cs' if lazy_cs else '')
 
+        def _get_op(rev_txt):
+            _op = None
+            _name = rev_txt
+            if len(rev_txt.split('=>')) == 2:
+                _op, _name = rev_txt.split('=>')
+            return _op, _name
+
         revs = []
         if len(filter(lambda v: v != '', revs_ids)) > 0:
             repo = None
             for rev in revs_ids[:revs_top_limit]:
-                _op = _name = None
-                if len(rev.split('=>')) == 2:
-                    _op, _name = rev.split('=>')
+                _op, _name = _get_op(rev)
 
                 # we want parsed changesets, or new log store format is bad
                 if parse_cs:
@@ -583,6 +588,10 @@
             [lnk(rev, repo_name) for rev in revs[:revs_limit]]
             )
         )
+        _op1, _name1 = _get_op(revs_ids[0])
+        _op2, _name2 = _get_op(revs_ids[-1])
+
+        _rev = '%s...%s' % (_name1, _name2)
 
         compare_view = (
             ' <div class="compare_view tooltip" title="%s">'
@@ -591,7 +600,7 @@
                     revs_ids[0][:12], revs_ids[-1][:12]
                 ),
                 url('changeset_home', repo_name=repo_name,
-                    revision='%s...%s' % (revs_ids[0], revs_ids[-1])
+                    revision=_rev
                 ),
                 _('compare view')
             )