#6858 new enhancement

Improve intra-line diff highlighting

Reported by:	Christian Boos	Owned by:
Priority:	normal	Milestone:	next-major-releases
Component:	version control/changeset view	Version:
Severity:	minor	Keywords:	diff
Cc:	a.a.vykhodtsev@…, franz.mayer@…	Branch:
Release Notes:
API Changes:
Internal Changes:

Description

Looking at this one: http://trac.edgewall.org/wiki/TracInstall?action=diff&version=231

TracInstall

 * [http://www.postgresql.org/ PostgreSQL]
 * [http://initd.org/projects/psycopg2 psycopg2] or [http://pypgsql.sourceforge.net/ pyPgSQL]
  '''Warning''': Postgresql-8.3 uses a strict type checking mechanism. To use trac with the 8.3 Version of Postgresql, you will need the latest version of trac.
+ '''Warning''': PostgreSQL 8.3 uses a strict type checking mechanism. To use Trac with the 8.3 Version of PostgreSQL, you will need the latest version of Trac.
 === For MySQL ===

I think we should be able to do much better, something like:

TracInstall

old	new
43	43	* [http://www.postgresql.org/ PostgreSQL]
44	44	* [http://initd.org/projects/psycopg2 psycopg2] or [http://pypgsql.sourceforge.net/ pyPgSQL]
45	45
46		'''Warning''': Postgre~~sql-~~8.3 uses a strict type checking mechanism. To use trac with the 8.3 Version of Postgre~~sql~~, you will need the latest version of trac.
	46	'''Warning''': PostgreSQL 8.3 uses a strict type checking mechanism. To use Trac with the 8.3 Version of PostgreSQL, you will need the latest version of Trac.
47	47
48	48	=== For MySQL ===
49	49

That would be especially useful for Wiki text diffs, where it's common to have one line for a full paragraph, but the clarity of code diffs would probably benefit of this enhancement as well.

A somewhat related enhancement would be to have an heuristic for triggering the intra-line diff highlighting also when the base and new block length differ, as it's common to have common lines changed together with lines added/removed, in the same chunk.

Attachments (1)

Ticket-6858-intraline-diff.patch (2.0 KB ) - added by Peter Suter 13 years ago.: Use difflib to markup intraline changes.

Download all attachments as: .zip

Change History (9)

comment:1 by a.a.vykhodtsev@…, 16 years ago

Cc:	a.a.vykhodtsev@… added

comment:2 by mark.freund@…, 16 years ago

Cc:	mark.freund@… added

comment:3 by Christian Boos, 15 years ago

Milestone:	1.0 → unscheduled

Milestone 1.0 deleted

comment:4 by Christian Boos, 14 years ago

Milestone:	triaging → next-major-0.1X

comment:5 by mark.freund@…, 14 years ago

Cc:	mark.freund@… removed

comment:6 by framay <franz.mayer@…>, 13 years ago

Cc:	franz.mayer@… added

+1 on this ticket. That would be useful for our installation as well, since we change description and custom textarea fields in ticket quite often.

comment:7 by Peter Suter, 13 years ago

I still got a patch for this somewhere. I'm not sure how much of a performance impact (if any) there is though. Maybe the old approach should be kept as an option somehow?

by Peter Suter, 13 years ago

Attachment:	Ticket-6858-intraline-diff.patch added

Use difflib to markup intraline changes.

comment:8 by Ryan J Ollos, 10 years ago

Owner:	Christian Boos removed

Modify Ticket

Change Properties

Summary:
Description:	Looking at this one: http://trac.edgewall.org/wiki/TracInstall?action=diff&version=231 {{{ #!diff --- TracInstall +++ TracInstall @@ -43,7 +43,7 @@ * [http://www.postgresql.org/ PostgreSQL] * [http://initd.org/projects/psycopg2 psycopg2] or [http://pypgsql.sourceforge.net/ pyPgSQL] - '''Warning''': Postgresql-8.3 uses a strict type checking mechanism. To use trac with the 8.3 Version of Postgresql, you will need the latest version of trac. + '''Warning''': PostgreSQL 8.3 uses a strict type checking mechanism. To use Trac with the 8.3 Version of PostgreSQL, you will need the latest version of Trac. === For MySQL === }}} I think we should be able to do much better, something like: {{{ #!html <div class="diff"><ul class="entries"><li class="entry"> <h2>TracInstall</h2> <table cellspacing="0" summary="Differences" class="inline"> <colgroup><col class="lineno"/><col class="lineno"/><col class="content"/></colgroup> <thead><tr> <th>old</th> <th>new</th> <th> </th> </tr></thead><tbody><tr><th>43</th><th>43</th><td class="l"><span>* [http://www.postgresql.org/ PostgreSQL] </span> </td></tr><tr><th>44</th><th>44</th><td class="l"><span>* [http://initd.org/projects/psycopg2 psycopg2] or [http://pypgsql.sourceforge.net/ pyPgSQL] </span> </td></tr><tr><th>45</th><th>45</th><td class="l"><span/> </td></tr></tbody><tbody class="mod"><tr class="first"><th>46</th><th> </th><td class="l"> '''Warning''': Postgre<del>sql-</del>8.3 uses a strict type checking mechanism. To use <del>t</del>rac with the 8.3 Version of Postgre<del>sql</del>, you will need the latest version of <del>t</del>rac. </td></tr><tr class="last"><th> </th><th>46</th><td class="r"> '''Warning''': Postgre<ins>SQL </ins>8.3 uses a strict type checking mechanism. To use <ins>T</ins>rac with the 8.3 Version of Postgre<ins>SQL</ins>, you will need the latest version of <ins>T</ins>rac. </td></tr></tbody><tbody><tr><th>47</th><th>47</th><td class="l"><span/> </td></tr><tr><th>48</th><th>48</th><td class="l"><span>=== For MySQL === </span> </td></tr><tr><th>49</th><th>49</th><td class="l"><span/> </td></tr></tbody> </table> </li> </ul></div> }}} That would be especially useful for Wiki text diffs, where it's common to have one line for a full paragraph, but the clarity of code diffs would probably benefit of this enhancement as well. A somewhat related enhancement would be to have an heuristic for triggering the intra-line diff highlighting also when the base and new block length differ, as it's common to have common lines changed together with lines added/removed, in the same chunk. You may use WikiFormatting here.
Type:		Priority:
Milestone:		Component:
Version:		Severity:
Keywords:		Cc:	Set your email in Preferences
Branch:
Release Notes:
API Changes:
Internal Changes:

Action

leave as new The ticket will remain with no owner.

unassign The ticket will be disowned.

resolve as The resolution will be set. Next status will be 'closed'.

assign The owner will be changed from (none) to anonymous. Next status will be 'assigned'.

Your email or username:

E-mail address and name can be saved in the Preferences .

You may use WikiFormatting here.

Download in other formats:

Context Navigation

#6858 new enhancement

Improve intra-line diff highlighting

Description

TracInstall

TracInstall

Attachments (1)

Change History (9)

comment:1 by a.a.vykhodtsev@…, 16 years ago

comment:2 by mark.freund@…, 16 years ago

comment:3 by Christian Boos, 15 years ago

comment:4 by Christian Boos, 14 years ago

comment:5 by mark.freund@…, 14 years ago

comment:6 by framay <franz.mayer@…>, 13 years ago

comment:7 by Peter Suter, 13 years ago

by Peter Suter, 13 years ago

comment:8 by Ryan J Ollos, 10 years ago

Modify Ticket

Add Comment

by anonymous

Download in other formats: