Mercurial > kallithea

changeset 1402:edfbf3ee9965 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixes #217 Seperate Parents on Raw-changeset page
author Marcin Kuzminski <marcin@python-works.com>
date Thu, 30 Jun 2011 01:44:58 +0200
parents b7563ad4e7ee
children fc286aed92fe
files rhodecode/controllers/changeset.py rhodecode/templates/changeset/raw_changeset.html
diffstat 2 files changed, 4 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/rhodecode/controllers/changeset.py	Thu Jun 30 01:25:37 2011 +0200
+++ b/rhodecode/controllers/changeset.py	Thu Jun 30 01:44:58 2011 +0200
@@ -242,9 +242,8 @@
             response.content_disposition = 'attachment; filename=%s.patch' \
                                             % revision
 
-        parent = True if len(c.changeset.parents) > 0 else False
-        c.parent_tmpl = 'Parent  %s' \
-                        % c.changeset.parents[0].raw_id if parent else ''
+        c.parent_tmpl = ''.join(['# Parent  %s\n' % x.raw_id for x in
+                                                 c.changeset.parents])
 
         c.diffs = ''
         for x in c.changes:
--- a/rhodecode/templates/changeset/raw_changeset.html	Thu Jun 30 01:25:37 2011 +0200
+++ b/rhodecode/templates/changeset/raw_changeset.html	Thu Jun 30 01:44:58 2011 +0200
@@ -1,8 +1,8 @@
-# ${c.scm_type} changeset patch
+# ${c.scm_type.upper()} changeset patch
 # User ${c.changeset.author|n}
 # Date ${c.changeset.date}
 # Node ID ${c.changeset.raw_id}
-# ${c.parent_tmpl}
+${c.parent_tmpl}
 ${c.changeset.message}
 
 ${c.diffs|n}
\ No newline at end of file