Quote cloned ticket description

[anonymous]

Cloning a ticket or ticket comment adds this to the description:

Copied from [ticket:123#comment:456]:
----
Unquoted description or comment

Replying instead adds this:

Replying to [comment:456 User Name]:
> Quoted description or comment

That seems much more helpful.

The cloning functionality be changed to add something like this:

Copied from comment:456:ticket:123 by User Name:
> Quoted description or comment

[Ryan J Ollos]

PatchWelcome.

[Ryan J Ollos]

Proposed changes for #12842 and #12843 in log:rjollos.git:t12843_ticket_clone_improvements.

I split on \r?\n because ​splitlines does the same: trunk/trac/ticket/web_ui.py@15943:1646#L1638​.

[anonymous]

Very nice! But please also change same thing in addCloneFromComments.

While you are at it, can you remove the (ugly and (annoying) unbalanced parentheses around the summary on line 83? Thank you!

[Ryan J Ollos]

Added [642187d66/rjollos.git].

[Ryan J Ollos]

Committed to trunk in r16106.

[Jun Omae]

Replying to Ryan J Ollos:

Proposed changes for #12842 and #12843 in log:rjollos.git:t12843_ticket_clone_improvements.

I split on \r?\n because ​splitlines does the same: trunk/trac/ticket/web_ui.py@15943:1646#L1638​.

I think we should see ​unicode.splitlines rather than ​str.splitlines.

Also, \r is one of line boundaries in str.splitlines() but /\r?\n/ doesn't match \r.

>>> 'aaaa\rbbbb\nccccc\r\ndddd'.splitlines()
['aaaa', 'bbbb', 'ccccc', 'dddd']

[Jun Omae]

Trivial thing: unnecessary extra \n> would be appended if description and comment are ended with newline.

> "Line 1\r\nLine 2\r\nLine 3\r\n".split(/\r?\n/).join('\n> ')
'Line 1\n> Line 2\n> Line 3\n> '
                           ^^^^

tracopt/ticket/htdocs/ticketclone.coffee

@@ -69 +69 @@
         _("(part of #%(ticketid)s) %(summary)s",
           ticketid: old_values.id, summary: old_values.summary)
       addField cform, 'description',
-        _("Copied from [%(source)s]:\n> %(description)s",
+        _("Copied from [%(source)s]:\n%(description)s",
           source: "ticket:#{old_values.id}#comment:#{c.cnum}",
-          description: c.comment.split(/\r?\n/).join('\n> '))
+          description: quoteText(c.comment))
 
       btns.prepend cform
 
@@ -82 +82 @@
   addField clone, 'summary',
     _("%(summary)s (cloned)", summary: old_values.summary)
   addField clone, 'description',
-    _("Cloned from #%(id)s:\n> %(description)s\n",
+    _("Cloned from #%(id)s:\n%(description)s",
       id: old_values.id,
-      description: old_values.description.split(/\r?\n/).join('\n> '))
+      description: quoteText(old_values.description))
   $('#ticket .description .searchable').before(clone)
   # clone from comment
   if old_values? and changes?
     addCloneFromComments (c for c in changes when c.cnum? and
                           c.comment and c.permanent)
+
+
+quoteText = (text) ->
+  if text
+    length = text.length
+    pattern = /\r\n|[\r\n\u000b\u000c\u001c\u001d\u001e\u0085\u2028\u2029]/g
+    repl = (match, offset) ->
+      if match.length + offset != length then '\n> ' else ''
+    '> ' + text.replace(pattern, repl) + '\n'
+  else
+    return ''

[Ryan J Ollos]

Thanks for the patch. It works well. Committed in r16121.