Opened 18 years ago
Last modified 10 years ago
#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
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 Postgresql, 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  
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 usetrac with the 8.3 Version of Postgresql, you will need the latest version oftrac.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)
Change History (9)
comment:1 by , 17 years ago
| Cc: | added | 
|---|
comment:2 by , 17 years ago
| Cc: | added | 
|---|
comment:3 by , 16 years ago
| Milestone: | 1.0 → unscheduled | 
|---|
comment:4 by , 15 years ago
| Milestone: | triaging → next-major-0.1X | 
|---|
comment:5 by , 15 years ago
| Cc: | removed | 
|---|
comment:6 by , 14 years ago
| Cc: | 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 , 14 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 , 14 years ago
| Attachment: | Ticket-6858-intraline-diff.patch added | 
|---|
Use difflib to markup intraline changes.
comment:8 by , 10 years ago
| Owner: | removed | 
|---|



  
Milestone 1.0 deleted