# HG changeset patch # User Marcin Kuzminski # Date 2011-06-30 01:44:58 # Node ID edfbf3ee996507de12a000c5762bf2f606deaa61 # Parent b7563ad4e7ee81eb552ff862a8cad4f8a2c8f92d fixes #217 Seperate Parents on Raw-changeset page diff --git a/rhodecode/controllers/changeset.py b/rhodecode/controllers/changeset.py --- a/rhodecode/controllers/changeset.py +++ b/rhodecode/controllers/changeset.py @@ -242,9 +242,8 @@ class ChangesetController(BaseRepoContro 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: diff --git a/rhodecode/templates/changeset/raw_changeset.html b/rhodecode/templates/changeset/raw_changeset.html --- a/rhodecode/templates/changeset/raw_changeset.html +++ b/rhodecode/templates/changeset/raw_changeset.html @@ -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