Ticket #725 (closed defect: duplicate)
Opened 8 years ago
Last modified 6 years ago
Missing diff functionality
| Reported by: | swillison@… | Owned by: | jonas |
|---|---|---|---|
| Priority: | normal | Milestone: | |
| Component: | version control/changeset view | Version: | 0.7.1 |
| Severity: | normal | Keywords: | diff |
| Cc: | |||
| Release Notes: | |||
| API Changes: | |||
Description
Our install of Trac 0.7.1 is missing diff functionality in the TracChangeset view - the diffs aren't showing up at all. I dug around a bit and discovered that the Diff functionality is provided by a file called Diff.py, which was nowhere to be found in the site-package/trac directory. I downloaded a fresh 0.7.1 tarball (from http://ftp.edgewall.com/pub/trac/trac-0.7.1.tar.gz ) and discovered that Diff.py isn't included in the distribution! Is this a mistake, or has that functionality been rolled out of the release version?
Attachments
Change History
comment:1 Changed 8 years ago by cmlenz
- Component changed from general to changeset view
- Keywords diff added
- Resolution set to invalid
- Status changed from new to closed
comment:2 Changed 8 years ago by anonymous
- Resolution invalid deleted
- Status changed from closed to reopened
We're running Trac on Red Hat ES Linux, with subversion 1.0.6 (and I'm viewing it using Firefox on OS X). I tried changing all instances of "-u" to "-U" in the Changeset.py file based on the patch in #670 but it didn't fix the issue.
Changed 8 years ago by anonymous
- Attachment trac-screenshot.gif added
Screenshot of changeset view with missing diffs
comment:3 Changed 8 years ago by cmlenz
- Summary changed from Missing Diff.py (and diff functionality) in Trac 0.7.1 to Missing diff functionality
Then let's change the summary. Note that #670 only applies to the devel version (not 0.7.1) as far as I know.
comment:4 Changed 8 years ago by jacob@…
The fix is extremely simple: in svn.fs.FileDiff?.get_pipe, line 116, the "diff" command is popen'd. For whatever reason, out installation wasn't finding that binary, so I hardcoded "/usr/bin/diff".
This could probably be fixed by a setting for binary search paths within trac itself… although I'm not exactly sure how popen uses search paths.
comment:5 Changed 8 years ago by anonymous
It might be good to have trac throw a warning (either on screen or in the error log) if it can't find the diff program, rather than just failing silently.
comment:6 Changed 8 years ago by daniel
- Resolution set to duplicate
- Status changed from reopened to closed
This is actually a dupe of #511… Redirecting discussions there.
Diff.py was added in the development stream after the 0.7 stream was branched out. The functionality in the 0.7 stream is provided by Changeset.py.
There have been reports about diff display not working on Windows. See #511, for example. If you're not on Windows, or can provide more details, reopen this ticket.